From 8c5c07d30749f2abeb475c37b81f9cf089721a1e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 1 Nov 2022 22:01:45 +0200
Subject: SL-18448 Modified Material Editor to match overrides better

---
 .../xui/en/floater_live_material_editor.xml        |  37 ++
 .../default/xui/en/floater_material_editor.xml     | 433 +--------------------
 .../skins/default/xui/en/panel_gltf_material.xml   | 382 ++++++++++++++++++
 3 files changed, 429 insertions(+), 423 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_live_material_editor.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_gltf_material.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
new file mode 100644
index 0000000000..317783f794
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ height="786"
+ width="256"
+ min_height="500"
+ min_width="256"
+ layout="topleft"
+ name="material editor"
+ help_topic="material_editor"
+ single_instance="true"
+ title="Editing Material">
+  <scroll_container
+   name="materials_scroll"
+   top="14"
+   left="4"
+   height="768"
+   width="247"
+   follows="all"
+   layout="topleft"
+   color="DkGray2"
+   opaque="true"
+   reserve_scroll_corner="false">
+    <panel
+     name="panel_material"
+     filename="panel_gltf_material.xml"
+     border="false"
+     visible="true"
+     layout="topleft"
+     top="0"
+     left="0"
+     height="768"
+     width="247" />
+  </scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 84264cd2e6..29def9bd53 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -27,430 +27,17 @@
    layout="topleft"
    color="DkGray2"
    opaque="true"
-   reserve_scroll_corner="false"
-      >
+   reserve_scroll_corner="false">
     <panel
-      border="false"
-      name="scroll_panel"
-      top="0"
-      left="0"
-      height="768"
-      width="247"
-        >
-      <check_box
-              follows="left|top"
-              label="Double Sided"
-              left="10"
-              top="0"
-              name="double sided"
-              height="25"
-              width="120" />
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="196"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             name="base_color_texture_pnl"
-             top_pad="5"
-         >
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left="10"
-                   top="5"
-                   width="128">
-          Base Color:
-        </text>
-        <texture_picker
-                 can_apply_immediately="true"
-                 default_image_name="Default"
-                 fallback_image="materials_ui_x_24.png"
-                 allow_no_texture="true"
-                 follows="left|top"
-                 top_pad="8"
-                 height="151"
-                 layout="topleft"
-                 left="10"
-                 name="base_color_texture"
-                 tool_tip="Base Color map.  Alpha channel is optional and used for transparency."
-                 width="128" />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="base_color_upload_fee"
-             >
-          No upload fee
-        </text>
-        <text
-                   type="string"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left_pad="5"
-                   top="8"
-             >
-          Tint
-        </text>
-        <color_swatch
-                          can_apply_immediately="true"
-                          follows="left|top"
-                          height="40"
-                          label_height="0"
-                          layout="topleft"
-                          left_delta="0"
-                          top_pad="5"
-                          name="base color"
-                          width="40" />
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 top_pad="5"
-                 width="96"
-             >
-          Transparency
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="1"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="transparency"
-                  width="64"
-             />
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 name="label alphamode"
-                 text_readonly_color="LabelDisabledColor"
-                 top_pad="5"
-                 width="90">
-          Alpha mode
-        </text>
-        <combo_box
-         height="23"
-         layout="topleft"
-         left_delta="0"
-         name="alpha mode"
-         top_pad="4"
-         width="96">
-          <combo_box.item
-           label="None"
-           name="None"
-           value="OPAQUE" />
-          <combo_box.item
-           label="Alpha blending"
-           name="Alpha blending"
-           value="BLEND" />
-          <combo_box.item
-           label="Alpha masking"
-           name="Alpha masking"
-           value="MASK" />
-        </combo_box>
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 top_pad="5"
-                 width="96"
-             >
-          Alpha Cutoff
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="1"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="alpha cutoff"
-                  width="64"
-             />
-      </panel>
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="175"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             name="metallic_texture_pnl"
-             top_pad="5"
-         >
-        <text
-                 type="string"
-                 font.style="BOLD"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left="10"
-                 top="5"
-             >
-          Metallic-Roughness:
-        </text>
-        <texture_picker
-                 can_apply_immediately="true"
-                 default_image_name="Default"
-                 fallback_image="materials_ui_x_24.png"
-                 allow_no_texture="true"
-                 follows="left|top"
-                 width="128"
-                 height="151"
-                 layout="topleft"
-                 left="10"
-                 name="metallic_roughness_texture"
-                 tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
-                 top_pad="8"
-             />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="metallic_upload_fee"
-           >
-          No upload fee
-        </text>
-        <text
-                   type="string"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left_pad="5"
-                   top="8"
-             >
-          Metallic Factor
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="0"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="metalness factor"
-                  width="64"
-             />
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 top_pad="5"
-                 width="96"
-             >
-          Roughness Factor
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="0"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="roughness factor"
-                  width="64"
-             />
-      </panel>
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="175"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             name="emissive_texture_pnl"
-             top_pad="5"
-         >
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left="10"
-                   top="5"
-                   width="64">
-          Emissive:
-        </text>
-        <texture_picker
-                   can_apply_immediately="true"
-                   default_image_name="Default"
-                   fallback_image="materials_ui_x_24.png"
-                   allow_no_texture="true"
-                   follows="left|top"
-                   top_pad="8"
-                   height="151"
-                   layout="topleft"
-                   left="10"
-                   name="emissive_texture"
-                   width="128" />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="emissive_upload_fee"
-           >
-          No upload fee
-        </text>
-        <text
-                   type="string"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left_pad="5"
-                   top="8"
-             >
-          Tint
-        </text>
-        <color_swatch
-                          can_apply_immediately="true"
-                          follows="left|top"
-                          height="40"
-                          label_height="0"
-                          layout="topleft"
-                          left_delta="0"
-                          top_pad="5"
-                          name="emissive color"
-                          width="40" />
-        <!--<text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             width="64"
-             layout="topleft"
-             left_delta="0"
-             top_pad="5"
-             >
-      Intensity
-    </text>
-    <spinner
-               decimal_digits="3"
-               follows="left|top"
-               height="19"
-               increment="0.01"
-               initial_value="0"
-               layout="topleft"
-               left_delta="0"
-               top_pad="5"
-               max_val="100"
-              width="64"
-             />-->
-      </panel>
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="175"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             top_pad="5"
-             name="normal_texture_pnl"
-         >
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left="10"
-                   top="5"
-                   width="64">
-          Normal:
-        </text>
-        <texture_picker
-                   can_apply_immediately="true"
-                   default_image_name="Default"
-                   fallback_image="materials_ui_x_24.png"
-                   allow_no_texture="true"
-                   follows="left|top"
-                   top_pad="8"
-                   height="151"
-                   layout="topleft"
-                   left="10"
-                   name="normal_texture"
-                   width="128" />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="normal_upload_fee"
-           >
-          No upload fee
-        </text>
-      </panel>
-    </panel>
+     name="panel_material"
+     filename="panel_gltf_material.xml"
+     border="false"
+     visible="true"
+     layout="topleft"
+     top="0"
+     left="0"
+     height="768"
+     width="247" />
   </scroll_container>
 
   <panel
diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
new file mode 100644
index 0000000000..61cb6d8a8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ layout="topleft"
+ follows="all"
+ border="false"
+ name="panel_gltf_material"
+ top="0"
+ left="0"
+ height="768"
+ width="247">
+  <check_box
+    follows="left|top"
+    layout="topleft"
+    label="Double Sided"
+    left="10"
+    top="0"
+    name="double sided"
+    height="25"
+    width="120" />
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="196"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    name="base_color_texture_pnl"
+    top_pad="5"
+         >
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5"
+      width="128">
+      Base Color:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      top_pad="8"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="base_color_texture"
+      tool_tip="Base Color map.  Alpha channel is optional and used for transparency."
+      width="128" />
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="base_color_upload_fee">
+      No upload fee
+    </text>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="5"
+      top="8">
+      Tint
+    </text>
+    <color_swatch
+      can_apply_immediately="true"
+      follows="left|top"
+      height="40"
+      label_height="0"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      name="base color"
+      width="40" />
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      width="96">
+      Transparency
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="1"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="transparency"
+      width="64"/>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      name="label alphamode"
+      text_readonly_color="LabelDisabledColor"
+      top_pad="5"
+      width="90">
+      Alpha mode
+    </text>
+    <combo_box
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     name="alpha mode"
+     top_pad="4"
+     width="96">
+      <combo_box.item
+       label="None"
+       name="None"
+       value="OPAQUE" />
+      <combo_box.item
+       label="Alpha blending"
+       name="Alpha blending"
+       value="BLEND" />
+      <combo_box.item
+       label="Alpha masking"
+       name="Alpha masking"
+       value="MASK" />
+    </combo_box>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      width="96">
+      Alpha Cutoff
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="1"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="alpha cutoff"
+      width="64"/>
+  </panel>
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="175"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    name="metallic_texture_pnl"
+    top_pad="5">
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5">
+      Metallic-Roughness:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      width="128"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="metallic_roughness_texture"
+      tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
+      top_pad="8"/>
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="metallic_upload_fee">
+      No upload fee
+    </text>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="5"
+      top="8">
+      Metallic Factor
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="0"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="metalness factor"
+      width="64"/>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      width="96">
+      Roughness Factor
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="0"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="roughness factor"
+      width="64"/>
+  </panel>
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="175"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    name="emissive_texture_pnl"
+    top_pad="5">
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5"
+      width="64">
+      Emissive:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      top_pad="8"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="emissive_texture"
+      width="128" />
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="emissive_upload_fee">
+      No upload fee
+    </text>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="5"
+      top="8">
+      Tint
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="40"
+     label_height="0"
+     layout="topleft"
+     left_delta="0"
+     top_pad="5"
+     name="emissive color"
+     width="40" />
+  </panel>
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="175"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    top_pad="5"
+    name="normal_texture_pnl">
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5"
+      width="64">
+      Normal:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      top_pad="8"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="normal_texture"
+      width="128" />
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="normal_upload_fee">
+      No upload fee
+    </text>
+  </panel>
+</panel>
-- 
cgit v1.2.3