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

Merge branch 'meshuploader-prefs'

meow-7.2.2
Beq 2020-11-26 01:07:01 +00:00
parent 85c177459b 379f1a424e
commit 7b2e67efbd
2 changed files with 177 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloatermodelpreview.cpp
View File

@ -58,6 +58,7 @@
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "lltabcontainer.h"
#include "llcolorswatch.h" // <FS:Beq>
#include "lltrans.h"
#include "llcallbacklist.h"
#include "llviewertexteditor.h"
@ -193,6 +194,15 @@ BOOL LLFloaterModelPreview::postBuild()
getChild<LLCheckBoxCtrl>("show_joint_overrides")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
getChild<LLCheckBoxCtrl>("show_joint_positions")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
getChild<LLCheckBoxCtrl>("show_uv_guide")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1)); // <FS:Beq> - Add UV guide overlay to pmesh preview
// <FS:Beq> support for settings panel of floater
const auto& preview_refresh_cb = [this](LLUICtrl *, const LLSD &){ if(this->mModelPreview){mModelPreview->refresh();}};
getChild<LLColorSwatchCtrl>("mesh_preview_canvas_color")->setCommitCallback(preview_refresh_cb);
getChild<LLColorSwatchCtrl>("mesh_preview_edge_color")->setCommitCallback(preview_refresh_cb);
getChild<LLColorSwatchCtrl>("mesh_preview_physics_edge_color")->setCommitCallback(preview_refresh_cb);
getChild<LLColorSwatchCtrl>("mesh_preview_physics_fill_color")->setCommitCallback(preview_refresh_cb);
getChild<LLColorSwatchCtrl>("mesh_preview_degenerate_edge_color")->setCommitCallback(preview_refresh_cb);
getChild<LLColorSwatchCtrl>("mesh_preview_degenerate_fill_color")->setCommitCallback(preview_refresh_cb);
// </FS:Beq>
childDisable("upload_skin");
childDisable("upload_joints");
@ -560,11 +570,13 @@ void add_row_to_list(LLScrollListCtrl *listp,
cell_params.column = "model_name";
cell_params.value = name;
cell_params.font_halign = LLFontGL::LEFT; // <FS:Beq> Fix ugly alignment
item_params.columns.add(cell_params);
cell_params.column = "axis_x";
cell_params.value = vx;
cell_params.font_halign = LLFontGL::RIGHT; // <FS:Beq> Fix ugly alignment
item_params.columns.add(cell_params);
cell_params.column = "axis_y";

194
indra/newview/skins/default/xui/en/floater_model_preview.xml
View File

@ -1304,14 +1304,14 @@
name="pos_overrides_list"
column_padding="0"
draw_heading="true"
draw_stripes="false"
draw_stripes="true"
heading_height="23"
height="100"
height="199"
left_delta="0"
top_pad="0"
width="385">
<scroll_list.columns
label="Model"
<scroll_list.columns
label="Model"
name="model_name"
relative_width="0.49" />
<scroll_list.columns
@ -1327,30 +1327,6 @@
name="axis_z"
relative_width="0.17" />
</scroll_list>
<panel
follows="top|left"
layout="topleft"
border="true"
left="410"
height="110"
top_pad="5"
width="200"
name="avatar_model_hint_panel"
>
<text
left="5"
width="190"
height="110"
name="avatar_model_hint_text"
wrap="true"
word_wrap="true"
type="string">
Tip:
Too many items use the default (right hand) unnecessarily.
Please consider using an attachment point close to the item's position on the body.
</text>
</panel>
</panel>
<panel
label="Log"
@ -1397,9 +1373,169 @@ Please consider using an attachment point close to the item's position on the bo
word_wrap="true">
</text_editor>
</panel>
<panel
label="Preview Settings"
layout="topleft"
name="mesh_preview_settings_panel">
<view_border
bevel_style="none"
follows="top|left"
height="306"
layout="topleft"
left="3"
ignore_tab="false"
right="-21"
name="mesh_preview_settings_tab_border"
top_pad="0"
width="619" />
<text
follows="left|top"
layout="topleft"
left="10"
height="12"
name="mesh_upload_behaviour_label"
top="8"
width="175">
Model Upload Behaviour Settings :
</text>
<check_box
height="15"
control_name="FSMeshUploadAutoEnableWeights"
follows="top|left"
top_pad="8"
left="24"
width="70"
label="Auto-enable weights"
tooltip="Automatically set weights enabled for meshes with rigging info"
name="mesh_preview_auto_weights"/>
<check_box
control_name="FSMeshUploadAutoShowWeightsWhenEnabled"
follows="top|left"
top_pad="8"
left="24"
width="70"
label="Auto-preview weights"
tooltip="Automatically show weights in preview for meshes with rigging info"
name="mesh_preview_auto_show_weights"/>
<text
follows="left|top"
layout="topleft"
left="10"
height="12"
name="mesh_preview_colors_label"
top_pad="10"
width="175">
Model Upload Preview Colors:
</text>
<text
type="string"
length="1"
follows="left|top"
height="14"
layout="topleft"
left="24"
valign="center"
mouse_opaque="false"
name="user_label"
top_pad="20"
width="80">
General :
</text>
<color_swatch
control_name="MeshPreviewCanvasColor"
follows="top|left"
left_pad="14"
height="64"
width="120"
top_delta="-12"
can_apply_immediately="true"
label="Background"
tooltip="Canvas color for the Mesh uploader"
name="mesh_preview_canvas_color"/>
<color_swatch
control_name="MeshPreviewEdgeColor"
follows="top|left"
left_pad="24"
height="64"
width="120"
can_apply_immediately="true"
label="Model Edge"
tooltip="Edge color for the model in preview window on the Mesh uploader"
name="mesh_preview_edge_color"/>
<text
type="string"
length="1"
follows="left|top"
height="14"
layout="topleft"
left="24"
valign="center"
mouse_opaque="false"
name="physics_settings_label"
top_pad="20"
width="80">
Physics :
</text>
<color_swatch
control_name="MeshPreviewPhysicsEdgeColor"
follows="top|left"
left_pad="14"
height="64"
can_apply_immediately="true"
width="120"
top_delta="-12"
label="Physics Edge"
tooltip="Edge color for physics triangles in preview window on the Mesh uploader"
name="mesh_preview_physics_edge_color"/>
<color_swatch
control_name="MeshPreviewPhysicsFillColor"
follows="top|left"
left_pad="20"
height="64"
width="120"
can_apply_immediately="true"
label="Physics Fill"
tooltip="Fill color for physics model in preview window on the Mesh uploader"
name="mesh_preview_physics_fill_color"/>
<text
type="string"
length="1"
follows="left|top"
height="14"
layout="topleft"
left="24"
valign="center"
mouse_opaque="false"
name="physics_issues_setting_label"
top_pad="24"
width="80">
Physics Issues:
</text>
<color_swatch
control_name="MeshPreviewDegenerateEdgeColor"
follows="top|left"
left_pad="14"
height="64"
width="120"
top_delta="-12"
can_apply_immediately="true"
label="Bad Triangle Edge"
tooltip="Edge color for degenerate (thin) triangles in preview window on the Mesh uploader"
name="mesh_preview_degenerate_edge_color"/>
<color_swatch
control_name="MeshPreviewDegenerateFillColor"
follows="top|left"
left_pad="24"
height="64"
width="120"
can_apply_immediately="true"
label="Bad Triangle Fill"
tooltip="Fill color for degenerate (thin) triangles in preview window on the Mesh uploader"
name="mesh_degenerate_fill_color"/>
</panel>
</tab_container>
<panel
follows="top|left|bottom"
follows="top|left|bottom"
layout="topleft"
height="195"
left="4"