SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.

5 files changed, 400 insertions, 1 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
new file mode 100644
index 0000000000..5d72e6f79d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="false"
+ default_tab_group="1"
+ height="777"
+ layout="topleft"
+ name="material editor"
+ help_topic="material_editor"
+ title="Material: [MATERIAL_NAME]"
+ width="256">
+  <panel
+    border="true"
+         follows="left|top"
+         width="246"
+         height="196"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         name="Texture"
+         top="20"
+         >
+  <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             top="5"
+             width="64">
+    Albedo:
+  </text>
+  <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             follows="left|top"
+             top_pad="8"
+             height="151"
+             layout="topleft"
+             left="10"
+             name="albedo texture"
+             tool_tip="Albedo map.  Alpha channel is optional and used for transparency."
+             width="128" />
+  <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-15"
+             >
+    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="albedo 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"
+               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"
+               max_val="1"
+               name="alpha cutoff"
+              width="64"
+             />
+  </panel>
+  <panel
+    border="true"
+         follows="left|top"
+         width="246"
+         height="160"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         name="Texture"
+         top_pad="5"
+         >
+    <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             top_pad="5"
+             >
+    Metallic-Roughness:
+  </text>
+  <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             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"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-15"
+             >
+    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"
+             max_val="100"
+             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"
+               max_val="100"
+               name="roughness factor"
+              width="64"
+             />
+  </panel>
+  <panel
+    border="true"
+         follows="left|top"
+         width="246"
+         height="160"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         name="Texture"
+         top_pad="5"
+         >
+    <text
+               type="string"
+               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"
+               follows="left|top"
+               top_pad="8"
+               height="151"
+               layout="topleft"
+               left="10"
+               name="emissive texture"
+               width="128" />
+    <text
+               type="string"
+               length="1"
+               follows="left|top"
+               height="10"
+               layout="topleft"
+               left_pad="5"
+               top_delta="-15"
+             >
+      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="160"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         top_pad="5"
+         >
+    <text
+               type="string"
+               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"
+               follows="left|top"
+               top_pad="8"
+               height="151"
+               layout="topleft"
+               left="10"
+               name="normal texture"
+               width="128" />
+    <!--<check_box
+          follows="left|top"
+          label="Mikkt Space"
+          left_pad="10"
+          top_delta="0"
+          height="25"
+          width="120" />-->
+  </panel>
+  <check_box
+          follows="left|top"
+          label="Double Sided"
+          left="5"
+          top_pad="5"
+          name="double sided"
+          height="25"
+          width="120" />
+  <button
+             follows="right|bottom"
+             height="25"
+             label="Save"
+             layout="bottomright"
+             name="save"
+             tool_tip="Browse for an editor (executable) to edit floater XML files"
+             top_delta="-2"
+             left="5"
+             width="246" />
+  
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 78ca170813..60a177f0bd 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -183,6 +183,14 @@
          function="Inventory.DoCreate"
          parameter="gesture" />
     </menu_item_call>
+  <menu_item_call
+     label="New Material"
+     layout="topleft"
+     name="New Material">
+    <menu_item_call.on_click
+     function="Inventory.DoCreate"
+     parameter="material" />
+  </menu_item_call>
     <menu
      label="New Clothes"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 3385a29a6c..0e193521a3 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -97,6 +97,14 @@
                  function="Inventory.DoCreate"
                  parameter="gesture" />
             </menu_item_call>
+            <menu_item_call
+                       label="New Material"
+                       layout="topleft"
+                       name="New Material">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="material" />
+            </menu_item_call>
             <menu
              height="175"
              label="New Clothes"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7a5c2099eb..623d0d88eb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1595,7 +1595,15 @@ function="World.EnvPreset"
                  parameter="" />
             </menu_item_call>
         </menu>
-        <menu_item_separator/>
+        <menu_item_call
+            label="Material Editor"
+            name="material_editor_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="material_editor" />
+        </menu_item_call>
+
+      <menu_item_separator/>
         <menu_item_call
          enabled="false"
          label="Undo"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index acb3a720b9..0866f29355 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3835,6 +3835,7 @@ Abuse Report</string>
   <string name="New Physics">New Physics</string>
   <string name="Invalid Wearable">Invalid Wearable</string>
   <string name="New Gesture">New Gesture</string>
+  <string name="New Material">New Material</string>
   <string name="New Script">New Script</string>
   <string name="New Note">New Note</string>
   <string name="New Folder">New Folder</string>