From 2c6a9dd47e617c79ab3df4d758cd9f2e6b77c21a Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 17:38:31 -0400 Subject: Changed "Range" to "Max Velocity" Changed logic to reset to user params if velocity is 0. Code cleanup. Took out extraneous "Physics" accordions from previous implementation. --- indra/newview/character/avatar_lad.xml | 10 ++++----- indra/newview/llsidepanelappearance.cpp | 10 --------- indra/newview/llsidepanelappearance.h | 1 - indra/newview/llvoavatar.cpp | 25 ++++++---------------- .../skins/default/xui/en/panel_edit_shape.xml | 14 ------------ indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 6 files changed, 14 insertions(+), 50 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index e37ff1833d..9609e58918 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9203,8 +9203,8 @@ render_pass="bump"> id="1081" group="0" sex="female" - name="Breast_Physics_Side_Range" - label="Breast Physics Side Range" + name="Breast_Physics_Side_Max_Velocity" + label="Breast Physics Side Max Speed" wearable="physics" edit_group="physics" label_min="Less" @@ -9294,8 +9294,8 @@ render_pass="bump"> id="1086" group="0" sex="female" - name="Breast_Physics_UpDown_Range" - label="Breast Physics UpDown Range" + name="Breast_Physics_UpDown_Max_Velocity" + label="Breast Physics UpDown Max Speed" wearable="physics" edit_group="physics" label_min="Less" @@ -9338,7 +9338,7 @@ render_pass="bump"> label="Breast Cleavage" wearable="shape" edit_group="shape_torso" - edit_group_order="7" + edit_group_order="8" label_min="Less" label_max="More" value_default="10" diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index cd6f87f615..e8733bf3e4 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -176,11 +176,6 @@ void LLSidepanelAppearance::onOpen(const LLSD& key) { showWearableEditPanel(); } - else if (type == "edit_physics") - { - showPhysicsEditPanel(); - } - } mOpened = true; @@ -312,11 +307,6 @@ void LLSidepanelAppearance::showWearableEditPanel(LLWearable *wearable /* = NULL toggleWearableEditPanel(TRUE, wearable, disable_camera_switch); } -void LLSidepanelAppearance::showPhysicsEditPanel(LLWearable *wearable /* = NULL*/) -{ - showWearableEditPanel(wearable, TRUE); -} - void LLSidepanelAppearance::toggleMyOutfitsPanel(BOOL visible) { if (!mPanelOutfitsInventory || mPanelOutfitsInventory->getVisible() == visible) diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index 70c8b7b797..1a200e255c 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -60,7 +60,6 @@ public: void showOutfitsInventoryPanel(); void showOutfitEditPanel(); void showWearableEditPanel(LLWearable *wearable = NULL, BOOL disable_camera_switch = FALSE); - void showPhysicsEditPanel(LLWearable *wearable = NULL); void setWearablesLoading(bool val); void showDefaultSubpart(); void updateScrollingPanelList(); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index ac1af83959..c9e47d8996 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -792,22 +792,6 @@ public: return TRUE; } - /* - FILE *fread = fopen("c:\\temp\\breast_data.txt","r"); - if (fread) - { - char dummy_str[255]; - fscanf(fread,"%s %f\n",dummy_str, &mBreastMassParam); - fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastSpringParam[0],&mBreastSpringParam[1],&mBreastSpringParam[2]); - fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastGainParam[0],&mBreastGainParam[1],&mBreastGainParam[2]); - fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastDampingParam[0],&mBreastDampingParam[1],&mBreastDampingParam[2]); - fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastMaxVelocityParam[0],&mBreastMaxVelocityParam[1],&mBreastMaxVelocityParam[2]); - fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastDragParam[0], &mBreastDragParam[1], &mBreastDragParam[2]); - fscanf(fread,"%s %d\n",dummy_str, &mBreastSmoothingParam); - } - fclose(fread); - */ - /* TEST: 1. Change outfits 2. FPS effect @@ -824,13 +808,13 @@ public: mBreastSpringParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Spring"); mBreastGainParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Gain"); mBreastDampingParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Damping"); - mBreastMaxVelocityParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Range"); + mBreastMaxVelocityParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Max_Velocity"); mBreastDragParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Drag"); mBreastSpringParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Spring"); mBreastGainParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Gain"); mBreastDampingParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Damping"); - mBreastMaxVelocityParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Range"); + mBreastMaxVelocityParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Max_Velocity"); mBreastDragParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Drag"); if (mCharacter->getSex() != SEX_FEMALE) return TRUE; @@ -890,8 +874,13 @@ public: LLVector3 new_local_pt = breast_current_local_pt + mBreastVelocity_local_vec*time_delta; new_local_pt.clamp(mBreastParamsMin,mBreastParamsMax); + for (U32 i=0; i < 3; i++) { + if (mBreastMaxVelocityParam[0] == 0) + { + new_local_pt[i] = breast_user_local_pt[i]; + } if (mBreastParamsDriven[i]) { mCharacter->setVisualParamWeight(mBreastParamsDriven[i], diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml index a7563d6f96..d295f5fe4a 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml @@ -175,20 +175,6 @@ top="0" width="303" /> - - - diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 532a4a2e6d..9fbb1ed045 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2482,13 +2482,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast Side Gain Breast Side Damping Breast Side Drag -Breast Side Max +Breast Side Max Breast UpDown Spring Breast UpDown Gain Breast UpDown Damping Breast UpDown Drag -Breast UpDown Range +Breast UpDown Range Bushy Eyebrows Bushy Hair -- cgit v1.2.3