cb0cc571ee
Includes Chalice Yao's pause agent on attachment selection in LLSelectMgr::updateSelectionCenter() Includes some of Cinder Roxley's enhancements to the build floater for materials (flip buttons, sync materials, consistent control hiding) Includes Ansariel Hiller's fix for FIRE-8298 [BUG-869] [MAINT-1961], since this updates lltexturectrl.* to have related behaviors. Switches from using MIN_MANHATTAN_DIST for threshold in LLToolDragAndDrop to using the existing DragAndDropDistanceThreshold debug, like upstream. Translators: panel_tools_texture.xml should now be translated, floater_tools.xml should have the old panel removed. strings.xml now has "use_texture" string. notifications.xml Now has "LivePreviewUnavailable" alert. (don't forget to translate the ignoretext)
801 lines
24 KiB
XML
801 lines
24 KiB
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<panel
|
|
border="true"
|
|
follows="all"
|
|
height="420"
|
|
label="Texture"
|
|
left="1"
|
|
mouse_opaque="false"
|
|
help_topic="toolbox_texture_tab"
|
|
name="Texture"
|
|
bottom="-383"
|
|
width="270">
|
|
<panel.string
|
|
name="string repeats per meter">
|
|
Repeats Per Meter
|
|
</panel.string>
|
|
<panel.string
|
|
name="string repeats per face">
|
|
Repeats Per Face
|
|
</panel.string>
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left="10"
|
|
name="color label"
|
|
bottom="-12"
|
|
width="64">
|
|
Color
|
|
</text>
|
|
<!-- label is blank because control places it below the box -->
|
|
<color_swatch
|
|
can_apply_immediately="true"
|
|
follows="left|top"
|
|
height="32"
|
|
label=""
|
|
left="10"
|
|
name="colorswatch"
|
|
tool_tip="Click to open color picker"
|
|
bottom="-48"
|
|
width="64" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="92"
|
|
name="color trans"
|
|
bottom="-12"
|
|
width="90">
|
|
Alpha %
|
|
</text>
|
|
<spinner
|
|
decimal_digits="0"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="2"
|
|
initial_value="0"
|
|
left_delta="-1"
|
|
max_val="100"
|
|
name="ColorTrans"
|
|
bottom_delta="-23"
|
|
width="64" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="95"
|
|
name="glow label"
|
|
bottom="-12"
|
|
width="80">
|
|
Glow
|
|
</text>
|
|
<spinner
|
|
decimal_digits="2"
|
|
follows="left|top"
|
|
height="19"
|
|
initial_value="0"
|
|
left_delta="-1"
|
|
name="glow"
|
|
bottom_delta="-23"
|
|
width="64" />
|
|
<check_box
|
|
follows="left|top"
|
|
height="19"
|
|
label="Full Bright"
|
|
left="7"
|
|
name="checkbox fullbright"
|
|
bottom_delta="-16"
|
|
width="81" />
|
|
<combo_box
|
|
follows="left|top"
|
|
height="18"
|
|
left="10"
|
|
name="combobox matmedia"
|
|
bottom_delta="-25"
|
|
width="100">
|
|
<combo_box.item
|
|
label="Materials"
|
|
name="Materials"
|
|
value="Materials" />
|
|
<combo_box.item
|
|
label="Media"
|
|
name="Media"
|
|
value="Media" />
|
|
</combo_box>
|
|
<combo_box
|
|
follows="left|top"
|
|
height="18"
|
|
left_delta="110"
|
|
name="combobox mattype"
|
|
bottom_delta="0"
|
|
width="140">
|
|
<combo_box.item
|
|
label="Texture (diffuse)"
|
|
name="Texture (diffuse)"
|
|
value="Texture (diffuse)" />
|
|
<combo_box.item
|
|
label="Bumpiness (normal)"
|
|
name="Bumpiness (normal)"
|
|
value="Bumpiness (normal)" />
|
|
<combo_box.item
|
|
label="Shininess (specular)"
|
|
name="Shininess (specular)"
|
|
value="Shininess (specular)" />
|
|
</combo_box>
|
|
<texture_picker
|
|
allow_no_texture="true"
|
|
allow_invisible_texture="true"
|
|
can_apply_immediately="true"
|
|
default_image_name="Default"
|
|
fallback_image="materials_ui_x_24.png"
|
|
follows="left|top"
|
|
height="80"
|
|
label="Texture"
|
|
left="10"
|
|
name="texture control"
|
|
tool_tip="Click to choose a picture"
|
|
bottom_delta="-90"
|
|
width="64" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="75"
|
|
name="label alphamode"
|
|
bottom_delta="73"
|
|
width="90">
|
|
Alpha mode
|
|
</text>
|
|
<combo_box
|
|
follows="left|top"
|
|
height="18"
|
|
left_delta="-1"
|
|
name="combobox alphamode"
|
|
bottom_delta="-22"
|
|
width="100">
|
|
<combo_box.item
|
|
label="None"
|
|
name="None"
|
|
value="None" />
|
|
<combo_box.item
|
|
label="Alpha blending"
|
|
name="Alpha blending"
|
|
value="Alpha blending" />
|
|
<combo_box.item
|
|
label="Alpha masking"
|
|
name="Alpha masking"
|
|
value="Alpha masking" />
|
|
<combo_box.item
|
|
label="Emissive mask"
|
|
name="Emissive mask"
|
|
value="Emissive mask" />
|
|
</combo_box>
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="1"
|
|
name="label maskcutoff"
|
|
bottom_delta="-14"
|
|
width="90">
|
|
Mask cutoff
|
|
</text>
|
|
<spinner
|
|
decimal_digits="0"
|
|
min_val="0"
|
|
max_val="255"
|
|
follows="left|top"
|
|
height="19"
|
|
initial_value="55"
|
|
bottom_delta="-23"
|
|
left_delta="-1"
|
|
increment="1"
|
|
name="maskcutoff"
|
|
width="80" />
|
|
<texture_picker
|
|
allow_no_texture="true"
|
|
allow_invisible_texture="true"
|
|
can_apply_immediately="true"
|
|
default_image_name="Default"
|
|
fallback_image="materials_ui_x_24.png"
|
|
follows="left|top"
|
|
height="80"
|
|
label="Texture"
|
|
left="10"
|
|
name="bumpytexture control"
|
|
tool_tip="Click to choose a picture"
|
|
bottom_delta="-14"
|
|
width="64" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="75"
|
|
name="label bumpiness"
|
|
bottom_delta="73"
|
|
width="90">
|
|
Bumpiness
|
|
</text>
|
|
<combo_box
|
|
follows="left|top"
|
|
height="18"
|
|
left_delta="-1"
|
|
name="combobox bumpiness"
|
|
bottom_delta="-22"
|
|
width="100">
|
|
<combo_box.item
|
|
label="None"
|
|
name="None"
|
|
value="None" />
|
|
<combo_box.item
|
|
label="Brightness"
|
|
name="Brightness"
|
|
value="Brightness" />
|
|
<combo_box.item
|
|
label="Darkness"
|
|
name="Darkness"
|
|
value="Darkness" />
|
|
<combo_box.item
|
|
label="woodgrain"
|
|
name="woodgrain"
|
|
value="woodgrain" />
|
|
<combo_box.item
|
|
label="bark"
|
|
name="bark"
|
|
value="bark" />
|
|
<combo_box.item
|
|
label="bricks"
|
|
name="bricks"
|
|
value="bricks" />
|
|
<combo_box.item
|
|
label="checker"
|
|
name="checker"
|
|
value="checker" />
|
|
<combo_box.item
|
|
label="concrete"
|
|
name="concrete"
|
|
value="concrete" />
|
|
<combo_box.item
|
|
label="crustytile"
|
|
name="crustytile"
|
|
value="crustytile" />
|
|
<combo_box.item
|
|
label="cutstone"
|
|
name="cutstone"
|
|
value="cutstone" />
|
|
<combo_box.item
|
|
label="discs"
|
|
name="discs"
|
|
value="discs" />
|
|
<combo_box.item
|
|
label="gravel"
|
|
name="gravel"
|
|
value="gravel" />
|
|
<combo_box.item
|
|
label="petridish"
|
|
name="petridish"
|
|
value="petridish" />
|
|
<combo_box.item
|
|
label="siding"
|
|
name="siding"
|
|
value="siding" />
|
|
<combo_box.item
|
|
label="stonetile"
|
|
name="stonetile"
|
|
value="stonetile" />
|
|
<combo_box.item
|
|
label="stucco"
|
|
name="stucco"
|
|
value="stucco" />
|
|
<combo_box.item
|
|
label="suction"
|
|
name="suction"
|
|
value="suction" />
|
|
<combo_box.item
|
|
label="weave"
|
|
name="weave"
|
|
value="weave" />
|
|
<!--
|
|
NORSPEC-182, ensure item doesn't show up in menu until it should
|
|
<combo_box.item
|
|
label="Use texture"
|
|
name="Use texture"
|
|
value="Use texture" />
|
|
-->
|
|
</combo_box>
|
|
<texture_picker
|
|
allow_no_texture="true"
|
|
allow_invisible_texture="true"
|
|
can_apply_immediately="true"
|
|
default_image_name="Default"
|
|
fallback_image="materials_ui_x_24.png"
|
|
follows="left|top"
|
|
height="80"
|
|
label="Texture"
|
|
left="10"
|
|
name="shinytexture control"
|
|
tool_tip="Click to choose a picture"
|
|
bottom_delta="-51"
|
|
width="64" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
name="label shininess"
|
|
left_delta="75"
|
|
bottom_delta="73"
|
|
width="90">
|
|
Shininess
|
|
</text>
|
|
<combo_box
|
|
follows="left|top"
|
|
height="18"
|
|
left_delta="-1"
|
|
name="combobox shininess"
|
|
bottom_delta="-22"
|
|
width="100">
|
|
<combo_box.item
|
|
label="None"
|
|
name="None"
|
|
value="None" />
|
|
<combo_box.item
|
|
label="Low"
|
|
name="Low"
|
|
value="Low" />
|
|
<combo_box.item
|
|
label="Medium"
|
|
name="Medium"
|
|
value="Medium" />
|
|
<combo_box.item
|
|
label="High"
|
|
name="High"
|
|
value="High" />
|
|
<!--
|
|
NORSPEC-182, ensure item doesn't show up in menu until it should
|
|
<combo_box.item
|
|
label="Use texture"
|
|
name="Use texture"
|
|
value="Use texture" />
|
|
-->
|
|
</combo_box>
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="112"
|
|
name="label glossiness"
|
|
bottom_delta="22"
|
|
width="116">
|
|
Glossiness
|
|
</text>
|
|
<spinner
|
|
decimal_digits="0"
|
|
min_val="0"
|
|
max_val="255"
|
|
follows="left|top"
|
|
height="19"
|
|
initial_value="51"
|
|
increment="1"
|
|
bottom_delta="-25"
|
|
left_delta="-1"
|
|
name="glossiness"
|
|
width="64" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="1"
|
|
name="label environment"
|
|
bottom_delta="-11"
|
|
width="116">
|
|
Environment
|
|
</text>
|
|
<spinner
|
|
decimal_digits="0"
|
|
min_val="0"
|
|
max_val="255"
|
|
increment="1"
|
|
follows="left|top"
|
|
height="19"
|
|
initial_value="0"
|
|
bottom_delta="-23"
|
|
left_delta="-1"
|
|
name="environment"
|
|
width="64" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left_delta="-111"
|
|
name="label shinycolor"
|
|
bottom_delta="23"
|
|
width="116">
|
|
Color
|
|
</text>
|
|
<!-- label is blank because control places it below the box -->
|
|
<color_swatch
|
|
can_apply_immediately="true"
|
|
follows="left|top"
|
|
height="32"
|
|
label=""
|
|
left_delta="0"
|
|
name="shinycolorswatch"
|
|
tool_tip="Click to open color picker"
|
|
bottom_delta="-37"
|
|
width="100" />
|
|
<text
|
|
follows="left|top|right"
|
|
halign="center"
|
|
height="18"
|
|
left="10"
|
|
bottom_delta="40"
|
|
use_ellipses="true"
|
|
read_only="true"
|
|
name="media_info"
|
|
width="250">
|
|
URL of chosen media, if any, goes here
|
|
</text>
|
|
<button
|
|
follows="top|left"
|
|
height="20"
|
|
left="10"
|
|
name="add_media"
|
|
bottom_delta="-24"
|
|
tool_tip="Add Media"
|
|
label="Choose..."
|
|
width="80">
|
|
<button.commit_callback
|
|
function="BuildTool.AddMedia"/>
|
|
</button>
|
|
<button
|
|
follows="top|left"
|
|
height="20"
|
|
left_delta="85"
|
|
name="delete_media"
|
|
tool_tip="Delete this media texture"
|
|
bottom_delta="0"
|
|
label="Remove"
|
|
width="80">
|
|
<button.commit_callback
|
|
function="BuildTool.DeleteMedia"/>
|
|
</button>
|
|
<button
|
|
follows="left|top"
|
|
height="20"
|
|
label="Align"
|
|
left_delta="85"
|
|
name="button align"
|
|
bottom_delta="0"
|
|
tool_tip="Align media texture (must load first)"
|
|
width="80" />
|
|
<check_box
|
|
control_name="FSSynchronizeTextureMaps"
|
|
follows="top|left"
|
|
height="16"
|
|
label="Synchronize materials"
|
|
left="7"
|
|
bottom_delta="-44"
|
|
name="checkbox maps sync"
|
|
tool_tip="Synchronize texture map parameters"
|
|
width="199" />
|
|
<text
|
|
type="string"
|
|
length="1"
|
|
follows="left|top"
|
|
height="10"
|
|
left="10"
|
|
name="tex gen"
|
|
bottom_delta="-16"
|
|
width="140">
|
|
Mapping
|
|
</text>
|
|
<combo_box
|
|
follows="left|top"
|
|
height="18"
|
|
left_delta="84"
|
|
name="combobox texgen"
|
|
bottom_delta="-6"
|
|
width="80">
|
|
<combo_box.item
|
|
label="Default"
|
|
name="Default"
|
|
value="Default" />
|
|
<combo_box.item
|
|
label="Planar"
|
|
name="Planar"
|
|
value="Planar" />
|
|
</combo_box>
|
|
<check_box
|
|
follows="left|top"
|
|
bottom_delta="-2"
|
|
height="16"
|
|
enabled="false"
|
|
label="Align planar"
|
|
left_delta="85"
|
|
name="checkbox planar align"
|
|
width="160"
|
|
tool_tip="Aligns textures on all selected faces to the last selected face. Requires Planar texture mapping." />
|
|
<spinner
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.1"
|
|
initial_value="0"
|
|
label="Horizontal scale"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-10000"
|
|
max_val="10000"
|
|
decimal_digits="5"
|
|
name="TexScaleU"
|
|
bottom_delta="-20"
|
|
width="240" />
|
|
<button
|
|
bottom_delta="2"
|
|
follows="top|left"
|
|
height="17"
|
|
left_delta="241"
|
|
image_overlay="Edit_Flip_X.png"
|
|
name="flipTextureScaleU"
|
|
label=""
|
|
tool_tip="Flip"
|
|
width="17"/>
|
|
<spinner
|
|
bottom_delta="-22"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.1"
|
|
initial_value="0"
|
|
label="Vertical scale"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-10000"
|
|
max_val="10000"
|
|
decimal_digits="5"
|
|
name="TexScaleV"
|
|
width="240" />
|
|
<button
|
|
bottom_delta="2"
|
|
follows="top|left"
|
|
height="17"
|
|
image_overlay="Edit_Flip_X.png"
|
|
name="flipTextureScaleV"
|
|
label=""
|
|
tool_tip="Flip"
|
|
left_delta="241"
|
|
width="17"/>
|
|
<spinner
|
|
bottom_delta="-22"
|
|
decimal_digits="1"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.1"
|
|
initial_value=""
|
|
label="Repeats per meter"
|
|
label_width="170"
|
|
left="10"
|
|
max_val="100"
|
|
min_val="0.1"
|
|
name="rptctrl"
|
|
width="240" />
|
|
<spinner
|
|
bottom_delta="-20"
|
|
decimal_digits="2"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="1"
|
|
initial_value="0"
|
|
label="Rotation degrees"
|
|
label_width="170"
|
|
left="10"
|
|
max_val="9999"
|
|
min_val="-9999"
|
|
name="TexRot"
|
|
width="240" />
|
|
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Horizontal offset"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-1"
|
|
decimal_digits="5"
|
|
name="TexOffsetU"
|
|
width="240"/>
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Vertical offset"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-1"
|
|
decimal_digits="5"
|
|
name="TexOffsetV"
|
|
width="240" />
|
|
<spinner
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Horizontal scale"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-10000"
|
|
max_val="10000"
|
|
decimal_digits="5"
|
|
name="bumpyScaleU"
|
|
bottom_delta="100"
|
|
width="240" />
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Vertical scale"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-10000"
|
|
max_val="10000"
|
|
decimal_digits="5"
|
|
name="bumpyScaleV"
|
|
width="240" />
|
|
<spinner
|
|
decimal_digits="2"
|
|
follows="left|top"
|
|
height="19"
|
|
bottom_delta="-40"
|
|
increment="1"
|
|
initial_value="0"
|
|
label="Rotation degrees"
|
|
label_width="170"
|
|
left="10"
|
|
max_val="360"
|
|
min_val="0"
|
|
name="bumpyRot"
|
|
width="240" />
|
|
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Horizontal offset"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-1"
|
|
decimal_digits="5"
|
|
name="bumpyOffsetU"
|
|
width="240" />
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Vertical offset"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-1"
|
|
decimal_digits="5"
|
|
name="bumpyOffsetV"
|
|
width="240" />
|
|
<spinner
|
|
bottom_delta="100"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Horizontal scale"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-10000"
|
|
max_val="10000"
|
|
decimal_digits="5"
|
|
name="shinyScaleU"
|
|
width="240" />
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Vertical scale"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-10000"
|
|
max_val="10000"
|
|
decimal_digits="5"
|
|
name="shinyScaleV"
|
|
width="240" />
|
|
<spinner
|
|
decimal_digits="2"
|
|
follows="left|top"
|
|
height="19"
|
|
bottom_delta="-40"
|
|
increment="1"
|
|
initial_value="0"
|
|
label="Rotation degrees"
|
|
label_width="170"
|
|
left="10"
|
|
max_val="360"
|
|
min_val="0"
|
|
name="shinyRot"
|
|
width="240" />
|
|
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Horizontal offset"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-1"
|
|
decimal_digits="5"
|
|
name="shinyOffsetU"
|
|
width="240" />
|
|
<spinner
|
|
bottom_delta="-20"
|
|
follows="left|top"
|
|
height="19"
|
|
increment="0.01"
|
|
initial_value="0"
|
|
label="Vertical offset"
|
|
label_width="170"
|
|
left="10"
|
|
min_val="-1"
|
|
decimal_digits="5"
|
|
name="shinyOffsetV"
|
|
width="240" />
|
|
<button
|
|
follows="right|top"
|
|
height="20"
|
|
left="50"
|
|
bottom_delta="-24"
|
|
label="Copy"
|
|
name="copytextures"
|
|
tool_tip="Copy Texture Params"
|
|
width="84" />
|
|
<button
|
|
follows="right|top"
|
|
bottom_delta="0"
|
|
height="20"
|
|
label="Paste"
|
|
name="pastetextures"
|
|
tool_tip="Paste Texture Params"
|
|
left_delta="84"
|
|
width="84" />
|
|
<web_browser
|
|
visible="false"
|
|
enabled="false"
|
|
border_visible="true"
|
|
bottom_delta="0"
|
|
follows="top|left"
|
|
left="0"
|
|
name="title_media"
|
|
width="4"
|
|
height="4"
|
|
start_url="about:blank"
|
|
decouple_texture_size="true" />
|
|
</panel>
|