Merged in graham_linden/viewer-eep-fixes (pull request #340)

SL-10821, SL-10896, SL-10901

4 files changed, 14 insertions, 13 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index 1bc576a4ec..6e693bd33b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -194,7 +194,8 @@ void main()
 
     vec3 light_dir = (sun_up_factor == 1) ? sun_dir: moon_dir;
     float da = dot(norm.xyz, light_dir.xyz);
-
+          da = clamp(da, -1.0, 1.0);
+ 
     float final_da = da;
           final_da = clamp(final_da, 0.0f, 1.0f);
 		  final_da = pow(final_da, 1.0/1.3);
@@ -204,7 +205,7 @@ void main()
     color.rgb = amblit;
     color.a   = final_alpha;
 
-    float ambient = abs(da);
+    float ambient = da;
     ambient *= 0.5;
     ambient *= ambient;
     ambient = max(0.9, ambient); // keeps shadows dark
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 4e24e61018..4a47311eb7 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -296,12 +296,13 @@ void main()
     vec3 light_dir = (sun_up_factor == 1) ? sun_dir : moon_dir;
 
     float da = dot(norm.xyz, light_dir.xyz);
+          da = clamp(da, -1.0, 1.0);
 
     float final_da = da;
           final_da = clamp(final_da, 0.0, 1.0);
           final_da = pow(final_da, 1.0 / 1.3);
 
-    float ambient = abs(da);
+    float ambient = da;
     ambient *= 0.5;
     ambient *= ambient;
     ambient = max(0.9, ambient);
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index e44b441727..361ed40eaf 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -86,13 +86,15 @@ void main()
     float envIntensity = norm.z;
     norm.xyz = getNorm(tc);
     
+    float light_gamma = 1.0/1.3;
     vec3 light_dir = (sun_up_factor == 1) ? sun_dir : moon_dir;
     
     float da = dot(normalize(norm.xyz), light_dir.xyz);
-          da = clamp(da, 0.0, 1.0);
+          da = clamp(da, -1.0, 1.0);
 
-    float light_gamma = 1.0/1.3;
-	      da = pow(da, light_gamma);
+    float final_da = da;
+          final_da = clamp(final_da, 0.0, 1.0);
+	      final_da = pow(final_da, light_gamma);
 
     vec4 diffuse = texture2DRect(diffuseRect, tc);
 
@@ -107,12 +109,12 @@ void main()
 
         calcFragAtmospherics(pos.xyz, 1.0, sunlit, amblit, additive, atten);
 
-        float ambient = min(abs(da), 1.0);
+        float ambient = da;
         ambient *= 0.5;
         ambient *= ambient;
         ambient = 1.0 - ambient;
 
-        vec3 sun_contrib = da * sunlit;
+        vec3 sun_contrib = final_da * sunlit;
 
         col.rgb = amblit;
         col.rgb *= ambient;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index c3c8683f6b..e0af521511 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -153,12 +153,9 @@ void main()
     
     vec4 pos = vary_position;
     
-    //color.rgb = atmosTransport(color.rgb);
-    //color.rgb = scaleSoftClipFrag(color.rgb) * 0;
-
     vec3 screenspacewavef = normalize((norm_mat*vec4(wavef, 1.0)).xyz);
 
-    frag_data[0] = vec4(color.rgb, 1); // diffuse
-    frag_data[1] = vec4(specular * 0.4, 0.75);     // speccolor, spec
+    frag_data[0] = vec4(color.rgb, 0.25); // diffuse
+    frag_data[1] = vec4(specular * 0.15, 0.5);     // speccolor, spec
     frag_data[2] = vec4(encode_normal(screenspacewavef.xyz), 0.05, 0);// normalxy, 0, 0
 }