From 9c8cc0037a11861fa0561e8cda01d9ec7c996442 Mon Sep 17 00:00:00 2001 From: Graham Linden <graham@lindenlab.com> Date: Fri, 22 Mar 2019 14:54:40 -0700 Subject: [PATCH] Fix class1/2 light sum loops to use light_diffuse[0] for sunlight_color too. Rearrange ordering of scale down of light in class1 as well. --- .../app_settings/shaders/class1/lighting/sumLightsV.glsl | 4 +--- .../app_settings/shaders/class2/lighting/sumLightsV.glsl | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl index 41288c21c19..7d699a4967f 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl @@ -38,12 +38,10 @@ vec4 sumLights(vec3 pos, vec3 norm, vec4 color, vec4 baseLight) col.a = color.a; col.rgb = light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz); + col.rgb += light_diffuse[0].rgb * calcDirectionalLight(norm, light_position[0].xyz); col.rgb = scaleDownLight(col.rgb); col.rgb += atmosAmbient(baseLight.rgb); - col.rgb += atmosAffectDirectionalLight(calcDirectionalLight(norm, light_position[0].xyz)); - col.rgb = min(col.rgb*color.rgb, 1.0); - return col; } diff --git a/indra/newview/app_settings/shaders/class2/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class2/lighting/sumLightsV.glsl index c9987ef3b94..36a8a8147b8 100644 --- a/indra/newview/app_settings/shaders/class2/lighting/sumLightsV.glsl +++ b/indra/newview/app_settings/shaders/class2/lighting/sumLightsV.glsl @@ -49,7 +49,7 @@ vec4 sumLights(vec3 pos, vec3 norm, vec4 color, vec4 baseLight) // Add windlight lights col.rgb += atmosAmbient(baseLight.rgb); - col.rgb += atmosAffectDirectionalLight(calcDirectionalLight(norm, light_position[0].xyz)); + col.rgb += light_diffuse[0].rgb * calcDirectionalLight(norm, light_position[0].xyz)); col.rgb = min(col.rgb*color.rgb, 1.0); -- GitLab