Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

emissiveMapIntensity => emissiveIntensity #7918

Merged
merged 1 commit into from Jan 11, 2016

Conversation

WestLangley
Copy link
Collaborator

This PR modifies #7827.

material.emissive needs to be modulated by an intensity value.

Since emissive light is additive to total reflective light, it must have the same units as total reflective light. When we switch to SI units, the units of emissiveIntensity will be candela/m^2.

As we do with light intensity values, we multiply the color by the intensity on the CPU to avoid having to pass the intensity value to the GPU.

mrdoob added a commit that referenced this pull request Jan 11, 2016
emissiveMapIntensity => emissiveIntensity
@mrdoob mrdoob merged commit 406e518 into mrdoob:dev Jan 11, 2016
@mrdoob
Copy link
Owner

mrdoob commented Jan 11, 2016

Thanks!

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.

None yet

2 participants