From 01cf98cec94b3b08bf56d63f994eab66d33daf5b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Sep 2022 22:15:53 +0300
Subject: SL-18039 Added scroll into material editor
---
.../default/xui/en/floater_material_editor.xml | 767 +++++++++++----------
1 file changed, 396 insertions(+), 371 deletions(-)
(limited to 'indra/newview/skins')
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 0a05a4f868..eda28c5a4b 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -1,355 +1,378 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- can_resize="false"
+ can_resize="true"
default_tab_group="1"
height="887"
+ width="256"
+ min_height="500"
+ min_width="256"
layout="topleft"
name="material editor"
help_topic="material_editor"
- title="[MATERIAL_NAME]"
- width="256">
+ title="[MATERIAL_NAME]">
<string name="no_upload_fee_string">no upload fee</string>
<string name="upload_fee_string">L$[FEE] upload fee</string>
- <check_box
- follows="left|top"
- label="Double Sided"
- left="14"
- top="14"
- name="double sided"
- height="25"
- width="120" />
- <panel
- border="true"
- follows="left|top"
- width="246"
- height="196"
- layout="topleft"
- left="5"
- mouse_opaque="false"
- name="albedo_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">
- Albedo:
- </text>
- <texture_picker
- can_apply_immediately="true"
- default_image_name="Default"
- fallback_image="materials_ui_x_24.png"
- allow_no_texture="true"
+
+ <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
+ 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"
- top_pad="8"
- height="151"
+ width="246"
+ height="196"
layout="topleft"
- left="10"
- name="albedo_texture"
- tool_tip="Albedo 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="albedo_upload_fee"
+ left="1"
+ mouse_opaque="false"
+ name="albedo_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">
+ Albedo:
+ </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="albedo_texture"
+ tool_tip="Albedo 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="albedo_upload_fee"
>
- No upload fee
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- top="8"
+ 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="albedo color"
- width="40" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="0"
- top_pad="5"
- width="96"
+ 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"
- min_val="0"
- max_val="1"
- name="transparency"
- width="64"
+ 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"
+ <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"
+ 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="5"
- mouse_opaque="false"
- name="metallic_texture_pnl"
- top_pad="5"
- >
- <text
- type="string"
- font.style="BOLD"
- length="1"
+ </panel>
+ <panel
+ border="true"
follows="left|top"
- height="10"
+ width="246"
+ height="175"
layout="topleft"
- left="10"
- top="5"
+ 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"
+ 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"
+ <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"
+ 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"
+ 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"
+ <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"
- height="10"
+ width="246"
+ height="175"
layout="topleft"
- left_delta="0"
+ left="1"
+ mouse_opaque="false"
+ name="emissive_texture_pnl"
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="5"
- 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"
+ <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"
+ 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
+ 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"
@@ -373,64 +396,66 @@
max_val="100"
width="64"
/>-->
- </panel>
- <panel
- border="true"
- follows="left|top"
- width="246"
- height="175"
- layout="topleft"
- left="5"
- mouse_opaque="false"
- top_pad="5"
- name="normal_texture_pnl"
+ </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"
+ <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>
+ No upload fee
+ </text>
+ </panel>
+ </panel>
+ </scroll_container>
<panel
follows="right|bottom"
width="246"
height="97"
layout="bottomright"
- top_delta="-2"
+ top_pad="0"
left="5"
name="button_panel"
>
--
cgit v1.2.3
From bded34a8615a2adceb2eda2f2d85501a70990efe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Sep 2022 19:22:49 +0300
Subject: SL-17999 PBR should reuse texture possition channels from normal
materials
---
indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 --
1 file changed, 2 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 922c58fa94..54a00da294 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -153,7 +153,6 @@
value="Media" />
</combo_box>
<radio_group
- control_name="ComboMaterialType"
height="50"
layout="topleft"
left_pad="5"
@@ -184,7 +183,6 @@
value="2"/>
</radio_group>
<radio_group
- control_name="ComboMaterialType"
height="50"
layout="topleft"
left_delta="0"
--
cgit v1.2.3