DRTVWR-559 Add control for automatic reflection probes to advanced preferences and featuretable. Remove Reflections checkbox. Don't persist reflection probe volume display between sessions. Incidental decruft.

3 files changed, 19 insertions, 19 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bc06a1f829..a057933009 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10197,7 +10197,7 @@
       <key>Comment</key>
       <string>Render influence volumes of Reflection Probes</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
@@ -10392,16 +10392,27 @@
     <key>Value</key>
     <real>0</real>
   </map>
-  <key>RenderAutomaticReflectionProbes</key>
+  <key>RenderDefaultProbeUpdatePeriod</key>
   <map>
     <key>Comment</key>
-    <string>Automatic reflection probes control.  0 - disable, 1 - Terrain/water only, 2- Terrain/water + objects.  Requires restart.</string>
+    <string>When RenderReflectionProbeLevel is 0, amount of time in seconds to wait between updates to reflection map.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>20.0</real>
+  </map>
+  <key>RenderReflectionProbeLevel</key>
+  <map>
+    <key>Comment</key>
+    <string>Reflection probes control.  0 - disable (one probe to rule them all), 1 - manual probes only, 2 - manual + terrain/water, 3 - Manual + Terrain/water + objects.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
     <string>S32</string>
     <key>Value</key>
-    <integer>2</integer>
+    <integer>3</integer>
   </map>
   <key>RenderReflectionRes</key>
     <map>
diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
index 55a43f76d0..36b5262104 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
@@ -122,6 +122,7 @@ bool shouldSampleProbe(int i, vec3 pos)
 // populate "probeIndex" with N probe indices that influence pos where N is REF_SAMPLE_COUNT
 void preProbeSample(vec3 pos)
 {
+#if REFMAP_LEVEL > 0
     // TODO: make some sort of structure that reduces the number of distance checks
     for (int i = 1; i < refmapCount; ++i)
     {
@@ -213,6 +214,9 @@ void preProbeSample(vec3 pos)
     { // probe at index 0 is a special probe for smoothing out automatic probes
         probeIndex[probeInfluences++] = 0;
     }
+#else
+    probeIndex[probeInfluences++] = 0;
+#endif
 }
 
 // from https://www.scratchapixel.com/lessons/3d-basic-rendering/minimal-ray-tracer-rendering-simple-shapes/ray-sphere-intersection
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index ab83708c7b..a8d61afeca 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -246,20 +246,6 @@ void main()
         
         vec3 refnormpersp = reflect(pos.xyz, norm.xyz);
 
-#if 0 // wrong implementation
-        if (spec.a > 0.0)  // specular reflection
-        {
-            float sa        = dot(normalize(refnormpersp), light_dir.xyz);
-            vec3  dumbshiny = sunlit * scol * (texture2D(lightFunc, vec2(sa, spec.a)).r);
-
-            // add the two types of shiny together
-            vec3 spec_contrib = dumbshiny * spec.rgb;
-            color.rgb += spec_contrib;
-
-            // add radiance map
-            applyGlossEnv(color, glossenv, spec, pos.xyz, norm.xyz);
-        }
-#else //right implementation (ported from pointLightF.glsl)
         if (spec.a > 0.0)
         {
             vec3  lv = light_dir.xyz;
@@ -284,7 +270,6 @@ void main()
             // add radiance map
             applyGlossEnv(color, glossenv, spec, pos.xyz, norm.xyz);
         }
-#endif
 
         color.rgb = mix(color.rgb, baseColor.rgb, baseColor.a);