From 50ec54831de88926ca13c9a72d89006ceda6c355 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 1 Jun 2023 19:49:23 -0500
Subject: DRTVWR-559 Revert skies to be very close to release and disable tone
 mapping when probe ambiance is zero.

Hack for desaturating legacy materials has been removed for performance and quality reasons.

Adds a new setting for auto adjusting legacy skies.  This is the PBR "opt out" button.  If disabled, legacy skies will disable tonemapping, automatic probe ambiance, and HDR/exposure.  If enabled, legacy skies will behave as if probe ambiance and HDR scale are 1.0, and ambient will be cut in half.

HDR scale will act as a sky brightener, but will automatically adjust dynamic exposure so the sky will be properly exposed.  If you want relatively even exposure all the time, set HDR Scale to 1.0.  If you want a high range of exposures between indoor/dark areas and outdoor/bright areas, increase HDR Scale.

Also tuned up SSAO (thanks Rye!).

Reviewed with Brad.
---
 .../default/xui/en/floater_adjust_environment.xml  | 40 +++++++++--------
 .../en/floater_preferences_graphics_advanced.xml   | 14 ++++++
 .../default/xui/en/panel_settings_sky_atmos.xml    | 51 ++++++++++++----------
 3 files changed, 62 insertions(+), 43 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index 5258bdbaf2..518a83f846 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -10,6 +10,8 @@
          min_height="275"
          single_instance="true"
          can_resize="false">
+  <string name="hdr_string">HDR Scale:</string>
+  <string name="brightness_string">Brightness:</string>
     <layout_stack name="outer_stack"
                   width="845"
                   height="275"
@@ -245,25 +247,6 @@
                             top_pad="5"
                             width="185"
                             can_edit_text="true"/>
-                    <text follows="left|top"
-                          name="scene_gamma_label"
-                          height="10"
-                          layout="topleft"
-                          left_delta="-5"
-                          top_pad="15"
-                          width="80">Brightness:</text>
-                    <slider decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_delta="5"
-                            max_val="20"
-                            name="scene_gamma"
-                            top_pad="5"
-                            width="185"
-                            can_edit_text="true"/>
                   <text follows="left|top"
                           height="10"
                           layout="topleft"
@@ -283,6 +266,25 @@
                           top_pad="5"
                           width="185"
                           can_edit_text="true"/>
+                    <text follows="left|top"
+                          name="scene_gamma_label"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="15"
+                          width="80">Brightness:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            max_val="20"
+                            name="scene_gamma"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
                 </layout_panel>
                 <layout_panel border="false"
                               name="lp_3"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index fd80673903..c1a94a2128 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -600,6 +600,20 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
+  <check_box
+  control_name="RenderSkyAutoAdjustLegacy"
+  height="16"
+  initial_value="true"
+  label="Auto-adjust Legacy Sky"
+  layout="topleft"
+  left="420"
+  name="AutoAdjustLegacySky"
+  top_delta="16"
+  width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+
   <check_box
     control_name="RenderDepthOfField"
     height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 58d125a88e..36a485e498 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -7,6 +7,8 @@
         left="0"
         name="panel_settings_sky_atmos"
         top="0">
+  <string name="hdr_string">HDR Scale:</string>
+  <string name="brightness_string">Brightness:</string>
     <layout_stack
             name="main_ls"
             follows="all"
@@ -228,29 +230,6 @@
                             name="ice_level"
                             width="207"
                             can_edit_text="true"/>
-                    <text
-                            name="scene_gamma_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="80">
-                        Brightness:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_delta="5"
-                            max_val="20"
-                            name="scene_gamma"
-                            top_delta="20"
-                            width="207"
-                            can_edit_text="true"/>
                 </layout_panel>            
                 <layout_panel
                         name="right_lp"
@@ -338,8 +317,9 @@
                             layout="topleft"
                             left_delta="-5"
                             top_delta="25"
+                            tooltip="Irradiance control.  When not zero, enables HDR lighting model."
                             width="200">
-                    Reflection Probe Ambiance:
+                    Reflection Probe Ambiance (HDR):
                   </text>
                   <slider
                           decimal_digits="2"
@@ -355,6 +335,29 @@
                           top_delta="20"
                           width="219"
                           can_edit_text="true"/>
+                  <text
+                            name="scene_gamma_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="80">
+                    Brightness:
+                  </text>
+                  <slider
+                          decimal_digits="2"
+                          follows="left|top"
+                          height="16"
+                          increment="0.01"
+                          initial_value="0"
+                          layout="topleft"
+                          left_delta="5"
+                          max_val="20"
+                          name="scene_gamma"
+                          top_delta="20"
+                          width="207"
+                          can_edit_text="true"/>
                 </layout_panel>            
             </layout_stack>                
         </layout_panel>
-- 
cgit v1.2.3