diff options
author | Graham Linden <graham@lindenlab.com> | 2019-03-20 13:07:21 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-03-20 13:07:21 -0700 |
commit | edf8ba6e5ff0fc2b5ef55219c82af7b0f20437d9 (patch) | |
tree | b84b4b41e4232ab6839a6ea1db6ac694583ef88c /indra/newview/app_settings/shaders/class3/lighting | |
parent | cdad939bbd6fbed4cfc863469d5c37e17bbcf698 (diff) |
SL-10449
Fix name of attenuation setter used.
Fix flipped light vec.
Make class3 lights use shadows on projector ambiance too.
Diffstat (limited to 'indra/newview/app_settings/shaders/class3/lighting')
-rw-r--r-- | indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl index 5302b05043..7cd0d505f9 100644 --- a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl +++ b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl @@ -48,10 +48,10 @@ vec4 sumLights(vec3 pos, vec3 norm, vec4 color, vec4 baseLight) col.rgb += light_diffuse[5].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[5], light_direction[5], light_attenuation[5].x, light_attenuation[5].z); col.rgb += light_diffuse[6].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[6], light_direction[6], light_attenuation[6].x, light_attenuation[6].z); col.rgb += light_diffuse[7].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[7], light_direction[7], light_attenuation[7].x, light_attenuation[7].z); - col.rgb += light_diffuse[1].rgb*calcDirectionalLight(norm, light_position[1].xyz); + col.rgb += light_diffuse[1].rgb*calcDirectionalLight(norm, light_direction[1].xyz); // Add windlight lights - col.rgb += atmosAffectDirectionalLight(calcDirectionalLight(norm, light_position[0].xyz)); + col.rgb += atmosAffectDirectionalLight(calcDirectionalLight(norm, light_direction[0].xyz)); col.rgb += atmosAmbient(baseLight.rgb); col.rgb = min(col.rgb*color.rgb, 1.0); |