From 27c855149e657cebda863e279c8545f7816e1c18 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 13:36:28 -0400 Subject: First pass commit for breast physics. --- indra/newview/character/avatar_lad.xml | 292 ++++++++++++++++++++++++++++++++- 1 file changed, 284 insertions(+), 8 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index a9b4ff02c5..cdb3684034 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -612,7 +612,7 @@ id="36" group="0" name="Shoulders" - label="Shoulders" + label="Shoulders" wearable="shape" edit_group="shape_torso" edit_group_order="4" @@ -4047,11 +4047,10 @@ id="507" group="0" sex="female" - name="Breast_Gravity" + name="Breast_Gravity_Driven" label="Breast Buoyancy" wearable="shape" - edit_group="shape_torso" - edit_group_order="7" + edit_group="driven" label_min="Less Gravity" label_max="More Gravity" value_default="0" @@ -4116,11 +4115,10 @@ id="684" group="0" sex="female" - name="Breast_Female_Cleavage" + name="Breast_Female_Cleavage_Driven" label="Breast Cleavage" wearable="shape" - edit_group="shape_torso" - edit_group_order="8" + edit_group="driven" label_min="Separate" label_max="Join" value_default="0" @@ -9074,12 +9072,290 @@ render_pass="bump"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Mon, 23 Aug 2010 14:15:17 -0400 Subject: Changed Acceleration to gain. Changed behavior of gain. Changed names of Driver/Driven params. --- indra/newview/character/avatar_lad.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index cdb3684034..4f64d669f5 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4047,7 +4047,7 @@ id="507" group="0" sex="female" - name="Breast_Gravity_Driven" + name="Breast_Gravity" label="Breast Buoyancy" wearable="shape" edit_group="driven" @@ -4115,7 +4115,7 @@ id="684" group="0" sex="female" - name="Breast_Female_Cleavage_Driven" + name="Breast_Female_Cleavage" label="Breast Cleavage" wearable="shape" edit_group="driven" @@ -9119,9 +9119,9 @@ render_pass="bump"> edit_group="shape_physics" label_min="Less" label_max="More" - value_default="2" + value_default="0" value_min="0" - value_max="10" + value_max="2" camera_elevation=".3" camera_distance=".8"> @@ -9149,14 +9149,14 @@ render_pass="bump"> id="1078" group="0" sex="female" - name="Breast_Physics_Side_Bounce" - label="Breast Physics Side Bounce" + name="Breast_Physics_Side_Gain" + label="Breast Physics Side Gain" wearable="shape" edit_group="shape_physics" label_min="Less" label_max="More" value_default="10" - value_min="0" + value_min="1" value_max="100" camera_elevation=".3" camera_distance=".8"> @@ -9240,14 +9240,14 @@ render_pass="bump"> id="1083" group="0" sex="female" - name="Breast_Physics_UpDown_Bounce" - label="Breast Physics UpDown Bounce" + name="Breast_Physics_UpDown_Gain" + label="Breast Physics UpDown Gain" wearable="shape" edit_group="shape_physics" label_min="Less" label_max="More" value_default="50" - value_min="0" + value_min="1" value_max="100" camera_elevation=".3" camera_distance=".8"> @@ -9312,7 +9312,7 @@ render_pass="bump"> id="1087" group="0" sex="female" - name="Breast_Female_Cleavage" + name="Breast_Female_Cleavage_Driver" label="Breast Cleavage" wearable="shape" edit_group="shape_torso" @@ -9333,7 +9333,7 @@ render_pass="bump"> id="1088" group="0" sex="female" - name="Breast_Gravity" + name="Breast_Gravity_Driver" label="Breast Buoyancy" wearable="shape" edit_group="shape_torso" -- cgit v1.2.3 From 981a43b355e44daa7e1b4065b896ea4cd2fec3a2 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 16:13:10 -0400 Subject: Created new wearable type. Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype. --- indra/newview/character/avatar_lad.xml | 54 ++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 4f64d669f5..7dd15c67c7 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9079,8 +9079,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Mass" label="Breast Physics Mass" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="1" @@ -9097,8 +9097,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Smoothing" label="Breast Physics Smoothing" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="2" @@ -9115,8 +9115,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Gravity" label="Breast Physics Gravity" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="0" @@ -9133,8 +9133,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Side_Spring" label="Breast Physics Side Spring" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="3" @@ -9151,8 +9151,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Side_Gain" label="Breast Physics Side Gain" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="10" @@ -9169,8 +9169,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Side_Damping" label="Breast Physics Side Damping" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default=".5" @@ -9187,8 +9187,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Side_Drag" label="Breast Physics Side Drag" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default=".1" @@ -9205,8 +9205,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_Side_Range" label="Breast Physics Side Range" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="10" @@ -9224,8 +9224,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_UpDown_Spring" label="Breast Physics UpDown Spring" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="1.5" @@ -9242,8 +9242,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_UpDown_Gain" label="Breast Physics UpDown Gain" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="50" @@ -9260,8 +9260,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_UpDown_Damping" label="Breast Physics UpDown Damping" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default=".1" @@ -9278,8 +9278,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_UpDown_Drag" label="Breast Physics UpDown Drag" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default=".1" @@ -9296,8 +9296,8 @@ render_pass="bump"> sex="female" name="Breast_Physics_UpDown_Range" label="Breast Physics UpDown Range" - wearable="shape" - edit_group="shape_physics" + wearable="physics" + edit_group="physics" label_min="Less" label_max="More" value_default="10" @@ -9308,6 +9308,8 @@ render_pass="bump"> + + Date: Mon, 23 Aug 2010 17:12:10 -0400 Subject: Fixed backwards compatibility so that orig Breast params are preserved. Cleaned up some code. Removed "Add" from right-click when multiwear is not permitted. --- indra/newview/character/avatar_lad.xml | 78 +++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 7dd15c67c7..e37ff1833d 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4044,7 +4044,7 @@ + + + + - - - - edit_group="physics" label_min="Less" label_max="More" - value_default="1" + value_default="2" value_min="1" value_max="5" camera_elevation=".3" @@ -9121,7 +9121,7 @@ render_pass="bump"> label_max="More" value_default="0" value_min="0" - value_max="2" + value_max="1" camera_elevation=".3" camera_distance=".8"> @@ -9209,9 +9209,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="10" + value_default="0" value_min="0" - value_max="100" + value_max="10" camera_elevation=".3" camera_distance=".8"> @@ -9300,55 +9300,55 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="10" + value_default="0" value_min="0" - value_max="100" + value_max="10" camera_elevation=".3" camera_distance=".8"> - - + id="1087" /> + id="1088" /> -- cgit v1.2.3 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 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') 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" -- cgit v1.2.3 From 8c95027334b24130dfdc1a51b3020156f371d538 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 24 Aug 2010 11:54:22 -0400 Subject: Moved BreastMotion class to its own separate file out of llvoavatar. Changed range of some breast motion params. Updated icon. --- indra/newview/character/avatar_lad.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 9609e58918..54794b849f 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9139,7 +9139,7 @@ render_pass="bump"> label_max="More" value_default="3" value_min="0" - value_max="5" + value_max="10" camera_elevation=".3" camera_distance=".8"> @@ -9209,7 +9209,7 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="0" + value_default="5" value_min="0" value_max="10" camera_elevation=".3" @@ -9230,7 +9230,7 @@ render_pass="bump"> label_max="More" value_default="1.5" value_min="0" - value_max="5" + value_max="10" camera_elevation=".3" camera_distance=".8"> @@ -9300,7 +9300,7 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="0" + value_default="5" value_min="0" value_max="10" camera_elevation=".3" -- cgit v1.2.3 From 391e2bab555d391a0e1bdb248482d5de5c0d6724 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 25 Aug 2010 17:53:37 -0400 Subject: Increased max velocity in avatar_lad.xml --- indra/newview/character/avatar_lad.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 54794b849f..6fa1111223 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9211,7 +9211,7 @@ render_pass="bump"> label_max="More" value_default="5" value_min="0" - value_max="10" + value_max="1000" camera_elevation=".3" camera_distance=".8"> @@ -9302,7 +9302,7 @@ render_pass="bump"> label_max="More" value_default="5" value_min="0" - value_max="10" + value_max="1000" camera_elevation=".3" camera_distance=".8"> -- cgit v1.2.3 From 93404eca1a447f9412eb8ae2d5c4149ff9436dc7 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 26 Aug 2010 16:05:43 -0400 Subject: Changed parameter scale for max velocity so it's easier to turn off various physics. --- indra/newview/character/avatar_lad.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 6fa1111223..453ed1baf7 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9209,9 +9209,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="5" + value_default="0" value_min="0" - value_max="1000" + value_max="10" camera_elevation=".3" camera_distance=".8"> @@ -9300,9 +9300,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="5" + value_default="1" value_min="0" - value_max="1000" + value_max="10" camera_elevation=".3" camera_distance=".8"> -- cgit v1.2.3 From 3825ee503ddab29cf408ae35f5a43bcc154353f2 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 17 Mar 2011 17:36:01 -0400 Subject: Work in progress. Big code cleanup ported from TheShining/avatar-physics (defunct branch). Added butt and belly. --- indra/newview/character/avatar_lad.xml | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 453ed1baf7..c4117da893 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3794,6 +3794,23 @@ + + + + + + + + + + + + + + + + + + + + Date: Fri, 18 Mar 2011 10:16:03 -0400 Subject: Enabling for belly vertical motion. --- indra/newview/character/avatar_lad.xml | 80 ++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 24 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index c4117da893..6dbda4fd16 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3795,10 +3795,10 @@ + + + + + + + + + - - - - - - + + + + + + + + + + Date: Fri, 18 Mar 2011 14:54:30 -0400 Subject: Some code cleanup. Changed equations to occur in normalized (0,1) space instead of parameter space. --- indra/newview/character/avatar_lad.xml | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 6dbda4fd16..0fc62ccaf1 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9142,9 +9142,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="2" - value_min="1" - value_max="5" + value_default=".2" + value_min=".1" + value_max=".5" camera_elevation=".3" camera_distance=".8"> @@ -9180,7 +9180,7 @@ render_pass="bump"> label_max="More" value_default="0" value_min="0" - value_max="1" + value_max="100" camera_elevation=".3" camera_distance=".8"> @@ -9215,7 +9215,7 @@ render_pass="bump"> label_min="Less" label_max="More" value_default="10" - value_min="1" + value_min="0" value_max="100" camera_elevation=".3" camera_distance=".8"> @@ -9232,9 +9232,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".5" + value_default=".05" value_min="0" - value_max="1" + value_max=".1" camera_elevation=".3" camera_distance=".8"> @@ -9250,9 +9250,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".1" + value_default=".15" value_min="0" - value_max="1" + value_max=".5" camera_elevation=".3" camera_distance=".8"> @@ -9268,7 +9268,7 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="0" + value_default="10" value_min="0" value_max="10" camera_elevation=".3" @@ -9287,9 +9287,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="1.5" + value_default=".1" value_min="0" - value_max="10" + value_max="1" camera_elevation=".3" camera_distance=".8"> @@ -9305,8 +9305,8 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="50" - value_min="1" + value_default="10" + value_min="0" value_max="100" camera_elevation=".3" camera_distance=".8"> @@ -9323,9 +9323,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".1" + value_default=".05" value_min="0" - value_max="1" + value_max=".1" camera_elevation=".3" camera_distance=".8"> @@ -9341,9 +9341,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".1" + value_default=".15" value_min="0" - value_max="1" + value_max=".5" camera_elevation=".3" camera_distance=".8"> @@ -9359,7 +9359,7 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="1" + value_default="10" value_min="0" value_max="10" camera_elevation=".3" @@ -9378,7 +9378,7 @@ render_pass="bump"> edit_group_order="7" label_min="Less" label_max="More" - value_default="10" + value_default="0" value_min="-1.5" value_max="2" camera_elevation=".3" @@ -9400,7 +9400,7 @@ render_pass="bump"> edit_group_order="8" label_min="Less" label_max="More" - value_default="10" + value_default="0" value_min="-.3" value_max="1.3" camera_elevation=".3" -- cgit v1.2.3 From 86613fd388d7985abc814ee8ee52da54fd74779e Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 18 Mar 2011 16:04:28 -0400 Subject: Variety of fixes for param ranges. Turned off normal/binormal effects for morphing. Fixed issue where updates were always being sent even if below the change threshold. --- indra/newview/character/avatar_lad.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 0fc62ccaf1..727a9e7fc4 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9180,7 +9180,7 @@ render_pass="bump"> label_max="More" value_default="0" value_min="0" - value_max="100" + value_max="1" camera_elevation=".3" camera_distance=".8"> @@ -9196,9 +9196,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="3" + value_default=".1" value_min="0" - value_max="10" + value_max="1" camera_elevation=".3" camera_distance=".8"> @@ -9215,7 +9215,7 @@ render_pass="bump"> label_min="Less" label_max="More" value_default="10" - value_min="0" + value_min="1" value_max="100" camera_elevation=".3" camera_distance=".8"> @@ -9268,9 +9268,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="10" + value_default=".1" value_min="0" - value_max="10" + value_max=".1" camera_elevation=".3" camera_distance=".8"> @@ -9306,7 +9306,7 @@ render_pass="bump"> label_min="Less" label_max="More" value_default="10" - value_min="0" + value_min="1" value_max="100" camera_elevation=".3" camera_distance=".8"> @@ -9359,9 +9359,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="10" + value_default=".1" value_min="0" - value_max="10" + value_max=".1" camera_elevation=".3" camera_distance=".8"> -- cgit v1.2.3 From 53a944f2859d07eceed2a01a6b4f7339c0c591d9 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 18 Mar 2011 18:02:27 -0400 Subject: Set default parameters. Renamed various parameters. --- indra/newview/character/avatar_lad.xml | 194 ++++++++++++++++++++++++++------- 1 file changed, 156 insertions(+), 38 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 727a9e7fc4..08102332d0 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3796,18 +3796,13 @@ + value_max="2"> @@ -4065,16 +4060,11 @@ group="0" sex="female" name="Breast_Gravity" - label="Breast Buoyancy" wearable="shape" edit_group="driven" - label_min="Less Gravity" - label_max="More Gravity" value_default="0" value_min="-1.5" - value_max="2" - camera_elevation=".3" - camera_distance=".8"> + value_max="2"> @@ -4083,16 +4073,11 @@ group="0" sex="female" name="Breast_Female_Cleavage" - label="Breast Cleavage" wearable="shape" edit_group="driven" - label_min="Separate" - label_max="Join" value_default="0" value_min="-.3" - value_max="1.3" - camera_elevation=".3" - camera_distance=".8"> + value_max="1.3"> @@ -4408,7 +4393,7 @@ @@ -9371,8 +9354,8 @@ render_pass="bump"> id="507" group="0" sex="female" - name="Breast_Gravity_Driver" - label="Breast Buoyancy" + name="Breast_Physics_UpDown_Controller" + label="Breast Physics UpDown Controller" wearable="shape" edit_group="shape_torso" edit_group_order="7" @@ -9393,8 +9376,8 @@ render_pass="bump"> id="684" group="0" sex="female" - name="Breast_Female_Cleavage_Driver" - label="Breast Cleavage" + name="Breast_Physics_Side_Controller" + label="Breast Physics Side Controller" wearable="shape" edit_group="shape_torso" edit_group_order="8" @@ -9414,8 +9397,8 @@ render_pass="bump"> wearable="shape" edit_group="shape_torso" edit_group_order="14" - name="Belly_Gravity" - label="Belly Gravity" - label_min="Small" - label_max="Big" - value_min="0" + name="Belly_Physics_UpDown_Controller" + label="Belly Physics UpDown Controller" + label_min="Down" + label_max="Up" + value_min="-1" value_max="1" value_default="0" camera_distance="1.4" @@ -10174,15 +10157,150 @@ render_pass="bump"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Fri, 18 Mar 2011 18:06:10 -0400 Subject: Took out unnecessary Butt Physics parameter. --- indra/newview/character/avatar_lad.xml | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 08102332d0..1c3f87373c 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4443,7 +4443,7 @@ - - - - - - Date: Fri, 18 Mar 2011 18:19:25 -0400 Subject: Fixed params for belly morph. Incorrect params were causing distortion in texture maps. --- indra/newview/character/avatar_lad.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 1c3f87373c..b839d64980 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3801,8 +3801,8 @@ wearable="shape" edit_group="driven" value_default="0" - value_min="-2" - value_max="2"> + value_min="0" + value_max="1"> @@ -4396,8 +4396,8 @@ name="Belly_Legs_Physics_UpDown_Driven" wearable="shape" edit_group="driven" - value_min="-2" - value_max="2"> + value_min="0" + value_max="1"> -- cgit v1.2.3 From 49e449e3a6ea08a969a214ffb7c66ac9607e2732 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 18 Mar 2011 18:59:59 -0400 Subject: Added more belly bounce. Added butt driver param back in. --- indra/newview/character/avatar_lad.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index b839d64980..58fe82da9e 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4443,7 +4443,7 @@ + + + + + + Date: Mon, 21 Mar 2011 12:04:31 -0400 Subject: Added left-right butt control. Did a bunch of code cleanup. --- indra/newview/character/avatar_lad.xml | 39 +++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 58fe82da9e..69512cdf34 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4456,6 +4456,22 @@ + + + + + + + + + + Date: Mon, 21 Mar 2011 15:39:42 -0400 Subject: Velocity now gets zeroed out if the param is pushed beyond limits. Rescaled the max speed param. --- indra/newview/character/avatar_lad.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 69512cdf34..d8f6fd56b3 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3801,7 +3801,7 @@ wearable="shape" edit_group="driven" value_default="0" - value_min="0" + value_min="-1" value_max="1"> @@ -4396,7 +4396,7 @@ name="Belly_Legs_Physics_UpDown_Driven" wearable="shape" edit_group="driven" - value_min="0" + value_min="-1" value_max="1"> @@ -9141,9 +9141,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".2" + value_default=".1" value_min=".1" - value_max=".5" + value_max="1" camera_elevation=".3" camera_distance=".8"> @@ -9267,9 +9267,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".1" + value_default="0" value_min="0" - value_max=".1" + value_max="10" camera_elevation=".3" camera_distance=".8"> @@ -9358,9 +9358,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".1" + value_default="0" value_min="0" - value_max=".1" + value_max="10" camera_elevation=".3" camera_distance=".8"> @@ -10261,9 +10261,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".1" + value_default="0" value_min="0" - value_max=".1" + value_max="10" camera_elevation=".3" camera_distance=".8"> @@ -10329,9 +10329,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default=".1" + value_default="0" value_min="0" - value_max=".1" + value_max="10" camera_elevation=".3" camera_distance=".8"> -- cgit v1.2.3 From 45a43256ae71ec7936fc73e3b9c41470a23dd229 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 21 Mar 2011 16:18:02 -0400 Subject: Fixed skirt-related belly bounce. --- indra/newview/character/avatar_lad.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index d8f6fd56b3..160b8f3408 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -5192,7 +5192,7 @@ wearable="skirt" edit_group="driven" cross_wearable="true" - value_min="0" + value_min="-1" value_max="1"> -- cgit v1.2.3 From 92802e69509824f1d3dca212726373fd9d799104 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 29 Mar 2011 21:56:18 -0400 Subject: Fixed some labels, and made some labels/wearables hidden in edit. Added accordions for physics. --- indra/newview/character/avatar_lad.xml | 156 ++++++++++++--------------------- 1 file changed, 54 insertions(+), 102 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 160b8f3408..7ab93d3fce 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3798,7 +3798,7 @@ id="1092" group="1" name="Belly_Torso_Physics_UpDown_Driven" - wearable="shape" + wearable="physics" edit_group="driven" value_default="0" value_min="-1" @@ -4394,7 +4394,7 @@ id="1093" group="1" name="Belly_Legs_Physics_UpDown_Driven" - wearable="shape" + wearable="physics" edit_group="driven" value_min="-1" value_max="1"> @@ -4444,7 +4444,7 @@ id="1089" group="0" name="Butt_Physics_UpDown_Driven" - wearable="shape" + wearable="physics" edit_group="driven" label_min="Separate" label_max="Join" @@ -4460,7 +4460,7 @@ id="1090" group="0" name="Butt_Physics_LeftRight_Driven" - wearable="shape" + wearable="physics" edit_group="driven" label_min="Separate" label_max="Join" @@ -5189,7 +5189,7 @@ id="1094" group="1" name="Belly_Skirt_Physics_UpDown_Driven" - wearable="skirt" + wearable="physics" edit_group="driven" cross_wearable="true" value_min="-1" @@ -9138,14 +9138,12 @@ render_pass="bump"> name="Breast_Physics_Mass" label="Breast Physics Mass" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default=".1" value_min=".1" - value_max="1" - camera_elevation=".3" - camera_distance=".8"> + value_max="1"> @@ -9156,14 +9154,12 @@ render_pass="bump"> name="Breast_Physics_Smoothing" label="Breast Physics Smoothing" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default="2" value_min="1" - value_max="10" - camera_elevation=".3" - camera_distance=".8"> + value_max="10"> @@ -9174,14 +9170,12 @@ render_pass="bump"> name="Breast_Physics_Gravity" label="Breast Physics Gravity" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default="0" value_min="0" - value_max="1" - camera_elevation=".3" - camera_distance=".8"> + value_max="1"> @@ -9192,14 +9186,12 @@ render_pass="bump"> name="Breast_Physics_Side_Spring" label="Breast Physics Side Spring" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default=".1" value_min="0" - value_max="1" - camera_elevation=".3" - camera_distance=".8"> + value_max="1"> @@ -9210,14 +9202,12 @@ render_pass="bump"> name="Breast_Physics_Side_Gain" label="Breast Physics Side Gain" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default="10" value_min="1" - value_max="100" - camera_elevation=".3" - camera_distance=".8"> + value_max="100"> @@ -9233,9 +9223,7 @@ render_pass="bump"> label_max="More" value_default=".05" value_min="0" - value_max=".1" - camera_elevation=".3" - camera_distance=".8"> + value_max=".1"> @@ -9246,14 +9234,12 @@ render_pass="bump"> name="Breast_Physics_Side_Drag" label="Breast Physics Side Drag" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default=".15" value_min="0" - value_max=".5" - camera_elevation=".3" - camera_distance=".8"> + value_max=".5"> @@ -9264,14 +9250,12 @@ render_pass="bump"> name="Breast_Physics_Side_Max_Velocity" label="Breast Physics Side Max Speed" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default="0" value_min="0" - value_max="10" - camera_elevation=".3" - camera_distance=".8"> + value_max="10"> @@ -9283,14 +9267,12 @@ render_pass="bump"> name="Breast_Physics_UpDown_Spring" label="Breast Physics UpDown Spring" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default=".1" value_min="0" - value_max="1" - camera_elevation=".3" - camera_distance=".8"> + value_max="1"> @@ -9301,14 +9283,12 @@ render_pass="bump"> name="Breast_Physics_UpDown_Gain" label="Breast Physics UpDown Gain" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default="10" value_min="1" - value_max="100" - camera_elevation=".3" - camera_distance=".8"> + value_max="100"> @@ -9319,7 +9299,7 @@ render_pass="bump"> name="Breast_Physics_UpDown_Damping" label="Breast Physics UpDown Damping" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default=".05" @@ -9337,14 +9317,12 @@ render_pass="bump"> name="Breast_Physics_UpDown_Drag" label="Breast Physics UpDown Drag" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default=".15" value_min="0" - value_max=".5" - camera_elevation=".3" - camera_distance=".8"> + value_max=".5"> @@ -9355,32 +9333,27 @@ render_pass="bump"> name="Breast_Physics_UpDown_Max_Velocity" label="Breast Physics UpDown Max Speed" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" label_min="Less" label_max="More" value_default="0" value_min="0" - value_max="10" - camera_elevation=".3" - camera_distance=".8"> + value_max="10"> + value_default="0"> @@ -9389,19 +9362,16 @@ render_pass="bump"> + value_default="0"> @@ -9443,9 +9413,7 @@ render_pass="bump"> label_max="More" value_default="0" value_min="-.3" - value_max="1.3" - camera_elevation=".3" - camera_distance=".8"> + value_max="1.3"> @@ -10177,9 +10145,9 @@ render_pass="bump"> name="Belly_Physics_UpDown_Spring" label="Belly Physics UpDown Spring" wearable="physics" - edit_group="physics" + edit_group="physics_belly" label_min="Less" label_max="More" value_default=".1" value_min="0" - value_max="1" - camera_elevation=".3" - camera_distance=".8"> + value_max="1"> @@ -10224,14 +10190,12 @@ render_pass="bump"> name="Belly_Physics_UpDown_Gain" label="Belly Physics UpDown Gain" wearable="physics" - edit_group="physics" + edit_group="physics_belly" label_min="Less" label_max="More" value_default="10" value_min="1" - value_max="100" - camera_elevation=".3" - camera_distance=".8"> + value_max="100"> @@ -10246,9 +10210,7 @@ render_pass="bump"> label_max="More" value_default=".05" value_min="0" - value_max=".1" - camera_elevation=".3" - camera_distance=".8"> + value_max=".1"> @@ -10258,14 +10220,12 @@ render_pass="bump"> name="Belly_Physics_UpDown_Max_Velocity" label="Belly Physics UpDown Max Speed" wearable="physics" - edit_group="physics" + edit_group="physics_belly" label_min="Less" label_max="More" value_default="0" value_min="0" - value_max="10" - camera_elevation=".3" - camera_distance=".8"> + value_max="10"> @@ -10275,14 +10235,12 @@ render_pass="bump"> name="Butt_Physics_UpDown_Spring" label="Butt Physics UpDown Spring" wearable="physics" - edit_group="physics" + edit_group="physics_butt" label_min="Less" label_max="More" value_default=".1" value_min="0" - value_max="1" - camera_elevation=".3" - camera_distance=".8"> + value_max="1"> @@ -10292,14 +10250,12 @@ render_pass="bump"> name="Butt_Physics_UpDown_Gain" label="Butt Physics UpDown Gain" wearable="physics" - edit_group="physics" + edit_group="physics_butt" label_min="Less" label_max="More" value_default="10" value_min="1" - value_max="100" - camera_elevation=".3" - camera_distance=".8"> + value_max="100"> @@ -10308,15 +10264,13 @@ render_pass="bump"> group="0" name="Butt_Physics_UpDown_Damping" label="Butt Physics UpDown Damping" - wearable="physics" + wearable="physics_butt" edit_group="physics" label_min="Less" label_max="More" value_default=".05" value_min="0" - value_max=".1" - camera_elevation=".3" - camera_distance=".8"> + value_max=".1"> @@ -10326,14 +10280,12 @@ render_pass="bump"> name="Butt_Physics_UpDown_Max_Velocity" label="Butt Physics UpDown Max Speed" wearable="physics" - edit_group="physics" + edit_group="physics_butt" label_min="Less" label_max="More" value_default="0" value_min="0" - value_max="10" - camera_elevation=".3" - camera_distance=".8"> + value_max="10"> -- cgit v1.2.3 From 23fe1a4787ae80dfe284a09e329237aab00bd5a4 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 30 Mar 2011 19:07:38 -0400 Subject: Changes to better logically group avatar_lad.xml physics params. --- indra/newview/character/avatar_lad.xml | 1154 +++++++++++++++----------------- 1 file changed, 546 insertions(+), 608 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 7ab93d3fce..51be7f52fa 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3794,18 +3794,6 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + name="Loose Upper Clothing" + label="Shirt Fit" + show_simple="true" + wearable="shirt" + edit_group="shirt" + edit_group_order="4" + label_min="Tight Shirt" + label_max="Loose Shirt" + value_min="0" + value_max="1" + camera_distance="1.2" + camera_angle="30" + camera_elevation=".2"> + + - - + + - - + value_max="1" + camera_distance="1.8" + camera_angle="30" + camera_elevation="-.3"> + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + value_default="1" + camera_distance="1.2" + camera_angle="30" + camera_elevation="-.3"> - - + id="614" /> - - - - + id="1017" /> - - + id="1035" /> - - - - - - - - - - - - - - - - - - - - + id="615" + min1="0" + max1=".9" + max2="1" + min2="1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 993ad22f9ffeae6d20f75dc409cf0128ca167a0e Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 30 Mar 2011 19:28:03 -0400 Subject: Cleanup to logically group physics params in avatar_lad.xml. Added more controls for belly & butt. Cleaned up code around physics parameter initialization. --- indra/newview/character/avatar_lad.xml | 191 ++++++++++++++++++++++++++++----- 1 file changed, 166 insertions(+), 25 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 51be7f52fa..ee2cc5ffeb 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -11952,54 +11952,94 @@ render_pass="bump"> + + + + + + + + + - + + + @@ -12009,54 +12049,155 @@ render_pass="bump"> + + + + + + + + + - + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 3c6e91e16d1de25f7a4cfe168ee7e3cb2f037cd8 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 30 Mar 2011 19:49:35 -0400 Subject: Corrections for butt motion in avatar_lad.xml. Reduced extent of belly motion. --- indra/newview/character/avatar_lad.xml | 56 ++++++++++++++-------------------- 1 file changed, 23 insertions(+), 33 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index ee2cc5ffeb..5a10b2f57b 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4294,7 +4294,7 @@ ############# --> camera_distance=".8"> + id="1200" /> @@ -11715,7 +11715,7 @@ render_pass="bump"> value_max="1.3"> + id="1201" /> @@ -11723,25 +11723,18 @@ render_pass="bump"> id="1120" group="1" wearable="physics" - edit_group="physics_belly" - edit_group_order="14" name="Belly_Physics_UpDown_Controller" label="Belly Physics UpDown Controller" - label_min="Down" - label_max="Up" value_min="-1" value_max="1" - value_default="0" - camera_distance="1.4" - camera_angle="30" - camera_elevation=".2"> + value_default="0"> + id="1202" /> + id="1203" /> + id="1204" /> @@ -11749,7 +11742,6 @@ render_pass="bump"> id="1100" group="1" wearable="shape" - edit_group="physics_butt" name="Butt_Physics_UpDown_Controller" label="Butt Physics UpDown Controller" value_min="-1" @@ -11757,7 +11749,7 @@ render_pass="bump"> value_default="0"> + id="1205" /> @@ -11765,7 +11757,6 @@ render_pass="bump"> id="1101" group="1" wearable="shape" - edit_group="physics_butt" name="Butt_Physics_LeftRight_Controller" label="Butt Physics LeftRight Controller" value_min="-1" @@ -11773,7 +11764,7 @@ render_pass="bump"> value_default="0"> + id="1206" /> @@ -11849,7 +11840,7 @@ render_pass="bump"> name="Breast_Physics_Side_Damping" label="Breast Physics Side Damping" wearable="physics" - edit_group="physics" + edit_group="physics_breasts" value_default=".05" value_min="0" value_max=".1"> @@ -12015,7 +12006,7 @@ render_pass="bump"> name="Belly_Physics_UpDown_Damping" label="Belly Physics UpDown Damping" wearable="physics" - edit_group="physics" + edit_group="physics_belly" value_default=".05" value_min="0" value_max=".1"> @@ -12112,7 +12103,7 @@ render_pass="bump"> name="Butt_Physics_UpDown_Damping" label="Butt Physics UpDown Damping" wearable="physics" - edit_group="physics" + edit_group="physics_butt" value_default=".05" value_min="0" value_max=".1"> @@ -12142,9 +12133,8 @@ render_pass="bump"> value_max="10"> - Date: Wed, 30 Mar 2011 23:17:58 -0400 Subject: Change in physics parameter names. Split some physics parameters into separate accordions based on updown/leftright. Fixed a minor issue with physics edit tab height. --- indra/newview/character/avatar_lad.xml | 236 +++++++++++++++++---------------- 1 file changed, 120 insertions(+), 116 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 5a10b2f57b..a7e529adff 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -11705,8 +11705,8 @@ render_pass="bump"> id="684" group="0" sex="female" - name="Breast_Physics_Side_Controller" - label="Breast Physics Side Controller" + name="Breast_Physics_InOut_Controller" + label="Breast Physics InOut Controller" wearable="shape" edit_group="shape_torso" edit_group_order="8" @@ -11775,7 +11775,7 @@ render_pass="bump"> name="Breast_Physics_Mass" label="Breast Physics Mass" wearable="physics" - edit_group="physics_breasts" + edit_group="physics_breasts_updown" 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" + edit_group="physics_breasts_updown" value_default="2" value_min="1" value_max="10"> @@ -11801,144 +11801,146 @@ render_pass="bump"> name="Breast_Physics_Gravity" label="Breast Physics Gravity" wearable="physics" - edit_group="physics_breasts" + edit_group="physics_breasts_updown" value_default="0" value_min="0" value_max=".1"> - + + + + value_max=".1" + camera_elevation=".3" + camera_distance=".8"> + + value_max=".1"> - - - name="Belly_Physics_Mass" label="Belly Physics Mass" wearable="physics" - edit_group="physics_belly" + edit_group="physics_belly_updown" value_default=".1" value_min=".1" value_max="1"> @@ -11958,7 +11960,7 @@ render_pass="bump"> name="Belly_Physics_Smoothing" label="Belly Physics Smoothing" wearable="physics" - edit_group="physics_belly" + edit_group="physics_belly_updown" value_default="2" value_min="1" value_max="10"> @@ -11970,72 +11972,72 @@ render_pass="bump"> name="Belly_Physics_Gravity" label="Belly Physics Gravity" wearable="physics" - edit_group="physics_belly" + edit_group="physics_belly_updown" value_default="0" value_min="0" value_max=".1"> - + + + - - - name="Butt_Physics_Mass" label="Butt Physics Mass" wearable="physics" - edit_group="physics_butt" + edit_group="physics_butt_updown" value_default=".1" value_min=".1" value_max="1"> @@ -12055,7 +12057,7 @@ render_pass="bump"> name="Butt_Physics_Smoothing" label="Butt Physics Smoothing" wearable="physics" - edit_group="physics_butt" + edit_group="physics_butt_updown" value_default="2" value_min="1" value_max="10"> @@ -12067,132 +12069,134 @@ render_pass="bump"> name="Butt_Physics_Gravity" label="Butt Physics Gravity" wearable="physics" - edit_group="physics_butt" + edit_group="physics_butt_updown" value_default="0" value_min="0" value_max=".1"> - + + + + - - - + -- cgit v1.2.3 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 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') 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"> -- cgit v1.2.3 From 8288c3c24ab96bf697e21813693492c79e49e918 Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sat, 2 Apr 2011 16:42:21 -0400 Subject: Fix for avatar_lad physics using duplicate ID. Added missing skirt physics param for belly. --- indra/newview/character/avatar_lad.xml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 4585ba658c..64142f38a1 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -5246,6 +5246,24 @@ value_max="1"> + + + + + + Date: Sat, 2 Apr 2011 17:39:28 -0400 Subject: Renumbering for avatar physics parameters --- indra/newview/character/avatar_lad.xml | 73 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 37 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 64142f38a1..765d016888 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -11757,7 +11757,7 @@ render_pass="bump"> - -- cgit v1.2.3 From cc2a813ce40a09bab230a62809f5ff21083a81f2 Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sat, 2 Apr 2011 18:36:49 -0400 Subject: Moved Drag to be a general shape physics param, to save on number of transmitted params. --- indra/newview/character/avatar_lad.xml | 127 ++++++++++++++------------------- 1 file changed, 52 insertions(+), 75 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 765d016888..fa286e99ef 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -11830,6 +11830,20 @@ render_pass="bump"> id="10003" group="0" sex="female" + name="Breast_Physics_Drag" + label="Breast Physics Drag" + wearable="physics" + edit_group="physics_advanced" + value_default=".15" + value_min="0" + value_max=".5"> + + + + camera_distance=".8"> - - - value_max=".1"> - - - value_max=".1"> + + + value_max=".1"> - - - value_max=".1"> + + + + value_max=".1"> - - - value_max=".1"> - - - -- cgit v1.2.3 From a47ea6c619d1b689478f9e41c87cb89c010273de Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sun, 3 Apr 2011 13:56:55 -0400 Subject: Added breast sway (left-right). --- indra/newview/character/avatar_lad.xml | 77 +++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index fa286e99ef..c63701cea5 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4331,6 +4331,18 @@ + + + + @@ -4873,7 +4885,6 @@ - @@ -11786,6 +11797,21 @@ render_pass="bump"> + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From e8f2380489b9ce58f7a7bb047231256ae7833309 Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sun, 3 Apr 2011 13:59:19 -0400 Subject: Changed Max Velocity param name to Max Effect --- indra/newview/character/avatar_lad.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index c63701cea5..35f88a7a5c 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -11870,8 +11870,8 @@ render_pass="bump"> id="10004" group="0" sex="female" - name="Breast_Physics_UpDown_Max_Velocity" - label="Breast Physics UpDown Max Speed" + name="Breast_Physics_UpDown_Max_Effect" + label="Breast Physics UpDown Max Effect" wearable="physics" edit_group="physics_breasts_updown" value_default="0" @@ -11925,8 +11925,8 @@ render_pass="bump"> id="10008" group="0" sex="female" - name="Breast_Physics_InOut_Max_Velocity" - label="Breast Physics InOut Max Speed" + name="Breast_Physics_InOut_Max_Effect" + label="Breast Physics InOut Max Effect" wearable="physics" edit_group="physics_breasts_inout" value_default="0" @@ -12025,8 +12025,8 @@ render_pass="bump"> Date: Sun, 3 Apr 2011 17:25:17 -0400 Subject: Changed _driven params to cross wearables; major fix so they wouldn't keep getting reset to default values from wearable. Took out smoothing param. Redefined maxeffect param to affect range of motion. --- indra/newview/character/avatar_lad.xml | 127 +++++++++++++-------------------- 1 file changed, 49 insertions(+), 78 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 35f88a7a5c..f8229ec465 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4324,6 +4324,7 @@ group="1" name="Belly_Physics_Torso_UpDown_Driven" wearable="physics" + cross_wearable="true" edit_group="driven" value_default="0" value_min="-1" @@ -4336,6 +4337,7 @@ group="1" name="Breast_Physics_LeftRight_Driven" wearable="physics" + cross_wearable="true" edit_group="driven" value_default="0" value_min="-2" @@ -4856,20 +4858,24 @@ group="1" name="Belly_Physics_Legs_UpDown_Driven" wearable="physics" + cross_wearable="true" edit_group="driven" value_min="-1" value_max="1"> - + + value_default="0" + value_min="-1" + value_max="1"> @@ -4878,10 +4884,11 @@ group="1" name="Butt_Physics_LeftRight_Driven" wearable="physics" + cross_wearable="true" edit_group="driven" value_default="0" - value_min="-2" - value_max="2"> + value_min="-1" + value_max="1"> @@ -5268,6 +5275,7 @@ group="1" name="Belly_Physics_Skirt_UpDown_Driven" wearable="physics" + cross_wearable="true" edit_group="driven" value_default="0" value_min="-1" @@ -11829,19 +11837,6 @@ render_pass="bump"> id="10001" group="0" sex="female" - name="Breast_Physics_Smoothing" - label="Breast Physics Smoothing" - wearable="physics" - edit_group="physics_advanced" - value_default="2" - value_min="1" - value_max="10"> - - - edit_group="physics_breasts_updown" value_default="0" value_min="0" - value_max="10"> + value_max="1"> edit_group="physics_breasts_inout" value_default="0" value_min="0" - value_max="10"> + value_max="1"> - - - edit_group="physics_belly_updown" value_default="0" value_min="0" - value_max="10"> + value_max="1"> - - - edit_group="physics_butt_updown" value_default="0" value_min="0" - value_max="10"> + value_max="1"> edit_group="physics_butt_leftright" value_default="0" value_min="0" - value_max="10"> + value_max="1"> edit_group="physics_breasts_leftright" value_default="0" value_min="0" - value_max="10"> + value_max="1"> Date: Sun, 3 Apr 2011 21:16:34 -0400 Subject: Added duplicate morph to handle breast bounce/clap. Took out unused params in llphysicsmotion.cpp. --- indra/newview/character/avatar_lad.xml | 78 ++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 23 deletions(-) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index f8229ec465..d0158cf9f8 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4042,6 +4042,25 @@ + + + + + + + + @@ -4310,12 +4348,12 @@ id="1201" group="1" sex="female" - name="Breast_Female_Cleavage" + name="Breast_Physics_InOut_Driven" wearable="shape" edit_group="driven" value_default="0" - value_min="-.3" - value_max="1.3"> + value_min="-1" + value_max="1"> @@ -11719,19 +11757,15 @@ render_pass="bump"> + value_min="-1" + value_max="1" + value_default="0"> @@ -11739,17 +11773,15 @@ render_pass="bump"> + value_min="-1" + value_max="1" + value_default="0"> -- cgit v1.2.3 From 3d25b9adb50a5ed146121202fd0f25861b31b9ec Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sun, 3 Apr 2011 22:10:41 -0400 Subject: Fixed issue where changes in physics params were not being transmitted to other avatars. Fixed issue where left/right was appearing in non-female edit physics. --- indra/newview/character/avatar_lad.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/character/avatar_lad.xml') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index d0158cf9f8..85899603ee 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -12224,6 +12224,7 @@ render_pass="bump">