From b66f2e7da7d3ec68984d7fcb5e5996e1451c0baf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 21 Sep 2022 21:19:17 +0300
Subject: SL-18202 WIP merging autotune contribution and updating UI

---
 .../skins/default/xui/en/floater_performance.xml   |  54 ++++
 .../xui/en/panel_performance_autoadjustments.xml   | 272 +++++++++++++++++++++
 2 files changed, 326 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index bf2623f356..ee88701037 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -277,6 +277,52 @@
        top="19"
        right="-20"/>
     </panel>
+    <panel
+     bg_alpha_color="PanelGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
+     follows="left|top"
+     height="50"
+     width="560"
+     name="autoadjustments_subpanel"
+     layout="topleft"
+     top_pad="10">
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="auto_adj_lbl"
+       top="7"
+       width="175">
+        Preferred frame rate
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerif"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="auto_adj_desc"
+       top_pad="0"
+       width="485">
+        Allow automatic adjustments to reach your preferred frame rate (advanced).
+      </text>
+      <icon
+       height="16"
+       width="16"
+       image_name="Arrow_Right_Off"
+       mouse_opaque="true"
+       name="icon_arrow4"
+       follows="right|top"
+       top="19"
+       right="-20"/>
+    </panel>
   </panel>
   <panel
     filename="panel_performance_nearby.xml"
@@ -310,4 +356,12 @@
     name="panel_performance_huds"
     visible="false"
     top="55" />
+  <panel
+    filename="panel_performance_autoadjustments.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_autoadjustments"
+    visible="false"
+    top="55" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
new file mode 100644
index 0000000000..10ac4b98b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="580"
+ width="580"
+ name="panel_performance_autoadjustments"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="7"
+    image_selected="Arrow_Left_Off"
+    image_pressed="Arrow_Left_Off"
+    image_unselected="Arrow_Left_Off"
+    left="15"
+    is_toggle="true">
+  </button>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   top="10"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="white"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="settings_title"
+   width="300">
+    Preferred frame rate
+  </text>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border0"
+   top_pad="15"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerif"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   left="20"
+   name="targetfps_desc"
+   wrap="true"
+   width="140"
+   top_pad="20">
+    Desired frame rate
+  </text>
+  <spinner
+   name="target_fps"
+   control_name="TargetFPS"
+   font="SansSerifLarge"
+   tool_tip="The viewer will attempt to achieve this by adjusting your graphics settings."
+   layout="topleft"
+   follows="right|top"
+   left_pad="5"
+   top_delta="0"
+   height="25"
+   visible="true"
+   decimal_digits="0"
+   increment="1"
+   initial_value="25"
+   max_val="300"
+   min_val="1"
+   width="48"
+   label_width="0" />
+  <button
+   control_name="AutoTuneFPS"
+   follows="top|right"
+   height="24"
+   initial_value="false"
+   image_pressed="PushButton_Press"
+   image_pressed_selected="PushButton_Selected_Press"
+   image_selected="PushButton_Selected_Press"
+   is_toggle="true"
+   label="Start"
+   label_selected="Stop"
+   layout="topleft"
+   left_pad="10"
+   name="AutoTuneFPS"
+   top_delta="-1"
+   tool_tip="The viewer will attempt to adjust settings to meet the target FPS."
+   width="72">
+  </button>
+  <check_box
+   control_name="AutoTuneLock"
+   follows="top|right"
+   height="20"
+   initial_value="true"
+   image_pressed="PushButton_Press"
+   image_pressed_selected="PushButton_Selected_Press"
+   image_selected="PushButton_Selected_Press"
+   is_toggle="true"
+   label="Continuous"
+   layout="topleft"
+   left_pad="10"
+   name="AutoTuneContinuous"
+   top_delta="0"
+   tool_tip="The viewer will continually adapt the settings to meet the target FPS until stopped even with the floater closed. When disabled clicking the Auto Tune button will adjust for the current settings then stop."
+   width="64">
+  </check_box>
+  <text
+   follows="left|top"
+   font="SansSerif"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   left="20"
+   name="settings_desc"
+   top_pad="20"
+   wrap="true"
+   width="150">
+    Settings affect
+  </text>
+  <combo_box
+   follows="top|left"
+   font="SansSerif"
+   height="20"
+   layout="topleft"
+   left_pad="15"
+   control_name="TuningFPSStrategy"
+   name="TuningFPSStrategy"
+   width="130">
+    <combo_box.item
+     label="Avatars Only"
+     name="av_only"
+     value="0" />
+    <combo_box.item
+     label="Avatars and Scene"
+     name="av_and_scene"
+     value="1" />
+  </combo_box>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border1"
+   top_pad="20"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left="20"
+   top_pad="15"
+   name="simplify_dist_desc"
+   width="580">
+    Reducing detail shown on avatars that are far away will improve graphics speed.
+  </text>
+  <check_box
+   control_name="AutoTuneImpostorByDistEnabled"
+   height="19"
+   label="Simplify avatars beyond"
+   label_text.text_color="White"
+   layout="topleft"
+   follows="top|left"
+   name="AutoTuneImpostorByDistEnabled"
+   tool_tip="When enabled the viewer will adjust the MaxNonImpostors setting to limit fully rendered avatars to those within the defined radius."
+   top_pad="15"
+   width="190" />
+  <spinner
+   control_name="AutoTuneImpostorFarAwayDistance"
+   height="20"
+   layout="topleft"
+   follows="top|left"
+   name="ffa_autotune"
+   left_pad="20"
+   decimal_digits="2"
+   min_val="16"
+   max_val="256"
+   width="60" >
+  </spinner>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left_pad="10"
+   name="dist_meters"
+   width="70">
+    meters
+  </text>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border2"
+   top_pad="20"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left="20"
+   top_pad="20"
+   name="dist_limits_desc"
+   width="580">
+    Choose the distance range that automatic settings will affect.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="15"
+   name="min_dist_lbl"
+   width="120">
+    Minimum distance
+  </text>
+  <spinner
+   control_name="AutoTuneRenderFarClipMin"
+   height="20"
+   layout="topleft"
+   left_pad="15"
+   follows="top|left"
+   name="min_dd_autotune"
+   decimal_digits="2"
+   min_val="32"
+   max_val="256"
+   width="60">
+  </spinner>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="15"
+   left="20"
+   name="pref_dist_lbl"
+   width="120">
+    Maximum distance
+  </text>
+  <spinner
+   control_name="AutoTuneRenderFarClipTarget"
+   height="20"
+   layout="topleft"
+   follows="top|left"
+   name="pref_dd_autotune"
+   left_pad="15"
+   min_val="32"
+   max_val="256"
+   width="60">
+  </spinner>
+</panel>
-- 
cgit v1.2.3