From 90b6b7e1b70a9bc8eb5def793616149fa0fceb4d Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 31 Mar 2011 11:38:34 -0400 Subject: Created Advanced Physics panel. Made a bunch of aesthetic changes to physics panel accordion. --- indra/newview/character/avatar_lad.xml | 28 +++++------ indra/newview/llpaneleditwearable.cpp | 8 +-- .../skins/default/xui/en/panel_edit_physics.xml | 58 ++++++++++++++-------- .../default/xui/en/panel_scrolling_param_base.xml | 13 ++--- indra/newview/skins/default/xui/en/strings.xml | 22 ++++---- 5 files changed, 74 insertions(+), 55 deletions(-) diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index a7e529adff..4585ba658c 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -11775,7 +11775,7 @@ render_pass="bump"> name="Breast_Physics_Mass" label="Breast Physics Mass" wearable="physics" - edit_group="physics_breasts_updown" + edit_group="physics_advanced" value_default=".1" value_min=".1" value_max="1"> @@ -11788,7 +11788,7 @@ render_pass="bump"> name="Breast_Physics_Smoothing" label="Breast Physics Smoothing" wearable="physics" - edit_group="physics_breasts_updown" + edit_group="physics_advanced" value_default="2" value_min="1" value_max="10"> @@ -11801,7 +11801,7 @@ render_pass="bump"> name="Breast_Physics_Gravity" label="Breast Physics Gravity" wearable="physics" - edit_group="physics_breasts_updown" + edit_group="physics_advanced" value_default="0" value_min="0" value_max=".1"> @@ -11869,7 +11869,7 @@ render_pass="bump"> name="Breast_Physics_UpDown_Drag" label="Breast Physics UpDown Drag" wearable="physics" - edit_group="physics_breasts_updown" + edit_group="physics_advanced" value_default=".15" value_min="0" value_max=".5"> @@ -11935,7 +11935,7 @@ render_pass="bump"> name="Breast_Physics_InOut_Drag" label="Breast Physics InOut Drag" wearable="physics" - edit_group="physics_breasts_inout" + edit_group="physics_advanced" value_default=".15" value_min="0" value_max=".5"> @@ -11948,7 +11948,7 @@ render_pass="bump"> name="Belly_Physics_Mass" label="Belly Physics Mass" wearable="physics" - edit_group="physics_belly_updown" + edit_group="physics_advanced" value_default=".1" value_min=".1" value_max="1"> @@ -11960,7 +11960,7 @@ render_pass="bump"> name="Belly_Physics_Smoothing" label="Belly Physics Smoothing" wearable="physics" - edit_group="physics_belly_updown" + edit_group="physics_advanced" value_default="2" value_min="1" value_max="10"> @@ -11972,7 +11972,7 @@ render_pass="bump"> name="Belly_Physics_Gravity" label="Belly Physics Gravity" wearable="physics" - edit_group="physics_belly_updown" + edit_group="physics_advanced" value_default="0" value_min="0" value_max=".1"> @@ -12032,7 +12032,7 @@ render_pass="bump"> name="Belly_Physics_UpDown_Drag" label="Belly Physics UpDown Drag" wearable="physics" - edit_group="physics_belly_updown" + edit_group="physics_advanced" value_default=".15" value_min="0" value_max=".5"> @@ -12045,7 +12045,7 @@ render_pass="bump"> name="Butt_Physics_Mass" label="Butt Physics Mass" wearable="physics" - edit_group="physics_butt_updown" + edit_group="physics_advanced" value_default=".1" value_min=".1" value_max="1"> @@ -12057,7 +12057,7 @@ render_pass="bump"> name="Butt_Physics_Smoothing" label="Butt Physics Smoothing" wearable="physics" - edit_group="physics_butt_updown" + edit_group="physics_advanced" value_default="2" value_min="1" value_max="10"> @@ -12069,7 +12069,7 @@ render_pass="bump"> name="Butt_Physics_Gravity" label="Butt Physics Gravity" wearable="physics" - edit_group="physics_butt_updown" + edit_group="physics_advanced" value_default="0" value_min="0" value_max=".1"> @@ -12129,7 +12129,7 @@ render_pass="bump"> name="Butt_Physics_UpDown_Drag" label="Butt Physics UpDown Drag" wearable="physics" - edit_group="physics_butt_updown" + edit_group="physics_advanced" value_default=".15" value_min="0" value_max=".5"> @@ -12190,7 +12190,7 @@ render_pass="bump"> name="Butt_Physics_LeftRight_Drag" label="Butt Physics LeftRight Drag" wearable="physics" - edit_group="physics_butt_leftright" + edit_group="physics_advanced" value_default=".15" value_min="0" value_max=".5"> diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index a7ee5a03b7..4db9a154ea 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -99,7 +99,8 @@ enum ESubpart { SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, - SUBPART_PHYSICS_BUTT_LEFTRIGHT + SUBPART_PHYSICS_BUTT_LEFTRIGHT, + SUBPART_PHYSICS_ADVANCED, }; using namespace LLVOAvatarDefines; @@ -238,7 +239,7 @@ LLEditWearableDictionary::Wearables::Wearables() addEntry(LLWearableType::WT_SKIRT, new WearableEntry(LLWearableType::WT_SKIRT,"edit_skirt_title","skirt_desc_text",1,1,1, TEX_SKIRT, TEX_SKIRT, SUBPART_SKIRT)); addEntry(LLWearableType::WT_ALPHA, new WearableEntry(LLWearableType::WT_ALPHA,"edit_alpha_title","alpha_desc_text",0,5,1, TEX_LOWER_ALPHA, TEX_UPPER_ALPHA, TEX_HEAD_ALPHA, TEX_EYES_ALPHA, TEX_HAIR_ALPHA, SUBPART_ALPHA)); addEntry(LLWearableType::WT_TATTOO, new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text",1,3,1, TEX_HEAD_TATTOO, TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO, SUBPART_TATTOO)); - addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text",0,0,5, SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT)); + addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text",0,0,6, SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED)); } LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type, @@ -313,7 +314,8 @@ LLEditWearableDictionary::Subparts::Subparts() addEntry(SUBPART_PHYSICS_BREASTS_INOUT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE)); addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH)); addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH)); - addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH)); + addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH)); + addEntry(SUBPART_PHYSICS_ADVANCED, new SubpartEntry(SUBPART_PHYSICS_ADVANCED, "mTorso", "physics_advanced", "physics_advanced_param_list", "physics_advanced_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH)); } LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part, diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml index 94cb68abbc..c6f974f4f1 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml @@ -8,98 +8,114 @@ name="edit_physics_panel" top_pad="10" width="333" > - + + + diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml index 177a2fe9f0..1351f75623 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml @@ -3,21 +3,22 @@ layout="topleft" left="0" name="LLScrollingPanelParamBase" - height="20" + height="16" width="290"> + bottom="0" + width="264" + /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 88b5eb7e23..6f03606869 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2511,31 +2511,31 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Bulbous Bulbous Nose -Mass -Smoothing -Gravity +Breast Mass +Breast Smoothing +Breast Gravity Max Effect Spring Gain Damping -Drag +Breast Cleavage Drag Max Effect Spring Gain Damping -Drag +Breast Bounce Drag -Mass -Smoothing -Gravity +Belly Mass +Belly Smoothing +Belly Gravity Max Effect Spring Gain Damping -Drag +Belly Bounce Drag Butt Mass Butt Smoothing @@ -2545,13 +2545,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Spring Gain Damping -Drag +Butt Bounce Drag Max Effect Spring Gain Damping -Drag +Butt Sway Drag Bushy Eyebrows Bushy Hair -- cgit v1.2.3