livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #992 from secondlife/vi-76 

secondlife/viewer#76: Change wording of terrain blending documentation when using materials
meow-7.2.2
cosmic-linden 2024-03-13 17:07:42 -07:00 committed by GitHub
parent 665d59d46e 1a539523e2
commit e056d4f720
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/testplans/pbr_terrain_composition.md
View File

@ -29,6 +29,8 @@ When the Region/Estate floater is opened to the terrain Tab, the current terrain
- If it is texture terrain, the "PBR Metallic Roughness" checkbox should be unchecked, and the floater should display the four textures applied to the terrain.
- If it is material terrain, the "PBR Metallic Roughness" checkbox should be checked, and the floater should display the four materials applied to the terrain.
In addition, where possible, textual labels and descriptions in the tab should make sense given the current value of the "PBR Metallic Roughness" checkbox. If the checkbox is unchecked, the labels should refer to textures. If the checkbox is checked, the labels should refer to materials.
### Toggling Composition Type
When toggling the "PBR Metallic Roughness" checkbox to the opposite value, which does not correspond to the current terrain type, one of the following sets of four terrain swatches will be displayed:

13
indra/newview/llfloaterregioninfo.cpp
View File

@ -1479,6 +1479,19 @@ void LLPanelRegionTerrainInfo::updateForMaterialType()
if (texture_label) { texture_label->setVisible(show_texture_controls); }
LLUICtrl* material_label = findChild<LLUICtrl>("detail_material_text");
if (material_label) { material_label->setVisible(show_material_controls); }
// Toggle visibility of documentation labels for terrain blending ranges
const std::vector<std::string> doc_suffixes { "5", "10", "11" };
std::string buffer;
for (const std::string& suffix : doc_suffixes)
{
buffer = "height_text_lbl" + suffix;
LLUICtrl* texture_doc_label = findChild<LLUICtrl>(buffer);
if (texture_doc_label) { texture_doc_label->setVisible(show_texture_controls); }
buffer += "_material";
LLUICtrl* material_doc_label = findChild<LLUICtrl>(buffer);
if (material_doc_label) { material_doc_label->setVisible(show_material_controls); }
}
}
// virtual

37
indra/newview/skins/default/xui/en/panel_region_terrain.xml
View File

@ -257,6 +257,19 @@
width="300">
Texture Elevation Ranges
</text>
<text
visible="false"
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="height_text_lbl5_material"
top_delta="0"
width="300">
Material Elevation Ranges
</text>
<text
follows="left|top"
height="20"
@ -268,6 +281,18 @@
word_wrap="true">
These values represent the blend range for the textures above.
</text>
<text
visible="false"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="height_text_lbl10_material"
top_delta="0"
width="200"
word_wrap="true">
These values represent the blend range for the materials above.
</text>
<text
follows="left|top"
height="60"
@ -279,6 +304,18 @@
word_wrap="true">
Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
</text>
<text
visible="false"
follows="left|top"
height="60"
layout="topleft"
left_delta="0"
name="height_text_lbl11_material"
top_delta="0"
width="200"
word_wrap="true">
Measured in meters, the LOW value is the MAXIMUM height of Material #1, and the HIGH value is the MINIMUM height of Material #4.
</text>
<text
follows="left|top"
height="20"