Skip to content

Conversation

@Mugen87
Copy link
Collaborator

@Mugen87 Mugen87 commented May 19, 2021

Related issue: Fixed #21849.

Description

Ensures emissiveFactor is in the correct range [0,1].

@mrdoob mrdoob added this to the r129 milestone May 19, 2021
@mrdoob mrdoob merged commit 688f315 into mrdoob:dev May 19, 2021
@mrdoob
Copy link
Owner

mrdoob commented May 19, 2021

Thanks!

@WestLangley
Copy link
Collaborator

I'd just comment out the existing line for now and add a comment. The glTF spec will likely be changed.

//const emissive = material.emissive.clone().multiplyScalar( material.emissiveIntensity ).toArray();

// note: ignoring `material.emissiveIntensity` for now to accommodate glTF spec. see #21849.
const emissive = material.emissive.toArray();

@Mugen87
Copy link
Collaborator Author

Mugen87 commented May 19, 2021

I'm in general no fan of commenting out code. But adding the issue number seems okay to me.

@WestLangley
Copy link
Collaborator

This would make me feel better, then :-)

// note: `emissive` is not scaled by `material.emissiveIntensity` for now to accommodate glTF spec. see #21849.
const emissive = material.emissive.toArray();

@mrdoob mrdoob mentioned this pull request May 19, 2021
@mrdoob
Copy link
Owner

mrdoob commented May 19, 2021

Done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

emissiveIntensity range?

3 participants