From 1514ade10dc0f64c476ff405256b86fb6a1d9b57 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 11 Sep 2023 09:20:00 -0500
Subject: SL-19842 WIP -- Now that probes can override ambient, unroll ambient
 darkening hacks.

---
 indra/newview/app_settings/settings.xml                           | 8 ++++----
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl  | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b4e149f0e0..35ab1e9d40 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10654,7 +10654,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.7</real>
+    <real>1.0</real>
   </map>
   <key>RenderSkyAutoAdjustHDRScale</key>
   <map>
@@ -10709,7 +10709,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>1.0</real>
+    <real>0.001</real>
   </map>
   <key>RenderSkySunlightScale</key>
   <map>
@@ -10720,7 +10720,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>1.5</real>
+    <real>1.0</real>
   </map>
   <key>RenderSkyAmbientScale</key>
   <map>
@@ -10731,7 +10731,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.5</real>
+    <real>0.7</real>
   </map>
   
   <key>RenderReflectionProbeMaxLocalLightAmbiance</key>
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 53474ded7f..a8aa5a36a3 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -39,7 +39,6 @@ uniform float max_y;
 uniform vec3  glow;
 uniform float scene_light_strength;
 uniform float sun_moon_glow_factor;
-uniform float sky_hdr_scale;
 uniform float sky_sunlight_scale;
 uniform float sky_ambient_scale;
 
@@ -150,12 +149,9 @@ void calcAtmosphericVarsLinear(vec3 inPositionEye, vec3 norm, vec3 light_dir, ou
 
     // multiply to get similar colors as when the "scaleSoftClip" implementation was doubling color values
     // (allows for mixing of light sources other than sunlight e.g. reflection probes)
-    sunlit *= sky_sunlight_scale; //1.5;
-    amblit *= sky_ambient_scale; //0.5;
+    sunlit *= sky_sunlight_scale;
+    amblit *= sky_ambient_scale;
     
-    // override amblit with ambient_color if sky probe ambiance is not zero
-    amblit = mix(amblit, ambient_color, clamp(sky_hdr_scale-1.0, 0.0, 1.0));
-
     amblit = srgb_to_linear(amblit);
     amblit *= ambientLighting(norm, light_dir);
 }
-- 
cgit v1.2.3