From f718cbd27f83c0928e2ee23d4cefe2b124bd5dde Mon Sep 17 00:00:00 2001 From: Ben Houston Date: Tue, 1 Mar 2016 16:24:36 -0500 Subject: [PATCH] name emissive properly - it is emissiveRadiance. --- src/renderers/shaders/ShaderChunk/emissivemap_fragment.glsl | 2 +- src/renderers/shaders/ShaderLib/meshlambert_frag.glsl | 4 ++-- src/renderers/shaders/ShaderLib/meshphong_frag.glsl | 4 ++-- src/renderers/shaders/ShaderLib/meshstandard_frag.glsl | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderers/shaders/ShaderChunk/emissivemap_fragment.glsl b/src/renderers/shaders/ShaderChunk/emissivemap_fragment.glsl index c0951b050b..1d65996de1 100644 --- a/src/renderers/shaders/ShaderChunk/emissivemap_fragment.glsl +++ b/src/renderers/shaders/ShaderChunk/emissivemap_fragment.glsl @@ -4,6 +4,6 @@ emissiveColor.rgb = emissiveMapTexelToLinear( emissiveColor ).rgb; - totalEmissiveLight *= emissiveColor.rgb; + totalEmissiveRadiance *= emissiveColor.rgb; #endif diff --git a/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl b/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl index b4bcbf7fbb..5ffc4eb1f8 100644 --- a/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl +++ b/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl @@ -33,7 +33,7 @@ void main() { vec4 diffuseColor = vec4( diffuse, opacity ); ReflectedLight reflectedLight = ReflectedLight( vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ) ); - vec3 totalEmissiveLight = emissive; + vec3 totalEmissiveRadiance = emissive; #include #include @@ -65,7 +65,7 @@ void main() { // modulation #include - vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + totalEmissiveLight; + vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + totalEmissiveRadiance; #include diff --git a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl index ad36791142..f11870794e 100644 --- a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl +++ b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl @@ -31,7 +31,7 @@ void main() { vec4 diffuseColor = vec4( diffuse, opacity ); ReflectedLight reflectedLight = ReflectedLight( vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ) ); - vec3 totalEmissiveLight = emissive; + vec3 totalEmissiveRadiance = emissive; #include #include @@ -49,7 +49,7 @@ void main() { // modulation #include - vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular + totalEmissiveLight; + vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular + totalEmissiveRadiance; #include diff --git a/src/renderers/shaders/ShaderLib/meshstandard_frag.glsl b/src/renderers/shaders/ShaderLib/meshstandard_frag.glsl index 260299b9db..866ef6ac03 100644 --- a/src/renderers/shaders/ShaderLib/meshstandard_frag.glsl +++ b/src/renderers/shaders/ShaderLib/meshstandard_frag.glsl @@ -43,7 +43,7 @@ void main() { vec4 diffuseColor = vec4( diffuse, opacity ); ReflectedLight reflectedLight = ReflectedLight( vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ) ); - vec3 totalEmissiveLight = emissive; + vec3 totalEmissiveRadiance = emissive; #include #include @@ -63,7 +63,7 @@ void main() { // modulation #include - vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular + totalEmissiveLight; + vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular + totalEmissiveRadiance; gl_FragColor = vec4( outgoingLight, diffuseColor.a ); -- GitLab