From 4e796ce8982e4e64e91a221c4acd78099c5bf58d Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 28 Jun 2019 11:07:44 -0700 Subject: SL-9928 Take out angular atten on additive too. --- indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 4 +--- indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index f9fe091124..0d180e5798 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -176,9 +176,7 @@ vec3 post_env = color.rgb; if (norm.w < 1) { #if !defined(SUNLIGHT_KILL) - //additive *= spec.a; - float additive_angular_atten = max(0.0, dot(light_dir, normalize(pos.xyz))); - color = atmosFragLighting(color, additive * additive_angular_atten, atten); + color = atmosFragLighting(color, additive, atten); color = scaleSoftClipFrag(color); #endif } diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index d1b49d8820..eeab6ed03d 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -185,9 +185,7 @@ vec3 post_env = color.rgb; { #if !defined(SUNLIGHT_KILL) vec3 p = normalize(pos.xyz); - //additive *= spec.a; - float additive_angular_atten = max(0.0, dot(light_dir.xyz, p.xyz)); - color = atmosFragLighting(color, additive * additive_angular_atten, atten); + color = atmosFragLighting(color, additive, atten); color = scaleSoftClipFrag(color); #endif } -- cgit v1.2.3