From 3825ee503ddab29cf408ae35f5a43bcc154353f2 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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/llphysicsmotion.cpp | 559 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 559 insertions(+)
 create mode 100644 indra/newview/llphysicsmotion.cpp

(limited to 'indra/newview/llphysicsmotion.cpp')

diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
new file mode 100644
index 0000000000..9043894009
--- /dev/null
+++ b/indra/newview/llphysicsmotion.cpp
@@ -0,0 +1,559 @@
+/** 
+ * @file llphysicsmotion.cpp
+ * @brief Implementation of LLPhysicsMotion class.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+//-----------------------------------------------------------------------------
+// Header Files
+//-----------------------------------------------------------------------------
+#include "llviewerprecompiledheaders.h"
+#include "linden_common.h"
+
+#include "m3math.h"
+#include "v3dmath.h"
+
+#include "llphysicsmotion.h"
+#include "llcharacter.h"
+#include "llviewercontrol.h"
+#include "llviewervisualparam.h"
+#include "llvoavatarself.h"
+
+typedef std::map<std::string, std::string> controller_map_t;
+
+#define MIN_REQUIRED_PIXEL_AREA_BREAST_MOTION 0.f;
+
+inline F64 llsgn(const F64 a)
+{
+	if (a >= 0)
+		return 1;
+	return -1;
+}
+
+class LLPhysicsMotion
+{
+public:
+	LLPhysicsMotion(const std::string &param_user_name,
+			const std::string &param_driven_name,
+			const std::string &joint_name,
+			LLCharacter *character,
+			const LLVector3 &motion_direction_vec,
+			const controller_map_t &controllers) :
+		mParamUserName(param_user_name),
+		mParamDrivenName(param_driven_name),
+		mJointName(joint_name),
+		mMotionDirectionVec(motion_direction_vec),
+		mParamUser(NULL),
+		mParamDriven(NULL),
+
+		mParamControllers(controllers),
+		mCharacter(character),
+		mLastTime(0),
+		mPosition_local(0),
+		mVelocityJoint_local(0),
+		mPositionLastUpdate_local(0),
+		mPositionMin_local(0),
+		mPositionMax_local(0)
+	{
+		mJointState = new LLJointState;
+	}
+
+	BOOL initialize();
+
+	~LLPhysicsMotion() {}
+
+	BOOL onUpdate(F32 time);
+
+	LLPointer<LLJointState> getJointState() 
+	{
+		return mJointState;
+	}
+protected:
+	F32 getParamValue(const std::string& controller_key)
+	{
+		const controller_map_t::const_iterator& entry = mParamControllers.find(controller_key);
+		if (entry == mParamControllers.end())
+		{
+			return 1.0;
+		}
+		const std::string& param_name = (*entry).second.c_str();
+		return mCharacter->getVisualParamWeight(param_name.c_str());
+	}
+
+	F32 toLocal(const LLVector3 &world);
+	F32 calculateVelocity_local(const F32 time_delta);
+	F32 calculateAcceleration_local(F32 velocity_local,
+					const F32 time_delta);
+	
+private:
+	const std::string mParamDrivenName;
+	const std::string mParamUserName;
+	const LLVector3 mMotionDirectionVec;
+	const std::string mJointName;
+
+	F32 mPosition_local;
+	F32 mVelocityJoint_local; // How fast the joint is moving
+	F32 mAccelerationJoint_local; // Acceleration on the joint
+
+	F32 mVelocity_local; // How fast the param is moving
+	F32 mPositionLastUpdate_local;
+	F32 mPositionMin_local;
+	F32 mPositionMax_local;
+	LLVector3 mPosition_world;
+
+	LLViewerVisualParam *mParamUser;
+	LLViewerVisualParam *mParamDriven;
+	const controller_map_t mParamControllers;
+	
+	LLPointer<LLJointState> mJointState;
+	LLCharacter *mCharacter;
+
+	F32 mLastTime;
+				  
+};
+
+
+
+BOOL LLPhysicsMotion::initialize()
+{
+	if (!mJointState->setJoint(mCharacter->getJoint(mJointName.c_str())))
+		return FALSE;
+	mJointState->setUsage(LLJointState::ROT);
+
+	mParamUser = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamUserName.c_str());
+	mParamDriven = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamDrivenName.c_str());
+	if ((mParamUser == NULL) || 
+	    (mParamDriven == NULL))
+	{
+		llinfos << "Failure reading in either of both of [ " << mParamUserName << " : " << mParamDrivenName << " ]" << llendl;
+		return FALSE;
+	}
+	mPositionMin_local = mParamDriven->getMinWeight();
+	mPositionMax_local = mParamDriven->getMaxWeight();
+
+	return TRUE;
+}
+
+LLPhysicsMotionController::LLPhysicsMotionController(const LLUUID &id) : 
+	LLMotion(id),
+	mCharacter(NULL)
+{
+	mName = "breast_motion";
+}
+
+LLPhysicsMotionController::~LLPhysicsMotionController()
+{
+	for (motion_vec_t::iterator iter = mMotions.begin();
+	     iter != mMotions.end();
+	     ++iter)
+	{
+		delete (*iter);
+	}
+}
+
+BOOL LLPhysicsMotionController::onActivate() 
+{ 
+	return TRUE; 
+}
+
+void LLPhysicsMotionController::onDeactivate() 
+{
+}
+
+LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter *character)
+{
+	mCharacter = character;
+
+	mMotions.clear();
+
+	controller_map_t controllers_cleavage;
+	controllers_cleavage["Mass"] = "Breast_Physics_Mass";
+	controllers_cleavage["Smoothing"] = "Breast_Physics_Smoothing";
+	controllers_cleavage["Gravity"] = "Breast_Physics_Gravity";
+	controllers_cleavage["Damping"] = "Breast_Physics_Side_Damping";
+	controllers_cleavage["Drag"] = "Breast_Physics_Side_Drag";
+	controllers_cleavage["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
+	controllers_cleavage["Spring"] = "Breast_Physics_Side_Spring";
+	controllers_cleavage["Gain"] = "Breast_Physics_Side_Gain";
+
+	LLPhysicsMotion *cleavage_motion = new LLPhysicsMotion("Breast_Female_Cleavage_Driver",
+							       "Breast_Female_Cleavage",
+							       "mChest",
+							       character,
+							       LLVector3(-1,0,0),
+							       controllers_cleavage);
+	if (!cleavage_motion->initialize())
+		return STATUS_FAILURE;
+	addMotion(cleavage_motion);
+
+	controller_map_t controllers_bounce;
+	controllers_bounce["Mass"] = "Breast_Physics_Mass";
+	controllers_bounce["Smoothing"] = "Breast_Physics_Smoothing";
+	controllers_bounce["Gravity"] = "Breast_Physics_Gravity";
+	controllers_bounce["Damping"] = "Breast_Physics_UpDown_Damping";
+	controllers_bounce["Drag"] = "Breast_Physics_UpDown_Drag";
+	controllers_bounce["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
+	controllers_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
+	controllers_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
+
+	LLPhysicsMotion *bounce_motion = new LLPhysicsMotion("Breast_Gravity_Driver",
+							     "Breast_Gravity",
+							     "mChest",
+							     character,
+							     LLVector3(0,0,1),
+							     controllers_bounce);
+	if (!bounce_motion->initialize())
+		return STATUS_FAILURE;
+	addMotion(bounce_motion);
+
+	controller_map_t controllers_butt_bounce;
+	controllers_butt_bounce["Mass"] = "Breast_Physics_Mass";
+	controllers_butt_bounce["Smoothing"] = "Breast_Physics_Smoothing";
+	controllers_butt_bounce["Gravity"] = "Breast_Physics_Gravity";
+	controllers_butt_bounce["Damping"] = "Breast_Physics_Side_Damping";
+	controllers_butt_bounce["Drag"] = "Breast_Physics_Side_Drag";
+	controllers_butt_bounce["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
+	controllers_butt_bounce["Spring"] = "Breast_Physics_Side_Spring";
+	controllers_butt_bounce["Gain"] = "Breast_Physics_Side_Gain";
+
+	LLPhysicsMotion *butt_bounce_motion = new LLPhysicsMotion("Butt_Gravity_Driver",
+								  "Butt_Gravity",
+								  "mPelvis",
+								  character,
+								  LLVector3(0,0,-1),
+								  controllers_butt_bounce);
+	if (!butt_bounce_motion->initialize())
+		return STATUS_FAILURE;
+	addMotion(butt_bounce_motion);
+
+	controller_map_t controllers_belly_bounce;
+	controllers_belly_bounce["Mass"] = "Breast_Physics_Mass";
+	controllers_belly_bounce["Smoothing"] = "Breast_Physics_Smoothing";
+	controllers_belly_bounce["Gravity"] = "Breast_Physics_Gravity";
+	controllers_belly_bounce["Damping"] = "Breast_Physics_UpDown_Damping";
+	controllers_belly_bounce["Drag"] = "Breast_Physics_UpDown_Drag";
+	controllers_belly_bounce["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
+	controllers_belly_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
+	controllers_belly_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
+
+	LLPhysicsMotion *belly_bounce_motion = new LLPhysicsMotion("Big_Belly_Torso",
+								  "Belly Size",
+								  "mChest",
+								  character,
+								   LLVector3(-0.005f,0,0),
+								  controllers_belly_bounce);
+	if (!belly_bounce_motion->initialize())
+		return STATUS_FAILURE;
+	addMotion(belly_bounce_motion);
+
+	return STATUS_SUCCESS;
+}
+
+void LLPhysicsMotionController::addMotion(LLPhysicsMotion *motion)
+{
+	addJointState(motion->getJointState());
+	mMotions.push_back(motion);
+}
+
+F32 LLPhysicsMotionController::getMinPixelArea() 
+{
+	return MIN_REQUIRED_PIXEL_AREA_BREAST_MOTION;
+}
+
+// Local space means "parameter space".
+F32 LLPhysicsMotion::toLocal(const LLVector3 &world)
+{
+	LLJoint *joint = mJointState->getJoint();
+	const LLQuaternion rotation_world = joint->getWorldRotation();
+	
+	LLVector3 dir_world = mMotionDirectionVec * rotation_world;
+	dir_world.normalize();
+	return world * dir_world * mMotionDirectionVec.length(); // dot product
+}
+
+F32 LLPhysicsMotion::calculateVelocity_local(const F32 time_delta)
+{
+	LLJoint *joint = mJointState->getJoint();
+	const LLVector3 position_world = joint->getWorldPosition();
+	const LLQuaternion rotation_world = joint->getWorldRotation();
+	const LLVector3 last_position_world = mPosition_world;
+	const LLVector3 velocity_world = (position_world-last_position_world) / time_delta;
+	const F32 velocity_local = toLocal(velocity_world);
+	return velocity_local;
+}
+
+F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local,
+						 const F32 time_delta)
+{
+	const F32 smoothing = getParamValue("Smoothing");
+	const F32 acceleration_local = velocity_local - mVelocityJoint_local;
+	
+	const F32 smoothed_acceleration_local = 
+		acceleration_local * 1.0/smoothing + 
+		mAccelerationJoint_local * (smoothing-1.0)/smoothing;
+	
+	return smoothed_acceleration_local;
+}
+
+BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
+{
+	// Skip if disabled globally.
+	if (!gSavedSettings.getBOOL("AvatarPhysics"))
+	{
+		return TRUE;
+	}
+	
+	if (mCharacter->getSex() != SEX_FEMALE) return TRUE;
+	
+	BOOL update_visuals = FALSE;
+	for (motion_vec_t::iterator iter = mMotions.begin();
+	     iter != mMotions.end();
+	     ++iter)
+	{
+		LLPhysicsMotion *motion = (*iter);
+		update_visuals |= motion->onUpdate(time);
+	}
+		
+	if (update_visuals)
+		mCharacter->updateVisualParams();
+	
+	return TRUE;
+}
+
+
+// Return TRUE if character has to update visual params.
+BOOL LLPhysicsMotion::onUpdate(F32 time)
+{
+	// static FILE *mFileWrite = fopen("c:\\temp\\avatar_data.txt","w");
+	
+	if (!mParamUser || !mParamDriven)
+		return FALSE;
+
+	if (!mLastTime)
+	{
+		mLastTime = time;
+		return FALSE;
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	// Get all parameters and settings
+	//
+
+	const F32 time_delta = time - mLastTime;
+	if (time_delta > 3.0 || time_delta <= 0.01)
+	{
+		mLastTime = time;
+		return FALSE;
+	}
+
+	// Higher LOD is better.  This controls the granularity
+	// and frequency of updates for the motions.
+	const F32 lod_factor = LLVOAvatar::sPhysicsLODFactor;
+	if (lod_factor == 0)
+	{
+		return TRUE;
+	}
+
+	F32 behavior_mass = getParamValue("Mass");
+	F32 behavior_gravity = getParamValue("Gravity");
+	F32 behavior_spring = getParamValue("Spring");
+	F32 behavior_gain = getParamValue("Gain");
+	F32 behavior_damping = getParamValue("Damping");
+	F32 behavior_maxspeed = getParamValue("MaxSpeed");
+	F32 behavior_drag = getParamValue("Drag");
+
+	F32 position_user_local = mParamUser->getWeight();
+	F32 position_current_local = mPosition_local;
+
+	//
+	// End parameters and settings
+	////////////////////////////////////////////////////////////////////////////////
+
+
+	////////////////////////////////////////////////////////////////////////////////
+	// Calculate velocity and acceleration in parameter space.
+	//
+	
+	const F32 velocity_joint_local = calculateVelocity_local(time_delta);
+	const F32 acceleration_joint_local = calculateAcceleration_local(velocity_joint_local, time_delta);
+
+	LLJoint *joint = mJointState->getJoint();
+
+	//
+	// End velocity and acceleration
+	////////////////////////////////////////////////////////////////////////////////
+
+
+	////////////////////////////////////////////////////////////////////////////////
+	// Calculate the total force 
+	//
+
+	// Spring force is a restoring force towards the original user-set breast position.
+	// F = kx
+	const F32 spring_length = position_current_local - position_user_local;
+	const F32 force_spring = -spring_length * behavior_spring;
+
+	// Acceleration is the force that comes from the change in velocity of the torso.
+	// F = ma
+	const F32 force_accel = behavior_gain * (acceleration_joint_local * behavior_mass);
+
+	// Gravity always points downward in world space.
+	// F = mg
+	const LLVector3 gravity_world(0,0,1);
+	const F32 force_gravity = behavior_gain * (toLocal(gravity_world) * behavior_gravity * behavior_mass);
+		
+	// Damping is a restoring force that opposes the current velocity.
+	// F = -kv
+	const F32 force_damping = -behavior_damping * mVelocity_local;
+		
+	// Drag is a force imparted by velocity (intuitively it is similar to wind resistance)
+	// F = .5kv^2
+	const F32 force_drag = .5*behavior_drag*velocity_joint_local*velocity_joint_local*llsgn(velocity_joint_local);
+
+	const F32 force_net = (force_accel + 
+			       force_gravity +
+			       force_spring + 
+			       force_damping + 
+			       force_drag);
+
+	//
+	// End total force
+	////////////////////////////////////////////////////////////////////////////////
+
+	
+	////////////////////////////////////////////////////////////////////////////////
+	// Calculate new params
+	//
+
+	// Calculate the new acceleration based on the net force.
+	// a = F/m
+	const F32 acceleration_new_local = force_net / behavior_mass;
+	F32 velocity_new_local = mVelocity_local + acceleration_new_local;
+	velocity_new_local = llclamp(velocity_new_local, 
+				     -behavior_maxspeed*100.0f, behavior_maxspeed*100.0f);
+	
+	// Temporary debugging setting to cause all avatars to move, for profiling purposes.
+	if (gSavedSettings.getBOOL("AvatarPhysicsTest"))
+	{
+		velocity_new_local = sin(time*4.0)*5.0;
+	}
+	// Calculate the new parameters and clamp them to the min/max ranges.
+	F32 position_new_local = position_current_local + velocity_new_local*time_delta;
+	position_new_local = llclamp(position_new_local,
+				     mPositionMin_local, mPositionMax_local);
+	
+	// Set the new parameters.
+	// If the param is disabled, just set the param to the user value.
+	if (behavior_maxspeed == 0)
+	{
+		position_new_local = position_user_local;
+	}
+	mCharacter->setVisualParamWeight(mParamDriven,
+					 position_new_local,
+					 FALSE);
+		
+	//
+	// End calculate new params
+	////////////////////////////////////////////////////////////////////////////////
+	
+	////////////////////////////////////////////////////////////////////////////////
+	// Conditionally update the visual params
+	//
+		
+	// Updating the visual params (i.e. what the user sees) is fairly expensive.
+	// So only update if the params have changed enough, and also take into account
+	// the graphics LOD settings.
+	
+	BOOL update_visuals = FALSE;
+
+	// For non-self, if the avatar is small enough visually, then don't update.
+	const F32 area_for_max_settings = 0.0;
+	const F32 area_for_min_settings = 1400.0;
+	const F32 area_for_this_setting = area_for_max_settings + (area_for_min_settings-area_for_max_settings)*(1.0-lod_factor);
+	const F32 pixel_area = fsqrtf(mCharacter->getPixelArea());
+
+	const BOOL is_self = (dynamic_cast<LLVOAvatarSelf *>(mCharacter) != NULL);
+	if ((pixel_area > area_for_this_setting) || is_self)
+	{
+		// If the parameter hasn't changed enough, then don't update.
+		const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local);
+		const F32 min_delta = (1.0-lod_factor)*(mPositionMax_local-mPositionMin_local)/2.0;
+		if (llabs(position_diff_local) > min_delta)
+		{
+			update_visuals = TRUE;
+			mPositionLastUpdate_local = position_new_local;
+		}
+	}
+
+	update_visuals = TRUE;
+	mPositionLastUpdate_local = position_new_local;
+
+	//
+	// End update visual params
+	////////////////////////////////////////////////////////////////////////////////
+
+	mVelocityJoint_local = velocity_joint_local;
+
+	mVelocity_local = velocity_new_local;
+	mAccelerationJoint_local = acceleration_joint_local;
+	mPosition_local = position_new_local;
+
+	mPosition_world = joint->getWorldPosition();
+	mLastTime = time;
+
+	/*
+	  if (mFileWrite != NULL && is_self)
+	  {
+	  fprintf(mFileWrite,"%f\t%f\t%f \t\t%f \t\t%f\t%f\t%f\t \t\t%f\t%f\t%f\t%f\t%f \t\t%f\t%f\t%f\n",
+	  position_new_local,
+	  velocity_new_local,
+	  acceleration_new_local,
+
+	  time_delta,
+
+	  mPosition_world[0],
+	  mPosition_world[1],
+	  mPosition_world[2],
+
+	  force_net,
+	  force_spring,
+	  force_accel,
+	  force_damping,
+	  force_drag,
+
+	  spring_length,
+	  velocity_joint_local,
+	  acceleration_joint_local
+	  );
+	  }
+	*/
+
+	return update_visuals;
+}
+	
-- 
cgit v1.3


From c754a7c0000d6f1defd58d7e8b4587d46ee1defe Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 10:16:03 -0400
Subject: Enabling for belly vertical motion.

---
 indra/newview/character/avatar_lad.xml | 80 ++++++++++++++++++++++++----------
 indra/newview/llphysicsmotion.cpp      |  4 +-
 indra/newview/llpolymesh.cpp           | 31 +++++++++++--
 3 files changed, 85 insertions(+), 30 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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 @@
     </param>
 
     <param
-     id="1091"
+     id="1092"
      group="0"
-     name="Belly_Gravity"
-     label="Belly Gravity"
+     name="Big_Belly_Torso_Gravity"
+     label="Big Belly Torso Gravity"
      wearable="shape"
      edit_group="driven"
      label_min="Up"
@@ -4405,6 +4405,18 @@
       <param_morph />
     </param>
 
+    <param
+     id="1093"
+     group="1"
+     name="Big_Belly_Legs_Gravity"
+     wearable="shape"
+     edit_group="driven"
+     value_min="-2"
+     value_max="2">
+      <param_morph />
+    </param>
+
+
     <param
      id="151"
      group="1"
@@ -5173,6 +5185,19 @@
       <param_morph />
     </param>
 
+    <param
+     id="1094"
+     group="1"
+     name="skirt_belly_gravity"
+     wearable="skirt"
+     edit_group="driven"
+     cross_wearable="true"
+     label="big belly skirt gravity"
+     value_min="0"
+     value_max="1">
+      <param_morph />
+    </param>
+
     <param
      id="850"
      group="1"
@@ -9407,27 +9432,6 @@ render_pass="bump">
 	</param_driver>
     </param>
 
-   <param
-     id="1092"
-     group="0"
-     name="Belly_Gravity_Driver"
-     label="Belly Gravity"
-     wearable="shape"
-     edit_group="shape_torso"
-     edit_group_order="14"
-     label_min="Less"
-     label_max="More"
-     value_default="0"
-     value_min="-2"
-     value_max="2"
-     camera_elevation=".3"
-     camera_distance=".8">
-      <param_driver>
-        <driven
-         id="1090" />
-	</param_driver>
-    </param>
-
     <param
      id="828"
      group="0"
@@ -10151,6 +10155,34 @@ render_pass="bump">
       </param_driver>
     </param>
 
+    <param
+     id="1091"
+     group="0"
+     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"
+     value_max="1"
+     value_default="0"
+     camera_distance="1.4"
+     camera_angle="30"
+     camera_elevation=".2">
+      <param_driver>
+        <driven
+         id="1092" />
+
+        <driven
+         id="1093" />
+
+        <driven
+         id="1094" />
+      </param_driver>
+    </param>
+
     <param
      id="637"
      group="0"
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 9043894009..5de1f7e145 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -263,10 +263,10 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 	controllers_belly_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
 
 	LLPhysicsMotion *belly_bounce_motion = new LLPhysicsMotion("Big_Belly_Torso",
-								  "Belly Size",
+								  "Belly_Gravity",
 								  "mChest",
 								  character,
-								   LLVector3(-0.005f,0,0),
+								   LLVector3(0,0,.25f),
 								  controllers_belly_bounce);
 	if (!belly_bounce_motion->initialize())
 		return STATUS_FAILURE;
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index 4541fa71d5..08813e6a98 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -606,10 +606,35 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "Big_Belly_Torso"))
 				{
 					LLPolyMorphData* belly_data = new LLPolyMorphData(*morph_data);
-					belly_data->mName = std::string("Belly_Gravity");
+					belly_data->mName = std::string("Big_Belly_Torso_Gravity");
+					for (U32 v=0; v < belly_data->mNumIndices; v++)
+					{
+						belly_data->mCoords[v][0] = 0;
+						belly_data->mCoords[v][1] = 0;
+						belly_data->mCoords[v][2] = 0.01F;
+					}
+					mMorphData.insert(belly_data);
+				}
+
+				if (!strcmp(morphName, "Big_Belly_Legs"))
+				{
+					LLPolyMorphData* belly_data = new LLPolyMorphData(*morph_data);
+					belly_data->mName = std::string("Big_Belly_Legs_Gravity");
+					for (U32 v=0; v < belly_data->mNumIndices; v++)
+					{
+						belly_data->mCoords[v][0] = 0;
+						belly_data->mCoords[v][1] = 0;
+						belly_data->mCoords[v][2] = 0.01F;
+					}
+					mMorphData.insert(belly_data);
+				}
+
+				if (!strcmp(morphName, "skirt_belly"))
+				{
+					LLPolyMorphData* belly_data = new LLPolyMorphData(*morph_data);
+					belly_data->mName = std::string("skirt_belly_gravity");
 					for (U32 v=0; v < belly_data->mNumIndices; v++)
 					{
-						// llinfos << "Coord: " << v << "\t" << belly_data->mCoords[v] << llendl;
 						belly_data->mCoords[v][0] = 0;
 						belly_data->mCoords[v][1] = 0;
 						belly_data->mCoords[v][2] = 0.01F;
@@ -619,12 +644,10 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 
 				if (!strcmp(morphName, "Small_Butt"))
 				{
-					llinfos << "Reading small butt" << llendl;
 					LLPolyMorphData* butt_data = new LLPolyMorphData(*morph_data);
 					butt_data->mName = std::string("Butt_Gravity");
 					for (U32 v=0; v < butt_data->mNumIndices; v++)
 					{
-						// llinfos << "Coord: " << v << "\t" << butt_data->mCoords[v] << llendl;
 						butt_data->mCoords[v][0] = 0;
 						butt_data->mCoords[v][1] = 0;
 						butt_data->mCoords[v][2] = 0.01F;
-- 
cgit v1.3


From 9560faa1496790334becbe819b6ced6f5b17cf97 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 10:31:38 -0400
Subject: Comments.

---
 indra/newview/llphysicsmotion.cpp | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 5de1f7e145..01b3ebe1f0 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -59,7 +59,30 @@ inline F64 llsgn(const F64 a)
 class LLPhysicsMotion
 {
 public:
-	LLPhysicsMotion(const std::string &param_user_name,
+	/*
+	  param_user_name: The param (if any) that the user sees and controls.  This is what
+	  the particular body part would look like without physics.  For example, it may be
+	  the breast gravity.  This param's value should will not be altered, and is only
+	  used as a reference point for the rest position of the body party.  This is usually
+	  a driver param and the param that physics is altering is the driven param.
+	  If this is left blank, that means that the physics is affecting a param that is
+	  not exposed to the user.
+
+	  param_driven_name: The param whose value is actually set by the physics.
+
+	  joint_name: The joint that the body part is attached to.  The joint is
+	  used to determine the orientation (rotation) of the body part.
+
+	  character: The avatar that this physics affects.
+
+	  motion_direction_vec: The direction (in world coordinates) that determines the
+	  motion.  For example, (0,0,1) is up-down, and means that up-down motion is what
+	  determines how this joint moves.
+
+	  controllers: The various settings (e.g. spring force, mass) that determine how
+	  the body part behaves.
+	*/
+	LLPhysicsMotion(const std::string &param_user_name, 
 			const std::string &param_driven_name,
 			const std::string &joint_name,
 			LLCharacter *character,
-- 
cgit v1.3


From d55f816fb15eab67abb72997b2eb589fff16f4ee Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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 +++----
 indra/newview/lldriverparam.h          |   2 +
 indra/newview/llphysicsmotion.cpp      | 199 +++++++++++++++++++++------------
 3 files changed, 153 insertions(+), 90 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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"
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h
index a0e45cf5e5..fb1b44458c 100644
--- a/indra/newview/lldriverparam.h
+++ b/indra/newview/lldriverparam.h
@@ -30,6 +30,7 @@
 #include "llviewervisualparam.h"
 #include "llwearabletype.h"
 
+class LLPhysicsMotion;
 class LLVOAvatar;
 class LLWearable;
 
@@ -76,6 +77,7 @@ protected:
 
 class LLDriverParam : public LLViewerVisualParam
 {
+	friend class LLPhysicsMotion; // physics motion needs to access driven params directly.
 public:
 	LLDriverParam(LLVOAvatar *avatarp);
 	LLDriverParam(LLWearable *wearablep);
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 01b3ebe1f0..eb128e043c 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -46,6 +46,7 @@
 #include "llvoavatarself.h"
 
 typedef std::map<std::string, std::string> controller_map_t;
+typedef std::map<std::string, F32> default_controller_map_t;
 
 #define MIN_REQUIRED_PIXEL_AREA_BREAST_MOTION 0.f;
 
@@ -56,19 +57,30 @@ inline F64 llsgn(const F64 a)
 	return -1;
 }
 
+/* 
+   At a high level, this works by setting temporary parameters that are not stored
+   in the avatar's list of params, and are not conveyed to other users.  We accomplish
+   this by creating some new temporary driven params inside avatar_lad that are then driven
+   by the actual params that the user sees and sets.  For example, in the old system,
+   the user sets a param called breast bouyancy, which controls the Z value of the breasts.
+   In our new system, the user still sets the breast bouyancy, but that param is redefined
+   as a driver param so that it affects ...
+*/
+
 class LLPhysicsMotion
 {
 public:
 	/*
 	  param_user_name: The param (if any) that the user sees and controls.  This is what
-	  the particular body part would look like without physics.  For example, it may be
+	  the particular property would look like without physics.  For example, it may be
 	  the breast gravity.  This param's value should will not be altered, and is only
 	  used as a reference point for the rest position of the body party.  This is usually
-	  a driver param and the param that physics is altering is the driven param.
-	  If this is left blank, that means that the physics is affecting a param that is
-	  not exposed to the user.
+	  a driver param and the param(s) that physics is altering are the driven params.
 
-	  param_driven_name: The param whose value is actually set by the physics.
+	  param_driven_name: The param whose value is actually set by the physics.  If you
+	  leave this blank (which should suffice normally), the physics will assume that
+	  param_user_name is a driver param and will set the params that the driver is
+	  in charge of (i.e. the "driven" params).
 
 	  joint_name: The joint that the body part is attached to.  The joint is
 	  used to determine the orientation (rotation) of the body part.
@@ -100,9 +112,7 @@ public:
 		mLastTime(0),
 		mPosition_local(0),
 		mVelocityJoint_local(0),
-		mPositionLastUpdate_local(0),
-		mPositionMin_local(0),
-		mPositionMax_local(0)
+		mPositionLastUpdate_local(0)
 	{
 		mJointState = new LLJointState;
 	}
@@ -123,17 +133,18 @@ protected:
 		const controller_map_t::const_iterator& entry = mParamControllers.find(controller_key);
 		if (entry == mParamControllers.end())
 		{
-			return 1.0;
+			return sDefaultController[controller_key];
 		}
 		const std::string& param_name = (*entry).second.c_str();
 		return mCharacter->getVisualParamWeight(param_name.c_str());
 	}
+	void setParamValue(LLViewerVisualParam *param,
+			   const F32 new_value_local);
 
 	F32 toLocal(const LLVector3 &world);
 	F32 calculateVelocity_local(const F32 time_delta);
 	F32 calculateAcceleration_local(F32 velocity_local,
 					const F32 time_delta);
-	
 private:
 	const std::string mParamDrivenName;
 	const std::string mParamUserName;
@@ -146,8 +157,6 @@ private:
 
 	F32 mVelocity_local; // How fast the param is moving
 	F32 mPositionLastUpdate_local;
-	F32 mPositionMin_local;
-	F32 mPositionMax_local;
 	LLVector3 mPosition_world;
 
 	LLViewerVisualParam *mParamUser;
@@ -158,10 +167,25 @@ private:
 	LLCharacter *mCharacter;
 
 	F32 mLastTime;
-				  
+	
+	static default_controller_map_t sDefaultController;
 };
 
+default_controller_map_t initDefaultController()
+{
+	default_controller_map_t controller;
+	controller["Mass"] = 2.0f;
+	controller["Smoothing"] = 2.0f;
+	controller["Gravity"] = 0.0f;
+	controller["Damping"] = .5f;
+	controller["Drag"] = 0.1f;
+	controller["MaxSpeed"] = 10.0f;
+	controller["Spring"] = 1.0f;
+	controller["Gain"] = 10.0f;
+	return controller;
+}
 
+default_controller_map_t LLPhysicsMotion::sDefaultController = initDefaultController();
 
 BOOL LLPhysicsMotion::initialize()
 {
@@ -170,15 +194,13 @@ BOOL LLPhysicsMotion::initialize()
 	mJointState->setUsage(LLJointState::ROT);
 
 	mParamUser = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamUserName.c_str());
-	mParamDriven = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamDrivenName.c_str());
-	if ((mParamUser == NULL) || 
-	    (mParamDriven == NULL))
+	if (mParamDrivenName != "")
+		mParamDriven = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamDrivenName.c_str());
+	if (mParamUser == NULL)
 	{
-		llinfos << "Failure reading in either of both of [ " << mParamUserName << " : " << mParamDrivenName << " ]" << llendl;
+		llinfos << "Failure reading in  [ " << mParamUserName << " ]" << llendl;
 		return FALSE;
 	}
-	mPositionMin_local = mParamDriven->getMinWeight();
-	mPositionMax_local = mParamDriven->getMaxWeight();
 
 	return TRUE;
 }
@@ -226,7 +248,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 	controllers_cleavage["Gain"] = "Breast_Physics_Side_Gain";
 
 	LLPhysicsMotion *cleavage_motion = new LLPhysicsMotion("Breast_Female_Cleavage_Driver",
-							       "Breast_Female_Cleavage",
+							       "",
 							       "mChest",
 							       character,
 							       LLVector3(-1,0,0),
@@ -246,7 +268,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 	controllers_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
 
 	LLPhysicsMotion *bounce_motion = new LLPhysicsMotion("Breast_Gravity_Driver",
-							     "Breast_Gravity",
+							     "",
 							     "mChest",
 							     character,
 							     LLVector3(0,0,1),
@@ -259,14 +281,13 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 	controllers_butt_bounce["Mass"] = "Breast_Physics_Mass";
 	controllers_butt_bounce["Smoothing"] = "Breast_Physics_Smoothing";
 	controllers_butt_bounce["Gravity"] = "Breast_Physics_Gravity";
-	controllers_butt_bounce["Damping"] = "Breast_Physics_Side_Damping";
-	controllers_butt_bounce["Drag"] = "Breast_Physics_Side_Drag";
-	controllers_butt_bounce["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
-	controllers_butt_bounce["Spring"] = "Breast_Physics_Side_Spring";
-	controllers_butt_bounce["Gain"] = "Breast_Physics_Side_Gain";
-
+	controllers_butt_bounce["Damping"] = "Breast_Physics_UpDown_Damping";
+	controllers_butt_bounce["Drag"] = "Breast_Physics_UpDown_Drag";
+	controllers_butt_bounce["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
+	controllers_butt_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
+	controllers_butt_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
 	LLPhysicsMotion *butt_bounce_motion = new LLPhysicsMotion("Butt_Gravity_Driver",
-								  "Butt_Gravity",
+								  "",
 								  "mPelvis",
 								  character,
 								  LLVector3(0,0,-1),
@@ -284,13 +305,12 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 	controllers_belly_bounce["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
 	controllers_belly_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
 	controllers_belly_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
-
-	LLPhysicsMotion *belly_bounce_motion = new LLPhysicsMotion("Big_Belly_Torso",
-								  "Belly_Gravity",
-								  "mChest",
-								  character,
-								   LLVector3(0,0,.25f),
-								  controllers_belly_bounce);
+	LLPhysicsMotion *belly_bounce_motion = new LLPhysicsMotion("Belly_Gravity",
+								   "",
+								   "mChest",
+								   character,
+								   LLVector3(0,0,1),
+								   controllers_belly_bounce);
 	if (!belly_bounce_motion->initialize())
 		return STATUS_FAILURE;
 	addMotion(belly_bounce_motion);
@@ -375,7 +395,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 {
 	// static FILE *mFileWrite = fopen("c:\\temp\\avatar_data.txt","w");
 	
-	if (!mParamUser || !mParamDriven)
+	if (!mParamUser)
 		return FALSE;
 
 	if (!mLastTime)
@@ -403,16 +423,24 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 		return TRUE;
 	}
 
-	F32 behavior_mass = getParamValue("Mass");
-	F32 behavior_gravity = getParamValue("Gravity");
-	F32 behavior_spring = getParamValue("Spring");
-	F32 behavior_gain = getParamValue("Gain");
-	F32 behavior_damping = getParamValue("Damping");
-	F32 behavior_maxspeed = getParamValue("MaxSpeed");
-	F32 behavior_drag = getParamValue("Drag");
+	LLJoint *joint = mJointState->getJoint();
+
+	const F32 behavior_mass = getParamValue("Mass");
+	const F32 behavior_gravity = getParamValue("Gravity");
+	const F32 behavior_spring = getParamValue("Spring");
+	const F32 behavior_gain = getParamValue("Gain");
+	const F32 behavior_damping = getParamValue("Damping");
+	const F32 behavior_maxspeed = getParamValue("MaxSpeed");
+	const F32 behavior_drag = getParamValue("Drag");
+
+	F32 position_current_local = mPosition_local; // Normalized [0,1] range
 
+	// Normalize the param position to be from [0,1].
+	// We have to use normalized values because there may be more than one driven param,
+	// and each of these driven params may have its own range.
+	// This means we'll do all our calculations in normalized [0,1] local coordinates.
 	F32 position_user_local = mParamUser->getWeight();
-	F32 position_current_local = mPosition_local;
+	position_user_local = (position_user_local - mParamUser->getMinWeight()) / (mParamUser->getMaxWeight() - mParamUser->getMinWeight());
 
 	//
 	// End parameters and settings
@@ -426,8 +454,6 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	const F32 velocity_joint_local = calculateVelocity_local(time_delta);
 	const F32 acceleration_joint_local = calculateAcceleration_local(velocity_joint_local, time_delta);
 
-	LLJoint *joint = mJointState->getJoint();
-
 	//
 	// End velocity and acceleration
 	////////////////////////////////////////////////////////////////////////////////
@@ -486,21 +512,46 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	{
 		velocity_new_local = sin(time*4.0)*5.0;
 	}
-	// Calculate the new parameters and clamp them to the min/max ranges.
-	F32 position_new_local = position_current_local + velocity_new_local*time_delta;
-	position_new_local = llclamp(position_new_local,
-				     mPositionMin_local, mPositionMax_local);
-	
-	// Set the new parameters.
-	// If the param is disabled, just set the param to the user value.
-	if (behavior_maxspeed == 0)
+	// Calculate the new parameters, or remain unchanged if max speed is 0.
+	const F32 position_new_local = (behavior_maxspeed != 0) ? 
+		(position_current_local + velocity_new_local*time_delta) :
+		position_user_local;
+
+	const F32 position_new_local_clamped = llclamp(position_new_local,
+						       0.0f,
+						       1.0f);
+
+	// Set the new param.
+	// 1. If the user has specified a param target, use that.
+	// 2. If the param is a driver param, set the param(s) that it drives.
+	// 3. Otherwise, set the param directly (don't do this if the param is a user-editable param!)
+	// If a specific param has been declared, then set that one.
+	// Otherwise, assume that the param is a driver param, and
+	// set the params that it drives.
+	if (mParamDriven)
 	{
-		position_new_local = position_user_local;
+		setParamValue(mParamDriven,position_new_local_clamped);
 	}
-	mCharacter->setVisualParamWeight(mParamDriven,
-					 position_new_local,
-					 FALSE);
-		
+	else
+	{
+		LLDriverParam *driver_param = dynamic_cast<LLDriverParam *>(mParamUser);
+		if (driver_param)
+		{
+			for (LLDriverParam::entry_list_t::iterator iter = driver_param->mDriven.begin();
+			     iter != driver_param->mDriven.end();
+			     ++iter)
+			{
+				LLDrivenEntry &entry = (*iter);
+				LLViewerVisualParam *driven_param = entry.mParam;
+				setParamValue(driven_param,position_new_local_clamped);
+			}
+		}
+		else
+		{
+			setParamValue(mParamUser,position_new_local_clamped);
+		}
+	}
+	
 	//
 	// End calculate new params
 	////////////////////////////////////////////////////////////////////////////////
@@ -508,7 +559,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	////////////////////////////////////////////////////////////////////////////////
 	// Conditionally update the visual params
 	//
-		
+	
 	// Updating the visual params (i.e. what the user sees) is fairly expensive.
 	// So only update if the params have changed enough, and also take into account
 	// the graphics LOD settings.
@@ -520,13 +571,12 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	const F32 area_for_min_settings = 1400.0;
 	const F32 area_for_this_setting = area_for_max_settings + (area_for_min_settings-area_for_max_settings)*(1.0-lod_factor);
 	const F32 pixel_area = fsqrtf(mCharacter->getPixelArea());
-
+	
 	const BOOL is_self = (dynamic_cast<LLVOAvatarSelf *>(mCharacter) != NULL);
 	if ((pixel_area > area_for_this_setting) || is_self)
 	{
-		// If the parameter hasn't changed enough, then don't update.
-		const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local);
-		const F32 min_delta = (1.0-lod_factor)*(mPositionMax_local-mPositionMin_local)/2.0;
+		const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);
+		const F32 min_delta = (1.0f-lod_factor)*4.0f; // Magic number 2.0f, can change this if experimentally something works better.
 		if (llabs(position_diff_local) > min_delta)
 		{
 			update_visuals = TRUE;
@@ -534,9 +584,6 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 		}
 	}
 
-	update_visuals = TRUE;
-	mPositionLastUpdate_local = position_new_local;
-
 	//
 	// End update visual params
 	////////////////////////////////////////////////////////////////////////////////
@@ -551,6 +598,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	mLastTime = time;
 
 	/*
+	  // Write out debugging info into a spreadsheet.
 	  if (mFileWrite != NULL && is_self)
 	  {
 	  fprintf(mFileWrite,"%f\t%f\t%f \t\t%f \t\t%f\t%f\t%f\t \t\t%f\t%f\t%f\t%f\t%f \t\t%f\t%f\t%f\n",
@@ -577,6 +625,19 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	  }
 	*/
 
-	return update_visuals;
+	return TRUE;
+}
+
+// Range of new_value_local is assumed to be [0 , 1] normalized.
+void LLPhysicsMotion::setParamValue(LLViewerVisualParam *param,
+				    F32 new_value_normalized)
+{
+	const F32 value_min_local = param->getMinWeight();
+	const F32 value_max_local = param->getMaxWeight();
+
+	const F32 new_value_local = value_min_local + (value_max_local-value_min_local) * new_value_normalized;
+
+	mCharacter->setVisualParamWeight(param,
+					 new_value_local,
+					 FALSE);
 }
-	
-- 
cgit v1.3


From 86613fd388d7985abc814ee8ee52da54fd74779e Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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 +++++-----
 indra/newview/llphysicsmotion.cpp      |  6 ++--
 indra/newview/llpolymesh.cpp           | 64 +++++++++++++++++++---------------
 3 files changed, 48 insertions(+), 40 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index eb128e043c..c9a75784e1 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -309,7 +309,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 								   "",
 								   "mChest",
 								   character,
-								   LLVector3(0,0,1),
+								   LLVector3(0,0,-1),
 								   controllers_belly_bounce);
 	if (!belly_bounce_motion->initialize())
 		return STATUS_FAILURE;
@@ -337,7 +337,7 @@ F32 LLPhysicsMotion::toLocal(const LLVector3 &world)
 	
 	LLVector3 dir_world = mMotionDirectionVec * rotation_world;
 	dir_world.normalize();
-	return world * dir_world * mMotionDirectionVec.length(); // dot product
+	return world * dir_world;
 }
 
 F32 LLPhysicsMotion::calculateVelocity_local(const F32 time_delta)
@@ -625,7 +625,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	  }
 	*/
 
-	return TRUE;
+	return update_visuals;
 }
 
 // Range of new_value_local is assumed to be [0 , 1] normalized.
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index 08813e6a98..4118401a4c 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -605,54 +605,62 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 
 				if (!strcmp(morphName, "Big_Belly_Torso"))
 				{
-					LLPolyMorphData* belly_data = new LLPolyMorphData(*morph_data);
-					belly_data->mName = std::string("Big_Belly_Torso_Gravity");
-					for (U32 v=0; v < belly_data->mNumIndices; v++)
+					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
+					cloned_morph_data->mName = std::string("Big_Belly_Torso_Gravity");
+					for (U32 v=0; v < morph_data->mNumIndices; v++)
 					{
-						belly_data->mCoords[v][0] = 0;
-						belly_data->mCoords[v][1] = 0;
-						belly_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mCoords[v][0] = 0;
+						cloned_morph_data->mCoords[v][1] = 0;
+						cloned_morph_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
+						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
 					}
-					mMorphData.insert(belly_data);
+					mMorphData.insert(cloned_morph_data);
 				}
 
 				if (!strcmp(morphName, "Big_Belly_Legs"))
 				{
-					LLPolyMorphData* belly_data = new LLPolyMorphData(*morph_data);
-					belly_data->mName = std::string("Big_Belly_Legs_Gravity");
-					for (U32 v=0; v < belly_data->mNumIndices; v++)
+					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
+					cloned_morph_data->mName = std::string("Big_Belly_Legs_Gravity");
+					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
-						belly_data->mCoords[v][0] = 0;
-						belly_data->mCoords[v][1] = 0;
-						belly_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mCoords[v][0] = 0;
+						cloned_morph_data->mCoords[v][1] = 0;
+						cloned_morph_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
+						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
 					}
-					mMorphData.insert(belly_data);
+					mMorphData.insert(cloned_morph_data);
 				}
 
 				if (!strcmp(morphName, "skirt_belly"))
 				{
-					LLPolyMorphData* belly_data = new LLPolyMorphData(*morph_data);
-					belly_data->mName = std::string("skirt_belly_gravity");
-					for (U32 v=0; v < belly_data->mNumIndices; v++)
+					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
+					cloned_morph_data->mName = std::string("skirt_belly_gravity");
+					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
-						belly_data->mCoords[v][0] = 0;
-						belly_data->mCoords[v][1] = 0;
-						belly_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mCoords[v][0] = 0;
+						cloned_morph_data->mCoords[v][1] = 0;
+						cloned_morph_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
+						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
 					}
-					mMorphData.insert(belly_data);
+					mMorphData.insert(cloned_morph_data);
 				}
 
 				if (!strcmp(morphName, "Small_Butt"))
 				{
-					LLPolyMorphData* butt_data = new LLPolyMorphData(*morph_data);
-					butt_data->mName = std::string("Butt_Gravity");
-					for (U32 v=0; v < butt_data->mNumIndices; v++)
+					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
+					cloned_morph_data->mName = std::string("Butt_Gravity");
+					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
-						butt_data->mCoords[v][0] = 0;
-						butt_data->mCoords[v][1] = 0;
-						butt_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mCoords[v][0] = 0;
+						cloned_morph_data->mCoords[v][1] = 0;
+						cloned_morph_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
+						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
 					}
-					mMorphData.insert(butt_data);
+					mMorphData.insert(cloned_morph_data);
 				}
 			}
 
-- 
cgit v1.3


From 53a944f2859d07eceed2a01a6b4f7339c0c591d9 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 18:02:27 -0400
Subject: Set default parameters. Renamed various parameters.

---
 indra/newview/character/avatar_lad.xml         | 194 ++++++++++++++++++++-----
 indra/newview/llphysicsmotion.cpp              |  53 ++++---
 indra/newview/llpolymesh.cpp                   |   8 +-
 indra/newview/skins/default/xui/en/strings.xml |  16 +-
 4 files changed, 200 insertions(+), 71 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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 @@
 
     <param
      id="1092"
-     group="0"
-     name="Big_Belly_Torso_Gravity"
-     label="Big Belly Torso Gravity"
+     group="1"
+     name="Belly_Torso_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
-     label_min="Up"
-     label_max="Down"
      value_default="0"
      value_min="-2"
-     value_max="2"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="2">
       <param_morph />
     </param>
 
@@ -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">
       <param_morph />
     </param>
 
@@ -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">
       <param_morph />
     </param>
 
@@ -4408,7 +4393,7 @@
     <param
      id="1093"
      group="1"
-     name="Big_Belly_Legs_Gravity"
+     name="Belly_Legs_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
      value_min="-2"
@@ -4458,8 +4443,7 @@
     <param
      id="1089"
      group="0"
-     name="Butt_Gravity"
-     label="Butt Gravity"
+     name="Butt_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
      label_min="Separate"
@@ -5188,11 +5172,10 @@
     <param
      id="1094"
      group="1"
-     name="skirt_belly_gravity"
+     name="Belly_Skirt_Physics_UpDown_Driven"
      wearable="skirt"
      edit_group="driven"
      cross_wearable="true"
-     label="big belly skirt gravity"
      value_min="0"
      value_max="1">
       <param_morph />
@@ -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">
    <param
      id="1090"
      group="0"
-     name="Butt_Gravity_Driver"
-     label="Butt Gravity"
+     name="Butt_Physics_UpDown_Controller"
+     label="Butt Physics UpDown Controller"
      wearable="shape"
      edit_group="shape_legs"
      edit_group_order="7"
@@ -10161,11 +10144,11 @@ 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">
       <param_driver>
         <driven
          id="1092" />
-
         <driven
          id="1093" />
-
         <driven
          id="1094" />
       </param_driver>
     </param>
 
+    <param
+     id="1095"
+     group="0"
+     name="Belly_Physics_UpDown_Spring"
+     label="Belly Physics UpDown Spring"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max="1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1096"
+     group="0"
+     name="Belly_Physics_UpDown_Gain"
+     label="Belly Physics UpDown Gain"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default="10"
+     value_min="1"
+     value_max="100"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1097"
+     group="0"
+     name="Belly_Physics_UpDown_Damping"
+     label="Belly Physics UpDown Damping"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".05"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1098"
+     group="0"
+     name="Belly_Physics_UpDown_Max_Velocity"
+     label="Belly Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1100"
+     group="0"
+     name="Butt_Physics_UpDown_Spring"
+     label="Butt Physics UpDown Spring"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max="1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1101"
+     group="0"
+     name="Butt_Physics_UpDown_Gain"
+     label="Butt Physics UpDown Gain"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default="10"
+     value_min="1"
+     value_max="100"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1102"
+     group="0"
+     name="Butt_Physics_UpDown_Damping"
+     label="Butt Physics UpDown Damping"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".05"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1103"
+     group="0"
+     name="Butt_Physics_UpDown_Max_Velocity"
+     label="Butt Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+
     <param
      id="637"
      group="0"
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index c9a75784e1..094faf4d97 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -174,13 +174,13 @@ private:
 default_controller_map_t initDefaultController()
 {
 	default_controller_map_t controller;
-	controller["Mass"] = 2.0f;
+	controller["Mass"] = 0.2f;
 	controller["Smoothing"] = 2.0f;
 	controller["Gravity"] = 0.0f;
-	controller["Damping"] = .5f;
-	controller["Drag"] = 0.1f;
-	controller["MaxSpeed"] = 10.0f;
-	controller["Spring"] = 1.0f;
+	controller["Damping"] = .05f;
+	controller["Drag"] = 0.15f;
+	controller["MaxSpeed"] = 0.1f;
+	controller["Spring"] = 0.1f;
 	controller["Gain"] = 10.0f;
 	return controller;
 }
@@ -247,7 +247,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 	controllers_cleavage["Spring"] = "Breast_Physics_Side_Spring";
 	controllers_cleavage["Gain"] = "Breast_Physics_Side_Gain";
 
-	LLPhysicsMotion *cleavage_motion = new LLPhysicsMotion("Breast_Female_Cleavage_Driver",
+	LLPhysicsMotion *cleavage_motion = new LLPhysicsMotion("Breast_Physics_Side_Controller",
 							       "",
 							       "mChest",
 							       character,
@@ -267,52 +267,53 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 	controllers_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
 	controllers_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
 
-	LLPhysicsMotion *bounce_motion = new LLPhysicsMotion("Breast_Gravity_Driver",
+	LLPhysicsMotion *bounce_motion = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",
 							     "",
 							     "mChest",
 							     character,
 							     LLVector3(0,0,1),
 							     controllers_bounce);
 	if (!bounce_motion->initialize())
+	{
+		llassert_always(FALSE);
 		return STATUS_FAILURE;
+	}
 	addMotion(bounce_motion);
 
 	controller_map_t controllers_butt_bounce;
-	controllers_butt_bounce["Mass"] = "Breast_Physics_Mass";
-	controllers_butt_bounce["Smoothing"] = "Breast_Physics_Smoothing";
-	controllers_butt_bounce["Gravity"] = "Breast_Physics_Gravity";
-	controllers_butt_bounce["Damping"] = "Breast_Physics_UpDown_Damping";
-	controllers_butt_bounce["Drag"] = "Breast_Physics_UpDown_Drag";
-	controllers_butt_bounce["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
-	controllers_butt_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
-	controllers_butt_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
-	LLPhysicsMotion *butt_bounce_motion = new LLPhysicsMotion("Butt_Gravity_Driver",
+	controllers_butt_bounce["Damping"] = "Butt_Physics_Updown_Damping";
+	controllers_butt_bounce["MaxSpeed"] = "Butt_Physics_Updown_Max_Velocity";
+	controllers_butt_bounce["Spring"] = "Butt_Physics_Updown_Spring";
+	controllers_butt_bounce["Gain"] = "Butt_Physics_Updown_Gain";
+	LLPhysicsMotion *butt_bounce_motion = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",
 								  "",
 								  "mPelvis",
 								  character,
 								  LLVector3(0,0,-1),
 								  controllers_butt_bounce);
 	if (!butt_bounce_motion->initialize())
+	{
+		llassert_always(FALSE);
 		return STATUS_FAILURE;
+	}
 	addMotion(butt_bounce_motion);
 
 	controller_map_t controllers_belly_bounce;
-	controllers_belly_bounce["Mass"] = "Breast_Physics_Mass";
-	controllers_belly_bounce["Smoothing"] = "Breast_Physics_Smoothing";
-	controllers_belly_bounce["Gravity"] = "Breast_Physics_Gravity";
-	controllers_belly_bounce["Damping"] = "Breast_Physics_UpDown_Damping";
-	controllers_belly_bounce["Drag"] = "Breast_Physics_UpDown_Drag";
-	controllers_belly_bounce["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
-	controllers_belly_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
-	controllers_belly_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
-	LLPhysicsMotion *belly_bounce_motion = new LLPhysicsMotion("Belly_Gravity",
+	controllers_belly_bounce["Damping"] = "Belly_Physics_Updown_Damping";
+	controllers_belly_bounce["MaxSpeed"] = "Belly_Physics_Updown_Max_Velocity";
+	controllers_belly_bounce["Spring"] = "Belly_Physics_Updown_Spring";
+	controllers_belly_bounce["Gain"] = "Belly_Physics_Updown_Gain";
+	LLPhysicsMotion *belly_bounce_motion = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",
 								   "",
 								   "mChest",
 								   character,
 								   LLVector3(0,0,-1),
 								   controllers_belly_bounce);
 	if (!belly_bounce_motion->initialize())
+	{
+		llassert_always(FALSE);
 		return STATUS_FAILURE;
+	}
 	addMotion(belly_bounce_motion);
 
 	return STATUS_SUCCESS;
@@ -372,8 +373,6 @@ BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
 		return TRUE;
 	}
 	
-	if (mCharacter->getSex() != SEX_FEMALE) return TRUE;
-	
 	BOOL update_visuals = FALSE;
 	for (motion_vec_t::iterator iter = mMotions.begin();
 	     iter != mMotions.end();
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index 4118401a4c..b145b65bac 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -606,7 +606,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "Big_Belly_Torso"))
 				{
 					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Big_Belly_Torso_Gravity");
+					cloned_morph_data->mName = std::string("Belly_Torso_Physics_UpDown_Driven");
 					for (U32 v=0; v < morph_data->mNumIndices; v++)
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
@@ -621,7 +621,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "Big_Belly_Legs"))
 				{
 					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Big_Belly_Legs_Gravity");
+					cloned_morph_data->mName = std::string("Belly_Legs_Physics_UpDown_Driven");
 					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
@@ -636,7 +636,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "skirt_belly"))
 				{
 					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("skirt_belly_gravity");
+					cloned_morph_data->mName = std::string("Belly_Skirt_Physics_UpDown_Driven");
 					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
@@ -651,7 +651,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "Small_Butt"))
 				{
 					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Butt_Gravity");
+					cloned_morph_data->mName = std::string("Butt_Physics_UpDown_Driven");
 					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3c7d7d1777..e5d52b03e5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2500,8 +2500,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Body Thin">Body Thin</string>
 
 <string name="Bow Legged">Bow Legged</string>
-<string name="Breast Buoyancy">Breast Buoyancy</string>
-<string name="Breast Cleavage">Breast Cleavage</string>
+<string name="Breast Physics Updown Controller">Breast Buoyancy</string>
+<string name="Breast Physics Side Controller">Breast Cleavage</string>
 <string name="Breast Size">Breast Size</string>
 <string name="Bridge Width">Bridge Width</string>
 <string name="Broad">Broad</string>
@@ -2527,6 +2527,18 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Breast Physics UpDown Drag">Breast UpDown Drag</string>
 <string name="Breast Physics UpDown Max Speed">Breast UpDown Max Speed</string>
 
+<string name="Belly Physics UpDown Controller">Belly Updown Bounce</string>
+<string name="Belly Physics UpDown Spring">Belly Updown Spring</string>
+<string name="Belly Physics UpDown Gain">Belly Updown  Gain</string>
+<string name="Belly Physics UpDown Damping">Belly Updown Damping</string>
+<string name="Belly Physics UpDown Max Speed">Belly Updown Max Speed</string>
+
+<string name="Butt Physics UpDown Controller">Butt UpDown Bounce</string>
+<string name="Butt Physics UpDown Spring">Butt UpDown Spring</string>
+<string name="Butt Physics UpDown Gain">Butt UpDown Gain</string>
+<string name="Butt Physics UpDown Damping">Butt UpDown Damping</string>
+<string name="Butt Physics UpDown Max Speed">Butt UpDown Max Speed</string>
+
 <string name="Bushy Eyebrows">Bushy Eyebrows</string>
 <string name="Bushy Hair">Bushy Hair</string>
 <string name="Butt Size">Butt Size</string>
-- 
cgit v1.3


From 49e449e3a6ea08a969a214ffb7c66ac9607e2732 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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 ++++++++++++++++++++++-
 indra/newview/llphysicsmotion.cpp      | 11 +++--------
 indra/newview/llpolymesh.cpp           |  8 ++++----
 3 files changed, 29 insertions(+), 13 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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 @@
     <param
      id="1089"
      group="0"
-     name="Butt_Physics_UpDown_Controller"
+     name="Butt_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
      label_min="Separate"
@@ -9350,6 +9350,27 @@ render_pass="bump">
 	 <param_driver />
     </param>
 
+    <param
+     id="1090"
+     group="0"
+     wearable="shape"
+     edit_group="shape_legs"
+     edit_group_order="14"
+     name="Butt_Physics_UpDown_Controller"
+     label="Butt Physics UpDown Controller"
+     label_min="Down"
+     label_max="Up"
+     value_min="-1"
+     value_max="1"
+     value_default="0"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_driver>
+        <driven
+         id="1089" />
+      </param_driver>
+    </param>
+
    <param
      id="507"
      group="0"
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 094faf4d97..393120be40 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -64,7 +64,8 @@ inline F64 llsgn(const F64 a)
    by the actual params that the user sees and sets.  For example, in the old system,
    the user sets a param called breast bouyancy, which controls the Z value of the breasts.
    In our new system, the user still sets the breast bouyancy, but that param is redefined
-   as a driver param so that it affects ...
+   as a driver param so that affects a new temporary driven param that the bounce is applied
+   to.
 */
 
 class LLPhysicsMotion
@@ -521,9 +522,6 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 						       1.0f);
 
 	// Set the new param.
-	// 1. If the user has specified a param target, use that.
-	// 2. If the param is a driver param, set the param(s) that it drives.
-	// 3. Otherwise, set the param directly (don't do this if the param is a user-editable param!)
 	// If a specific param has been declared, then set that one.
 	// Otherwise, assume that the param is a driver param, and
 	// set the params that it drives.
@@ -534,6 +532,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	else
 	{
 		LLDriverParam *driver_param = dynamic_cast<LLDriverParam *>(mParamUser);
+		llassert_always(driver_param);
 		if (driver_param)
 		{
 			for (LLDriverParam::entry_list_t::iterator iter = driver_param->mDriven.begin();
@@ -545,10 +544,6 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 				setParamValue(driven_param,position_new_local_clamped);
 			}
 		}
-		else
-		{
-			setParamValue(mParamUser,position_new_local_clamped);
-		}
 	}
 	
 	//
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index f287202ff1..626b7ca1eb 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -611,7 +611,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
 						cloned_morph_data->mCoords[v][1] = 0;
-						cloned_morph_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mCoords[v][2] = 0.05F;
 						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
 						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
 					}
@@ -626,7 +626,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
 						cloned_morph_data->mCoords[v][1] = 0;
-						cloned_morph_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mCoords[v][2] = 0.05F;
 						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
 						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
 					}
@@ -641,7 +641,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
 						cloned_morph_data->mCoords[v][1] = 0;
-						cloned_morph_data->mCoords[v][2] = 0.01F;
+						cloned_morph_data->mCoords[v][2] = 0.05F;
 						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
 						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
 					}
@@ -651,7 +651,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "Small_Butt"))
 				{
 					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Butt_Physics_UpDown_Controller");
+					cloned_morph_data->mName = std::string("Butt_Physics_UpDown_Driven");
 					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
-- 
cgit v1.3


From 717d81daa7f42d18ca37eb738ceacfe2b9c1a09a Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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 ++++++-
 indra/newview/llphysicsmotion.cpp              | 136 ++++++++++++++-----------
 indra/newview/llpolymesh.cpp                   |  82 +++++++--------
 indra/newview/skins/default/xui/en/strings.xml |   1 +
 4 files changed, 154 insertions(+), 104 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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 @@
       <param_morph />
     </param>
 
+    <param
+     id="1090"
+     group="0"
+     name="Butt_Physics_LeftRight_Driven"
+     wearable="shape"
+     edit_group="driven"
+     label_min="Separate"
+     label_max="Join"
+     value_default="0"
+     value_min="-2"
+     value_max="2"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_morph />
+    </param>
+
     <param
      id="152"
      group="1"
@@ -9351,7 +9367,7 @@ render_pass="bump">
     </param>
 
     <param
-     id="1090"
+     id="1104"
      group="0"
      wearable="shape"
      edit_group="shape_legs"
@@ -9371,6 +9387,27 @@ render_pass="bump">
       </param_driver>
     </param>
 
+    <param
+     id="1105"
+     group="0"
+     wearable="shape"
+     edit_group="shape_legs"
+     edit_group_order="15"
+     name="Butt_Physics_LeftRight_Controller"
+     label="Butt Physics LeftRight Controller"
+     label_min="Down"
+     label_max="Up"
+     value_min="-1"
+     value_max="1"
+     value_default="0"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_driver>
+        <driven
+         id="1090" />
+      </param_driver>
+    </param>
+
    <param
      id="507"
      group="0"
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 393120be40..87e062a881 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -238,85 +238,103 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 
 	mMotions.clear();
 
-	controller_map_t controllers_cleavage;
-	controllers_cleavage["Mass"] = "Breast_Physics_Mass";
-	controllers_cleavage["Smoothing"] = "Breast_Physics_Smoothing";
-	controllers_cleavage["Gravity"] = "Breast_Physics_Gravity";
-	controllers_cleavage["Damping"] = "Breast_Physics_Side_Damping";
-	controllers_cleavage["Drag"] = "Breast_Physics_Side_Drag";
-	controllers_cleavage["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
-	controllers_cleavage["Spring"] = "Breast_Physics_Side_Spring";
-	controllers_cleavage["Gain"] = "Breast_Physics_Side_Gain";
-
-	LLPhysicsMotion *cleavage_motion = new LLPhysicsMotion("Breast_Physics_Side_Controller",
-							       "",
-							       "mChest",
-							       character,
-							       LLVector3(-1,0,0),
-							       controllers_cleavage);
-	if (!cleavage_motion->initialize())
+	controller_map_t controller_breast_inout;
+	controller_breast_inout["Mass"] = "Breast_Physics_Mass";
+	controller_breast_inout["Smoothing"] = "Breast_Physics_Smoothing";
+	controller_breast_inout["Gravity"] = "Breast_Physics_Gravity";
+	controller_breast_inout["Damping"] = "Breast_Physics_Side_Damping";
+	controller_breast_inout["Drag"] = "Breast_Physics_Side_Drag";
+	controller_breast_inout["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
+	controller_breast_inout["Spring"] = "Breast_Physics_Side_Spring";
+	controller_breast_inout["Gain"] = "Breast_Physics_Side_Gain";
+
+	LLPhysicsMotion *motion_breast_inout = new LLPhysicsMotion("Breast_Physics_Side_Controller",
+								   "",
+								   "mChest",
+								   character,
+								   LLVector3(-1,0,0),
+								   controller_breast_inout);
+	if (!motion_breast_inout->initialize())
 		return STATUS_FAILURE;
-	addMotion(cleavage_motion);
-
-	controller_map_t controllers_bounce;
-	controllers_bounce["Mass"] = "Breast_Physics_Mass";
-	controllers_bounce["Smoothing"] = "Breast_Physics_Smoothing";
-	controllers_bounce["Gravity"] = "Breast_Physics_Gravity";
-	controllers_bounce["Damping"] = "Breast_Physics_UpDown_Damping";
-	controllers_bounce["Drag"] = "Breast_Physics_UpDown_Drag";
-	controllers_bounce["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
-	controllers_bounce["Spring"] = "Breast_Physics_UpDown_Spring";
-	controllers_bounce["Gain"] = "Breast_Physics_UpDown_Gain";
-
-	LLPhysicsMotion *bounce_motion = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",
-							     "",
-							     "mChest",
-							     character,
-							     LLVector3(0,0,1),
-							     controllers_bounce);
-	if (!bounce_motion->initialize())
+	addMotion(motion_breast_inout);
+
+	controller_map_t controller_breast_updown;
+	controller_breast_updown["Mass"] = "Breast_Physics_Mass";
+	controller_breast_updown["Smoothing"] = "Breast_Physics_Smoothing";
+	controller_breast_updown["Gravity"] = "Breast_Physics_Gravity";
+	controller_breast_updown["Damping"] = "Breast_Physics_UpDown_Damping";
+	controller_breast_updown["Drag"] = "Breast_Physics_UpDown_Drag";
+	controller_breast_updown["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
+	controller_breast_updown["Spring"] = "Breast_Physics_UpDown_Spring";
+	controller_breast_updown["Gain"] = "Breast_Physics_UpDown_Gain";
+
+	LLPhysicsMotion *motion_breast_updown = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",
+								    "",
+								    "mChest",
+								    character,
+								    LLVector3(0,0,1),
+								    controller_breast_updown);
+	if (!motion_breast_updown->initialize())
 	{
 		llassert_always(FALSE);
 		return STATUS_FAILURE;
 	}
-	addMotion(bounce_motion);
-
-	controller_map_t controllers_butt_bounce;
-	controllers_butt_bounce["Damping"] = "Butt_Physics_Updown_Damping";
-	controllers_butt_bounce["MaxSpeed"] = "Butt_Physics_Updown_Max_Velocity";
-	controllers_butt_bounce["Spring"] = "Butt_Physics_Updown_Spring";
-	controllers_butt_bounce["Gain"] = "Butt_Physics_Updown_Gain";
-	LLPhysicsMotion *butt_bounce_motion = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",
+	addMotion(motion_breast_updown);
+
+	controller_map_t controller_butt_updown;
+	controller_butt_updown["Damping"] = "Butt_Physics_Updown_Damping";
+	controller_butt_updown["MaxSpeed"] = "Butt_Physics_Updown_Max_Velocity";
+	controller_butt_updown["Spring"] = "Butt_Physics_Updown_Spring";
+	controller_butt_updown["Gain"] = "Butt_Physics_Updown_Gain";
+	LLPhysicsMotion *motion_butt_updown = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",
 								  "",
 								  "mPelvis",
 								  character,
-								  LLVector3(0,0,-1),
-								  controllers_butt_bounce);
-	if (!butt_bounce_motion->initialize())
+								  LLVector3(0,0,1),
+								  controller_butt_updown);
+	if (!motion_butt_updown->initialize())
 	{
 		llassert_always(FALSE);
 		return STATUS_FAILURE;
 	}
-	addMotion(butt_bounce_motion);
-
-	controller_map_t controllers_belly_bounce;
-	controllers_belly_bounce["Damping"] = "Belly_Physics_Updown_Damping";
-	controllers_belly_bounce["MaxSpeed"] = "Belly_Physics_Updown_Max_Velocity";
-	controllers_belly_bounce["Spring"] = "Belly_Physics_Updown_Spring";
-	controllers_belly_bounce["Gain"] = "Belly_Physics_Updown_Gain";
-	LLPhysicsMotion *belly_bounce_motion = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",
+	addMotion(motion_butt_updown);
+
+	controller_map_t controller_butt_leftright;
+	controller_butt_leftright["Damping"] = "Butt_Physics_Updown_Damping";
+	controller_butt_leftright["MaxSpeed"] = "Butt_Physics_Updown_Max_Velocity";
+	controller_butt_leftright["Spring"] = "Butt_Physics_Updown_Spring";
+	controller_butt_leftright["Gain"] = "Butt_Physics_Updown_Gain";
+	LLPhysicsMotion *motion_butt_leftright = new LLPhysicsMotion("Butt_Physics_LeftRight_Controller",
+								     "",
+								     "mPelvis",
+								     character,
+								     LLVector3(0,1,0),
+								     controller_butt_leftright);
+	if (!motion_butt_leftright->initialize())
+	{
+		llassert_always(FALSE);
+		return STATUS_FAILURE;
+	}
+	addMotion(motion_butt_leftright);
+
+	controller_map_t controller_belly_updown;
+	controller_belly_updown["Damping"] = "Belly_Physics_Updown_Damping";
+	controller_belly_updown["MaxSpeed"] = "Belly_Physics_Updown_Max_Velocity";
+	controller_belly_updown["Spring"] = "Belly_Physics_Updown_Spring";
+	controller_belly_updown["Gain"] = "Belly_Physics_Updown_Gain";
+	LLPhysicsMotion *motion_belly_updown = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",
 								   "",
 								   "mChest",
 								   character,
 								   LLVector3(0,0,-1),
-								   controllers_belly_bounce);
-	if (!belly_bounce_motion->initialize())
+								   controller_belly_updown);
+	if (!motion_belly_updown->initialize())
 	{
 		llassert_always(FALSE);
 		return STATUS_FAILURE;
 	}
-	addMotion(belly_bounce_motion);
-
+	addMotion(motion_belly_updown);
+	
 	return STATUS_SUCCESS;
 }
 
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index 626b7ca1eb..a28357b4a9 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -46,6 +46,10 @@
 
 extern LLControlGroup gSavedSettings;				// read only
 
+LLPolyMorphData *clone_morph_param(const LLPolyMorphData *src_data,
+				   const LLVector3 &direction,
+				   const std::string &name);
+
 //-----------------------------------------------------------------------------
 // Global table of loaded LLPolyMeshes
 //-----------------------------------------------------------------------------
@@ -605,62 +609,36 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 
 				if (!strcmp(morphName, "Big_Belly_Torso"))
 				{
-					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Belly_Torso_Physics_UpDown_Driven");
-					for (U32 v=0; v < morph_data->mNumIndices; v++)
-					{
-						cloned_morph_data->mCoords[v][0] = 0;
-						cloned_morph_data->mCoords[v][1] = 0;
-						cloned_morph_data->mCoords[v][2] = 0.05F;
-						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
-						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
-					}
-					mMorphData.insert(cloned_morph_data);
+					mMorphData.insert(clone_morph_param(morph_data,
+									    LLVector3(0,0,0.05f),
+									    "Belly_Torso_Physics_UpDown_Driven"));
 				}
 
 				if (!strcmp(morphName, "Big_Belly_Legs"))
 				{
-					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Belly_Legs_Physics_UpDown_Driven");
-					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
-					{
-						cloned_morph_data->mCoords[v][0] = 0;
-						cloned_morph_data->mCoords[v][1] = 0;
-						cloned_morph_data->mCoords[v][2] = 0.05F;
-						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
-						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
-					}
-					mMorphData.insert(cloned_morph_data);
+					mMorphData.insert(clone_morph_param(morph_data,
+									    LLVector3(0,0,0.05f),
+									    "Belly_Legs_Physics_UpDown_Driven"));
 				}
 
 				if (!strcmp(morphName, "skirt_belly"))
 				{
-					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Belly_Skirt_Physics_UpDown_Driven");
-					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
-					{
-						cloned_morph_data->mCoords[v][0] = 0;
-						cloned_morph_data->mCoords[v][1] = 0;
-						cloned_morph_data->mCoords[v][2] = 0.05F;
-						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
-						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
-					}
-					mMorphData.insert(cloned_morph_data);
+					mMorphData.insert(clone_morph_param(morph_data,
+									    LLVector3(0,0,0.05f),
+									    "Belly_Skirt_Physics_UpDown_Driven"));
 				}
 
 				if (!strcmp(morphName, "Small_Butt"))
 				{
-					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Butt_Physics_UpDown_Driven");
-					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
-					{
-						cloned_morph_data->mCoords[v][0] = 0;
-						cloned_morph_data->mCoords[v][1] = 0;
-						cloned_morph_data->mCoords[v][2] = 0.01F;
-						cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
-						cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
-					}
-					mMorphData.insert(cloned_morph_data);
+					mMorphData.insert(clone_morph_param(morph_data,
+									    LLVector3(0,0,0.01f),
+									    "Butt_Physics_UpDown_Driven"));
+				}
+				if (!strcmp(morphName, "Small_Butt"))
+				{
+					mMorphData.insert(clone_morph_param(morph_data,
+									    LLVector3(0,0.01f,0),
+									    "Butt_Physics_LeftRight_Driven"));
 				}
 			}
 
@@ -1218,4 +1196,20 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex )
 	mLastWeight = mCurWeight;
 }
 
+
+LLPolyMorphData *clone_morph_param(const LLPolyMorphData *src_data,
+				   const LLVector3 &direction,
+				   const std::string &name)
+{
+	LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*src_data);
+	cloned_morph_data->mName = name;
+	for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
+	{
+		cloned_morph_data->mCoords[v] = direction;
+		cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
+		cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
+	}
+	return cloned_morph_data;
+}
+
 // End
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e5d52b03e5..e183b0ba78 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2534,6 +2534,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Belly Physics UpDown Max Speed">Belly Updown Max Speed</string>
 
 <string name="Butt Physics UpDown Controller">Butt UpDown Bounce</string>
+<string name="Butt Physics LeftRight Controller">Butt LeftRight Bounce</string>
 <string name="Butt Physics UpDown Spring">Butt UpDown Spring</string>
 <string name="Butt Physics UpDown Gain">Butt UpDown Gain</string>
 <string name="Butt Physics UpDown Damping">Butt UpDown Damping</string>
-- 
cgit v1.3


From 77ad0269aca9169dc41bee08ff860373d7715b8c Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Mar 2011 14:15:41 -0400
Subject: Fixes for physics update thresholds.

---
 indra/newview/llphysicsmotion.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 87e062a881..2a88a4a2b5 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -588,7 +588,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	if ((pixel_area > area_for_this_setting) || is_self)
 	{
 		const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);
-		const F32 min_delta = (1.0f-lod_factor)*4.0f; // Magic number 2.0f, can change this if experimentally something works better.
+		const F32 min_delta = (1.01f-lod_factor)*0.75f; // 75% is just an experimental magic number.
 		if (llabs(position_diff_local) > min_delta)
 		{
 			update_visuals = TRUE;
-- 
cgit v1.3


From 209110d1aa7ee369ccdf68641c3d7f9e558427de Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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 ++++++++++++------------
 indra/newview/llphysicsmotion.cpp      |  8 +++++++-
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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">
       <param_morph />
     </param>
@@ -4396,7 +4396,7 @@
      name="Belly_Legs_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
-     value_min="0"
+     value_min="-1"
      value_max="1">
       <param_morph />
     </param>
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
@@ -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">
 	 <param_driver />
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 2a88a4a2b5..48e632280e 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -523,7 +523,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	const F32 acceleration_new_local = force_net / behavior_mass;
 	F32 velocity_new_local = mVelocity_local + acceleration_new_local;
 	velocity_new_local = llclamp(velocity_new_local, 
-				     -behavior_maxspeed*100.0f, behavior_maxspeed*100.0f);
+				     -behavior_maxspeed, behavior_maxspeed);
 	
 	// Temporary debugging setting to cause all avatars to move, for profiling purposes.
 	if (gSavedSettings.getBOOL("AvatarPhysicsTest"))
@@ -535,6 +535,12 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 		(position_current_local + velocity_new_local*time_delta) :
 		position_user_local;
 
+	// Zero out the velocity if the param is being pushed beyond its limits.
+	if (position_new_local < 0 || position_new_local > 1)
+	{
+		velocity_new_local = 0;
+	}
+
 	const F32 position_new_local_clamped = llclamp(position_new_local,
 						       0.0f,
 						       1.0f);
-- 
cgit v1.3


From 3208104e2e51124fb6ee90133fee328f59e1fddc Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 29 Mar 2011 20:57:17 -0400
Subject: A bit of rearchitecture so that we can have edit wearables that don't
 have associated snapshots.  Needed to support physics wearables, which don't
 use a snapshot.

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llpaneleditwearable.cpp              |  11 +-
 indra/newview/llphysicsmotion.cpp                  |  14 ++-
 indra/newview/llscrollingpanelparam.cpp            |  61 +++--------
 indra/newview/llscrollingpanelparam.h              |  11 +-
 indra/newview/llscrollingpanelparambase.cpp        | 112 +++++++++++++++++++++
 indra/newview/llscrollingpanelparambase.h          |  62 ++++++++++++
 .../default/xui/en/panel_scrolling_param_base.xml  |  23 +++++
 8 files changed, 236 insertions(+), 60 deletions(-)
 create mode 100644 indra/newview/llscrollingpanelparambase.cpp
 create mode 100644 indra/newview/llscrollingpanelparambase.h
 create mode 100644 indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml

(limited to 'indra/newview/llphysicsmotion.cpp')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b7ed4fc0a4..04f2ec0cb2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -401,6 +401,7 @@ set(viewer_SOURCE_FILES
     llscreenchannel.cpp
     llscriptfloater.cpp
     llscrollingpanelparam.cpp
+    llscrollingpanelparambase.cpp
     llsearchcombobox.cpp
     llsearchhistory.cpp
     llsecapi.cpp
@@ -938,6 +939,7 @@ set(viewer_HEADER_FILES
     llscreenchannel.h
     llscriptfloater.h
     llscrollingpanelparam.h
+    llscrollingpanelparambase.h
     llsearchcombobox.h
     llsearchhistory.h
     llsecapi.h
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 7058839e8c..a7d20acbbc 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -1415,7 +1415,16 @@ void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value
 		{
 			LLPanel::Params p;
 			p.name("LLScrollingPanelParam");
-			LLScrollingPanelParam* panel_param = new LLScrollingPanelParam( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
+			LLWearable *wearable = this->getWearable();
+			LLScrollingPanelParamBase *panel_param = NULL;
+			if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics.  Should generalize this later.
+			{
+				panel_param = new LLScrollingPanelParamBase( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
+			}
+			else
+			{
+				panel_param = new LLScrollingPanelParam( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
+			}
 			height = panel_list->addPanel( panel_param );
 		}
 	}
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 48e632280e..4048c66262 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -448,8 +448,16 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	const F32 behavior_spring = getParamValue("Spring");
 	const F32 behavior_gain = getParamValue("Gain");
 	const F32 behavior_damping = getParamValue("Damping");
-	const F32 behavior_maxspeed = getParamValue("MaxSpeed");
 	const F32 behavior_drag = getParamValue("Drag");
+	const BOOL physics_test = gSavedSettings.getBOOL("AvatarPhysicsTest");
+	
+	F32 behavior_maxspeed = getParamValue("MaxSpeed");
+	if (physics_test)
+		behavior_maxspeed = 100.0f;
+	/*
+	if (behavior_maxspeed == 0)
+		return FALSE;
+	*/
 
 	F32 position_current_local = mPosition_local; // Normalized [0,1] range
 
@@ -526,9 +534,9 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 				     -behavior_maxspeed, behavior_maxspeed);
 	
 	// Temporary debugging setting to cause all avatars to move, for profiling purposes.
-	if (gSavedSettings.getBOOL("AvatarPhysicsTest"))
+	if (physics_test)
 	{
-		velocity_new_local = sin(time*4.0)*5.0;
+		velocity_new_local = sin(time*4.0);
 	}
 	// Calculate the new parameters, or remain unchanged if max speed is 0.
 	const F32 position_new_local = (behavior_maxspeed != 0) ? 
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp
index f8c20dada0..5310ababba 100644
--- a/indra/newview/llscrollingpanelparam.cpp
+++ b/indra/newview/llscrollingpanelparam.cpp
@@ -50,14 +50,9 @@ const S32 LLScrollingPanelParam::PARAM_HINT_HEIGHT = 128;
 S32 LLScrollingPanelParam::sUpdateDelayFrames = 0;
 
 LLScrollingPanelParam::LLScrollingPanelParam( const LLPanel::Params& panel_params,
-											  LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp )
-	: LLScrollingPanel( panel_params ),
-	  mParam(param),
-	  mAllowModify(allow_modify),
-	  mWearable(wearable)
+					      LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints )
+    : LLScrollingPanelParamBase( panel_params, mesh, param, allow_modify, wearable, jointp, use_hints)
 {
-	buildFromFile( "panel_scrolling_param.xml");
-
 	// *HACK To avoid hard coding texture position, lets use border's position for texture. 
 	LLViewBorder* left_border = getChild<LLViewBorder>("left_border");
 
@@ -73,17 +68,6 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLPanel::Params& panel_param
 	
 	mHintMin->setAllowsUpdates( FALSE );
 	mHintMax->setAllowsUpdates( FALSE );
-	getChild<LLUICtrl>("param slider")->setValue(weightToPercent(param->getWeight()));
-
-	std::string display_name = LLTrans::getString(param->getDisplayName());
-	getChild<LLUICtrl>("param slider")->setLabelArg("[DESC]", display_name);
-	getChildView("param slider")->setEnabled(mAllowModify);
-	childSetCommitCallback("param slider", LLScrollingPanelParam::onSliderMoved, this);
-
-	std::string min_name = LLTrans::getString(param->getMinDisplayName());
-	std::string max_name = LLTrans::getString(param->getMaxDisplayName());
-	getChild<LLUICtrl>("min param text")->setValue(min_name);
-	getChild<LLUICtrl>("max param text")->setValue(max_name);
 
 	LLButton* less = getChild<LLButton>("less");
 	if (less)
@@ -112,20 +96,15 @@ LLScrollingPanelParam::~LLScrollingPanelParam()
 }
 void LLScrollingPanelParam::updatePanel(BOOL allow_modify)
 {
-	LLViewerVisualParam* param = mHintMin->getVisualParam();
-
 	if (!mWearable)
 	{
 		// not editing a wearable just now, no update necessary
 		return;
 	}
-	F32 current_weight = mWearable->getVisualParamWeight( param->getID() );
-	getChild<LLUICtrl>("param slider")->setValue(weightToPercent( current_weight ) );
+	LLScrollingPanelParamBase::updatePanel(allow_modify);
+
 	mHintMin->requestUpdate( sUpdateDelayFrames++ );
 	mHintMax->requestUpdate( sUpdateDelayFrames++ );
-
-	mAllowModify = allow_modify;
-	getChildView("param slider")->setEnabled(mAllowModify);
 	getChildView("less")->setEnabled(mAllowModify);
 	getChildView("more")->setEnabled(mAllowModify);
 }
@@ -135,13 +114,17 @@ void LLScrollingPanelParam::setVisible( BOOL visible )
 	if( getVisible() != visible )
 	{
 		LLPanel::setVisible( visible );
-		mHintMin->setAllowsUpdates( visible );
-		mHintMax->setAllowsUpdates( visible );
+		if (mHintMin)
+			mHintMin->setAllowsUpdates( visible );
+		if (mHintMax)
+			mHintMax->setAllowsUpdates( visible );
 
 		if( visible )
 		{
-			mHintMin->setUpdateDelayFrames( sUpdateDelayFrames++ );
-			mHintMax->setUpdateDelayFrames( sUpdateDelayFrames++ );
+			if (mHintMin)
+				mHintMin->setUpdateDelayFrames( sUpdateDelayFrames++ );
+			if (mHintMax)
+				mHintMax->setUpdateDelayFrames( sUpdateDelayFrames++ );
 		}
 	}
 }
@@ -164,7 +147,7 @@ void LLScrollingPanelParam::draw()
 	getChildView("min param text")->setVisible( FALSE );
 	getChildView("max param text")->setVisible( FALSE );
 	LLPanel::draw();
-
+	
 	// If we're in a focused floater, don't apply the floater's alpha to visual param hint,
 	// making its behavior similar to texture controls'.
 	F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
@@ -195,23 +178,6 @@ void LLScrollingPanelParam::draw()
 	drawChild(getChild<LLView>("max param text"));
 }
 
-// static
-void LLScrollingPanelParam::onSliderMoved(LLUICtrl* ctrl, void* userdata)
-{
-	LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
-	LLScrollingPanelParam* self = (LLScrollingPanelParam*) userdata;
-	LLViewerVisualParam* param = self->mParam;
-	
-	F32 current_weight = self->mWearable->getVisualParamWeight( param->getID() );
-	F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
-	if (current_weight != new_weight )
-	{
-		self->mWearable->setVisualParamWeight( param->getID(), new_weight, FALSE );
-		self->mWearable->writeToAvatar();
-		gAgentAvatarp->updateVisualParams();
-	}
-}
-
 // static
 void LLScrollingPanelParam::onSliderMouseDown(LLUICtrl* ctrl, void* userdata)
 {
@@ -221,7 +187,6 @@ void LLScrollingPanelParam::onSliderMouseDown(LLUICtrl* ctrl, void* userdata)
 void LLScrollingPanelParam::onSliderMouseUp(LLUICtrl* ctrl, void* userdata)
 {
 	LLScrollingPanelParam* self = (LLScrollingPanelParam*) userdata;
-
 	LLVisualParamHint::requestHintUpdates( self->mHintMin, self->mHintMax );
 }
 
diff --git a/indra/newview/llscrollingpanelparam.h b/indra/newview/llscrollingpanelparam.h
index 1cbc64f45a..c7a47d5c7a 100644
--- a/indra/newview/llscrollingpanelparam.h
+++ b/indra/newview/llscrollingpanelparam.h
@@ -28,8 +28,7 @@
 #ifndef LL_SCROLLINGPANELPARAM_H
 #define LL_SCROLLINGPANELPARAM_H
 
-#include "llpanel.h"
-#include "llscrollingpanellist.h"
+#include "llscrollingpanelparambase.h"
 
 class LLViewerJointMesh;
 class LLViewerVisualParam;
@@ -38,11 +37,11 @@ class LLVisualParamHint;
 class LLViewerVisualParam;
 class LLJoint;
 
-class LLScrollingPanelParam : public LLScrollingPanel
+class LLScrollingPanelParam : public LLScrollingPanelParamBase
 {
 public:
 	LLScrollingPanelParam( const LLPanel::Params& panel_params,
-						   LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp );
+			       LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints = TRUE );
 	virtual ~LLScrollingPanelParam();
 
 	virtual void		draw();
@@ -50,7 +49,6 @@ public:
 	virtual void		updatePanel(BOOL allow_modify);
 
 	static void			onSliderMouseDown(LLUICtrl* ctrl, void* userdata);
-	static void			onSliderMoved(LLUICtrl* ctrl, void* userdata);
 	static void			onSliderMouseUp(LLUICtrl* ctrl, void* userdata);
 
 	static void			onHintMinMouseDown(void* userdata);
@@ -74,7 +72,6 @@ public:
 	const static S32 PARAM_HINT_HEIGHT;
 
 public:
-	LLViewerVisualParam* mParam;
 	LLPointer<LLVisualParamHint>	mHintMin;
 	LLPointer<LLVisualParamHint>	mHintMax;
 	static S32 			sUpdateDelayFrames;
@@ -82,9 +79,7 @@ public:
 protected:
 	LLTimer				mMouseDownTimer;	// timer for how long mouse has been held down on a hint.
 	F32					mLastHeldTime;
-
 	BOOL mAllowModify;
-	LLWearable *mWearable;
 }; 
 
 #endif
diff --git a/indra/newview/llscrollingpanelparambase.cpp b/indra/newview/llscrollingpanelparambase.cpp
new file mode 100644
index 0000000000..62e3039d2f
--- /dev/null
+++ b/indra/newview/llscrollingpanelparambase.cpp
@@ -0,0 +1,112 @@
+/** 
+ * @file llscrollingpanelparam.cpp
+ * @brief UI panel for a list of visual param panels
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llscrollingpanelparambase.h"
+#include "llviewerjointmesh.h"
+#include "llviewervisualparam.h"
+#include "llwearable.h"
+#include "llviewervisualparam.h"
+#include "lltoolmorph.h"
+#include "lltrans.h"
+#include "llbutton.h"
+#include "llsliderctrl.h"
+#include "llagent.h"
+#include "llviewborder.h"
+#include "llvoavatarself.h"
+
+LLScrollingPanelParamBase::LLScrollingPanelParamBase( const LLPanel::Params& panel_params,
+						      LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints)
+	: LLScrollingPanel( panel_params ),
+	  mParam(param),
+	  mAllowModify(allow_modify),
+	  mWearable(wearable)
+{
+	if (use_hints)
+		buildFromFile( "panel_scrolling_param.xml");
+	else
+		buildFromFile( "panel_scrolling_param_base.xml");
+	
+	getChild<LLUICtrl>("param slider")->setValue(weightToPercent(param->getWeight()));
+
+	std::string display_name = LLTrans::getString(param->getDisplayName());
+	getChild<LLUICtrl>("param slider")->setLabelArg("[DESC]", display_name);
+	getChildView("param slider")->setEnabled(mAllowModify);
+	childSetCommitCallback("param slider", LLScrollingPanelParamBase::onSliderMoved, this);
+
+	setVisible(FALSE);
+	setBorderVisible( FALSE );
+}
+
+LLScrollingPanelParamBase::~LLScrollingPanelParamBase()
+{
+}
+
+void LLScrollingPanelParamBase::updatePanel(BOOL allow_modify)
+{
+	LLViewerVisualParam* param = mParam;
+
+	if (!mWearable)
+	{
+		// not editing a wearable just now, no update necessary
+		return;
+	}
+
+	F32 current_weight = mWearable->getVisualParamWeight( param->getID() );
+	getChild<LLUICtrl>("param slider")->setValue(weightToPercent( current_weight ) );
+	mAllowModify = allow_modify;
+	getChildView("param slider")->setEnabled(mAllowModify);
+}
+
+// static
+void LLScrollingPanelParamBase::onSliderMoved(LLUICtrl* ctrl, void* userdata)
+{
+	LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
+	LLScrollingPanelParamBase* self = (LLScrollingPanelParamBase*) userdata;
+	LLViewerVisualParam* param = self->mParam;
+	
+	F32 current_weight = self->mWearable->getVisualParamWeight( param->getID() );
+	F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
+	if (current_weight != new_weight )
+	{
+		self->mWearable->setVisualParamWeight( param->getID(), new_weight, FALSE );
+		self->mWearable->writeToAvatar();
+		gAgentAvatarp->updateVisualParams();
+	}
+}
+
+F32 LLScrollingPanelParamBase::weightToPercent( F32 weight )
+{
+	LLViewerVisualParam* param = mParam;
+	return (weight - param->getMinWeight()) /  (param->getMaxWeight() - param->getMinWeight()) * 100.f;
+}
+
+F32 LLScrollingPanelParamBase::percentToWeight( F32 percent )
+{
+	LLViewerVisualParam* param = mParam;
+	return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
+}
diff --git a/indra/newview/llscrollingpanelparambase.h b/indra/newview/llscrollingpanelparambase.h
new file mode 100644
index 0000000000..9538826251
--- /dev/null
+++ b/indra/newview/llscrollingpanelparambase.h
@@ -0,0 +1,62 @@
+/** 
+ * @file llscrollingpanelparam.h
+ * @brief the scrolling panel containing a list of visual param 
+ *  	  panels
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_SCROLLINGPANELPARAMBASE_H
+#define LL_SCROLLINGPANELPARAMBASE_H
+
+#include "llpanel.h"
+#include "llscrollingpanellist.h"
+
+class LLViewerJointMesh;
+class LLViewerVisualParam;
+class LLWearable;
+class LLVisualParamHint;
+class LLViewerVisualParam;
+class LLJoint;
+
+class LLScrollingPanelParamBase : public LLScrollingPanel
+{
+public:
+	LLScrollingPanelParamBase( const LLPanel::Params& panel_params,
+				   LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints = FALSE );
+	virtual ~LLScrollingPanelParamBase();
+
+	virtual void		updatePanel(BOOL allow_modify);
+
+	static void			onSliderMoved(LLUICtrl* ctrl, void* userdata);
+
+	F32					weightToPercent( F32 weight );
+	F32					percentToWeight( F32 percent );
+
+public:
+	LLViewerVisualParam* mParam;
+protected:
+	BOOL mAllowModify;
+	LLWearable *mWearable;
+}; 
+
+#endif
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
new file mode 100644
index 0000000000..177a2fe9f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ layout="topleft"
+ left="0"
+ name="LLScrollingPanelParamBase"
+ height="20"
+ width="290">
+    <slider
+     can_edit_text="true"
+     decimal_digits="0"
+     enabled="false"
+     height="16"
+     increment="1"
+     initial_value="0"
+     label="[DESC]"
+     layout="bottom|left"
+     left="6"
+     max_val="100"
+     name="param slider"
+     bottom="1"
+     width="274" 
+     slider_label.font.style="BOLD" />
+</panel>
-- 
cgit v1.3


From 993ad22f9ffeae6d20f75dc409cf0128ca167a0e Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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 ++++++++++++++++++++---
 indra/newview/llphysicsmotion.cpp              | 204 ++++++++++++++-----------
 indra/newview/skins/default/xui/en/strings.xml |  25 ++-
 3 files changed, 300 insertions(+), 120 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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">
     <param
      id="1130"
      group="0"
+     name="Belly_Physics_Mass"
+     label="Belly Physics Mass"
+     wearable="physics"
+     edit_group="physics_belly"
+     value_default=".1"
+     value_min=".1"
+     value_max="1">
+	 <param_driver />
+    </param>
+    <param
+     id="1131"
+     group="0"
+     name="Belly_Physics_Smoothing"
+     label="Belly Physics Smoothing"
+     wearable="physics"
+     edit_group="physics_belly"
+     value_default="2"
+     value_min="1"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1132"
+     group="0"
+     name="Belly_Physics_Gravity"
+     label="Belly Physics Gravity"
+     wearable="physics"
+     edit_group="physics_belly"
+     value_default="0"
+     value_min="0"
+     value_max=".1">
+	 <param_driver />
+    </param>
+    <param
+     id="1133"
+     group="0"
      name="Belly_Physics_UpDown_Spring"
      label="Belly Physics UpDown Spring"
      wearable="physics"
      edit_group="physics_belly"
-     label_min="Less"
-     label_max="More"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1131"
+     id="1134"
      group="0"
      name="Belly_Physics_UpDown_Gain"
      label="Belly Physics UpDown Gain"
      wearable="physics"
      edit_group="physics_belly"
-     label_min="Less"
-     label_max="More"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1132"
+     id="1135"
      group="0"
      name="Belly_Physics_UpDown_Damping"
      label="Belly Physics UpDown Damping"
      wearable="physics"
      edit_group="physics"
-     label_min="Less"
-     label_max="More"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
-    <param
-     id="1133"
+   <param
+     id="1136"
+     group="0"
+     name="Belly_Physics_UpDown_Drag"
+     label="Belly Physics UpDown Drag"
+     wearable="physics"
+     edit_group="physics_belly"
+     value_default=".15"
+     value_min="0"
+     value_max=".5">
+	 <param_driver />
+    </param>
+   <param
+     id="1137"
      group="0"
      name="Belly_Physics_UpDown_Max_Velocity"
      label="Belly Physics UpDown Max Speed"
      wearable="physics"
      edit_group="physics_belly"
-     label_min="Less"
-     label_max="More"
      value_default="0"
      value_min="0"
      value_max="10">
@@ -12009,54 +12049,155 @@ render_pass="bump">
     <param
      id="1140"
      group="0"
+     name="Butt_Physics_Mass"
+     label="Butt Physics Mass"
+     wearable="physics"
+     edit_group="physics_butt"
+     value_default=".1"
+     value_min=".1"
+     value_max="1">
+	 <param_driver />
+    </param>
+    <param
+     id="1141"
+     group="0"
+     name="Butt_Physics_Smoothing"
+     label="Butt Physics Smoothing"
+     wearable="physics"
+     edit_group="physics_butt"
+     value_default="2"
+     value_min="1"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1142"
+     group="0"
+     name="Butt_Physics_Gravity"
+     label="Butt Physics Gravity"
+     wearable="physics"
+     edit_group="physics_butt"
+     value_default="0"
+     value_min="0"
+     value_max=".1">
+	 <param_driver />
+    </param>
+    <param
+     id="1143"
+     group="0"
      name="Butt_Physics_UpDown_Spring"
      label="Butt Physics UpDown Spring"
      wearable="physics"
      edit_group="physics_butt"
-     label_min="Less"
-     label_max="More"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1141"
+     id="1144"
      group="0"
      name="Butt_Physics_UpDown_Gain"
      label="Butt Physics UpDown Gain"
      wearable="physics"
      edit_group="physics_butt"
-     label_min="Less"
-     label_max="More"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1142"
+     id="1145"
      group="0"
      name="Butt_Physics_UpDown_Damping"
      label="Butt Physics UpDown Damping"
-     wearable="physics_butt"
+     wearable="physics"
      edit_group="physics"
-     label_min="Less"
-     label_max="More"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
-    <param
-     id="1143"
+   <param
+     id="1146"
+     group="0"
+     name="Butt_Physics_UpDown_Drag"
+     label="Butt Physics UpDown Drag"
+     wearable="physics"
+     edit_group="physics_butt"
+     value_default=".15"
+     value_min="0"
+     value_max=".5">
+	 <param_driver />
+    </param>
+   <param
+     id="1147"
      group="0"
      name="Butt_Physics_UpDown_Max_Velocity"
      label="Butt Physics UpDown Max Speed"
      wearable="physics"
      edit_group="physics_butt"
-     label_min="Less"
-     label_max="More"
+     value_default="0"
+     value_min="0"
+     value_max="10">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1143"
+     group="0"
+     name="Butt_Physics_LeftRight_Spring"
+     label="Butt Physics LeftRight Spring"
+     wearable="physics"
+     edit_group="physics_butt"
+     value_default=".1"
+     value_min="0"
+     value_max="1">
+	 <param_driver />
+    </param>
+    <param
+     id="1144"
+     group="0"
+     name="Butt_Physics_LeftRight_Gain"
+     label="Butt Physics LeftRight Gain"
+     wearable="physics"
+     edit_group="physics_butt"
+     value_default="10"
+     value_min="1"
+     value_max="100">
+	 <param_driver />
+    </param>
+    <param
+     id="1145"
+     group="0"
+     name="Butt_Physics_LeftRight_Damping"
+     label="Butt Physics LeftRight Damping"
+     wearable="physics"
+     edit_group="physics"
+     value_default=".05"
+     value_min="0"
+     value_max=".1">
+	 <param_driver />
+    </param>
+   <param
+     id="1146"
+     group="0"
+     name="Butt_Physics_LeftRight_Drag"
+     label="Butt Physics LeftRight Drag"
+     wearable="physics"
+     edit_group="physics_butt"
+     value_default=".15"
+     value_min="0"
+     value_max=".5">
+	 <param_driver />
+    </param>
+   <param
+     id="1147"
+     group="0"
+     name="Butt_Physics_LeftRight_Max_Velocity"
+     label="Butt Physics LeftRight Max Speed"
+     wearable="physics"
+     edit_group="physics_butt"
      value_default="0"
      value_min="0"
      value_max="10">
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 4048c66262..fd83f4d482 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -238,102 +238,130 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 
 	mMotions.clear();
 
-	controller_map_t controller_breast_inout;
-	controller_breast_inout["Mass"] = "Breast_Physics_Mass";
-	controller_breast_inout["Smoothing"] = "Breast_Physics_Smoothing";
-	controller_breast_inout["Gravity"] = "Breast_Physics_Gravity";
-	controller_breast_inout["Damping"] = "Breast_Physics_Side_Damping";
-	controller_breast_inout["Drag"] = "Breast_Physics_Side_Drag";
-	controller_breast_inout["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
-	controller_breast_inout["Spring"] = "Breast_Physics_Side_Spring";
-	controller_breast_inout["Gain"] = "Breast_Physics_Side_Gain";
-
-	LLPhysicsMotion *motion_breast_inout = new LLPhysicsMotion("Breast_Physics_Side_Controller",
-								   "",
-								   "mChest",
-								   character,
-								   LLVector3(-1,0,0),
-								   controller_breast_inout);
-	if (!motion_breast_inout->initialize())
-		return STATUS_FAILURE;
-	addMotion(motion_breast_inout);
-
-	controller_map_t controller_breast_updown;
-	controller_breast_updown["Mass"] = "Breast_Physics_Mass";
-	controller_breast_updown["Smoothing"] = "Breast_Physics_Smoothing";
-	controller_breast_updown["Gravity"] = "Breast_Physics_Gravity";
-	controller_breast_updown["Damping"] = "Breast_Physics_UpDown_Damping";
-	controller_breast_updown["Drag"] = "Breast_Physics_UpDown_Drag";
-	controller_breast_updown["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
-	controller_breast_updown["Spring"] = "Breast_Physics_UpDown_Spring";
-	controller_breast_updown["Gain"] = "Breast_Physics_UpDown_Gain";
-
-	LLPhysicsMotion *motion_breast_updown = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",
-								    "",
-								    "mChest",
-								    character,
-								    LLVector3(0,0,1),
-								    controller_breast_updown);
-	if (!motion_breast_updown->initialize())
+	// Breast Cleavage
 	{
-		llassert_always(FALSE);
-		return STATUS_FAILURE;
+		controller_map_t controller;
+		controller["Mass"] = "Breast_Physics_Mass";
+		controller["Smoothing"] = "Breast_Physics_Smoothing";
+		controller["Gravity"] = "Breast_Physics_Gravity";
+		controller["Damping"] = "Breast_Physics_Side_Damping";
+		controller["Drag"] = "Breast_Physics_Side_Drag";
+		controller["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
+		controller["Spring"] = "Breast_Physics_Side_Spring";
+		controller["Gain"] = "Breast_Physics_Side_Gain";
+		LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_Side_Controller",
+													  "",
+													  "mChest",
+													  character,
+													  LLVector3(-1,0,0),
+													  controller);
+		if (!motion->initialize())
+		{
+			llassert_always(FALSE);
+			return STATUS_FAILURE;
+		}
+		addMotion(motion);
+	}
+
+	// Breast Bounce
+	{
+		controller_map_t controller;
+		controller["Mass"] = "Breast_Physics_Mass";
+		controller["Smoothing"] = "Breast_Physics_Smoothing";
+		controller["Gravity"] = "Breast_Physics_Gravity";
+		controller["Damping"] = "Breast_Physics_UpDown_Damping";
+		controller["Drag"] = "Breast_Physics_UpDown_Drag";
+		controller["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
+		controller["Spring"] = "Breast_Physics_UpDown_Spring";
+		controller["Gain"] = "Breast_Physics_UpDown_Gain";
+		LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",
+													  "",
+													  "mChest",
+													  character,
+													  LLVector3(0,0,1),
+													  controller);
+		if (!motion->initialize())
+		{
+			llassert_always(FALSE);
+			return STATUS_FAILURE;
+		}
+		addMotion(motion);
 	}
-	addMotion(motion_breast_updown);
-
-	controller_map_t controller_butt_updown;
-	controller_butt_updown["Damping"] = "Butt_Physics_Updown_Damping";
-	controller_butt_updown["MaxSpeed"] = "Butt_Physics_Updown_Max_Velocity";
-	controller_butt_updown["Spring"] = "Butt_Physics_Updown_Spring";
-	controller_butt_updown["Gain"] = "Butt_Physics_Updown_Gain";
-	LLPhysicsMotion *motion_butt_updown = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",
-								  "",
-								  "mPelvis",
-								  character,
-								  LLVector3(0,0,1),
-								  controller_butt_updown);
-	if (!motion_butt_updown->initialize())
+	
+	// Butt Bounce
 	{
-		llassert_always(FALSE);
-		return STATUS_FAILURE;
+		controller_map_t controller;
+		controller["Mass"] = "Butt_Physics_Mass";
+		controller["Smoothing"] = "Butt_Physics_Smoothing";
+		controller["Gravity"] = "Butt_Physics_Gravity";
+		controller["Damping"] = "Butt_Physics_UpDown_Damping";
+		controller["Drag"] = "Butt_Physics_UpDown_Drag";
+		controller["MaxSpeed"] = "Butt_Physics_UpDown_Max_Velocity";
+		controller["Spring"] = "Butt_Physics_UpDown_Spring";
+		controller["Gain"] = "Butt_Physics_UpDown_Gain";
+		LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",
+													  "",
+													  "mPelvis",
+													  character,
+													  LLVector3(0,0,1),
+													  controller);
+		if (!motion->initialize())
+		{
+			llassert_always(FALSE);
+			return STATUS_FAILURE;
+		}
+		addMotion(motion);
 	}
-	addMotion(motion_butt_updown);
-
-	controller_map_t controller_butt_leftright;
-	controller_butt_leftright["Damping"] = "Butt_Physics_Updown_Damping";
-	controller_butt_leftright["MaxSpeed"] = "Butt_Physics_Updown_Max_Velocity";
-	controller_butt_leftright["Spring"] = "Butt_Physics_Updown_Spring";
-	controller_butt_leftright["Gain"] = "Butt_Physics_Updown_Gain";
-	LLPhysicsMotion *motion_butt_leftright = new LLPhysicsMotion("Butt_Physics_LeftRight_Controller",
-								     "",
-								     "mPelvis",
-								     character,
-								     LLVector3(0,1,0),
-								     controller_butt_leftright);
-	if (!motion_butt_leftright->initialize())
+
+	// Butt LeftRight
 	{
-		llassert_always(FALSE);
-		return STATUS_FAILURE;
+		controller_map_t controller;
+		controller["Mass"] = "Butt_Physics_Mass";
+		controller["Smoothing"] = "Butt_Physics_Smoothing";
+		controller["Gravity"] = "Butt_Physics_Gravity";
+		controller["Damping"] = "Butt_Physics_LeftRight_Damping";
+		controller["Drag"] = "Butt_Physics_LeftRight_Drag";
+		controller["MaxSpeed"] = "Butt_Physics_LeftRight_Max_Velocity";
+		controller["Spring"] = "Butt_Physics_LeftRight_Spring";
+		controller["Gain"] = "Butt_Physics_LeftRight_Gain";
+		LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_LeftRight_Controller",
+													  "",
+													  "mPelvis",
+													  character,
+													  LLVector3(0,1,0),
+													  controller);
+		if (!motion->initialize())
+		{
+			llassert_always(FALSE);
+			return STATUS_FAILURE;
+		}
+		addMotion(motion);
 	}
-	addMotion(motion_butt_leftright);
-
-	controller_map_t controller_belly_updown;
-	controller_belly_updown["Damping"] = "Belly_Physics_Updown_Damping";
-	controller_belly_updown["MaxSpeed"] = "Belly_Physics_Updown_Max_Velocity";
-	controller_belly_updown["Spring"] = "Belly_Physics_Updown_Spring";
-	controller_belly_updown["Gain"] = "Belly_Physics_Updown_Gain";
-	LLPhysicsMotion *motion_belly_updown = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",
-								   "",
-								   "mChest",
-								   character,
-								   LLVector3(0,0,-1),
-								   controller_belly_updown);
-	if (!motion_belly_updown->initialize())
+
+	// Belly Bounce
 	{
-		llassert_always(FALSE);
-		return STATUS_FAILURE;
+		controller_map_t controller;
+		controller["Mass"] = "Belly_Physics_Mass";
+		controller["Smoothing"] = "Belly_Physics_Smoothing";
+		controller["Gravity"] = "Belly_Physics_Gravity";
+		controller["Damping"] = "Belly_Physics_UpDown_Damping";
+		controller["Drag"] = "Belly_Physics_UpDown_Drag";
+		controller["MaxSpeed"] = "Belly_Physics_UpDown_Max_Velocity";
+		controller["Spring"] = "Belly_Physics_UpDown_Spring";
+		controller["Gain"] = "Belly_Physics_UpDown_Gain";
+		LLPhysicsMotion *motion = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",
+													  "",
+													  "mPelvis",
+													  character,
+													  LLVector3(0,0,-1),
+													  controller);
+		if (!motion->initialize())
+		{
+			llassert_always(FALSE);
+			return STATUS_FAILURE;
+		}
+		addMotion(motion);
 	}
-	addMotion(motion_belly_updown);
 	
 	return STATUS_SUCCESS;
 }
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9570e28d26..e12f7c679e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2514,28 +2514,39 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Breast Physics Mass">Breast Mass</string>
 <string name="Breast Physics Smoothing">Breast Smoothing</string>
 <string name="Breast Physics Gravity">Breast Gravity</string>
-
 <string name="Breast Physics Side Spring">Breast Side Spring</string>
 <string name="Breast Physics Side Gain">Breast Side Gain</string>
 <string name="Breast Physics Side Damping">Breast Side Damping</string>
 <string name="Breast Physics Side Drag">Breast Side Drag</string>
 <string name="Breast Physics Side Max Speed">Breast Side Max Speed</string>
-
 <string name="Breast Physics UpDown Spring">Breast UpDown Spring</string>
 <string name="Breast Physics UpDown Gain">Breast UpDown Gain</string>
 <string name="Breast Physics UpDown Damping">Breast UpDown Damping</string>
 <string name="Breast Physics UpDown Drag">Breast UpDown Drag</string>
 <string name="Breast Physics UpDown Max Speed">Breast UpDown Max Speed</string>
 
-<string name="Belly Physics UpDown Spring">Belly Updown Spring</string>
-<string name="Belly Physics UpDown Gain">Belly Updown  Gain</string>
-<string name="Belly Physics UpDown Damping">Belly Updown Damping</string>
-<string name="Belly Physics UpDown Max Speed">Belly Updown Max Speed</string>
-
+<string name="Belly Physics Mass">Belly Mass</string>
+<string name="Belly Physics Smoothing">Belly Smoothing</string>
+<string name="Belly Physics Gravity">Belly Gravity</string>
+<string name="Belly Physics UpDown Spring">Belly UpDown Spring</string>
+<string name="Belly Physics UpDown Gain">Belly UpDown Gain</string>
+<string name="Belly Physics UpDown Damping">Belly UpDown Damping</string>
+<string name="Belly Physics UpDown Drag">Belly UpDown Drag</string>
+<string name="Belly Physics UpDown Max Speed">Belly UpDown Max Speed</string>
+
+<string name="Butt Physics Mass">Butt Mass</string>
+<string name="Butt Physics Smoothing">Butt Smoothing</string>
+<string name="Butt Physics Gravity">Butt Gravity</string>
 <string name="Butt Physics UpDown Spring">Butt UpDown Spring</string>
 <string name="Butt Physics UpDown Gain">Butt UpDown Gain</string>
 <string name="Butt Physics UpDown Damping">Butt UpDown Damping</string>
+<string name="Butt Physics UpDown Drag">Butt UpDown Drag</string>
 <string name="Butt Physics UpDown Max Speed">Butt UpDown Max Speed</string>
+<string name="Butt Physics LeftRight Spring">Butt LeftRight Spring</string>
+<string name="Butt Physics LeftRight Gain">Butt LeftRight Gain</string>
+<string name="Butt Physics LeftRight Damping">Butt LeftRight Damping</string>
+<string name="Butt Physics LeftRight Drag">Butt LeftRight Drag</string>
+<string name="Butt Physics LeftRight Max Speed">Butt LeftRight Max Speed</string>
 
 <string name="Bushy Eyebrows">Bushy Eyebrows</string>
 <string name="Bushy Hair">Bushy Hair</string>
-- 
cgit v1.3


From 1ceb29bdacb309ed374128feae879953c2e13820 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
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 +++++++++++----------
 indra/newview/llpaneleditwearable.cpp              |  18 +-
 indra/newview/llphysicsmotion.cpp                  |  14 +-
 .../skins/default/xui/en/panel_edit_physics.xml    |  46 +++-
 indra/newview/skins/default/xui/en/strings.xml     |  71 ++++---
 5 files changed, 213 insertions(+), 172 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

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">
 	 <param_driver />
     </param>
-    <param
+
+   <param
      id="1113"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Spring"
-     label="Breast Physics Side Spring"
+     name="Breast_Physics_UpDown_Max_Velocity"
+     label="Breast Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics_breasts_updown"
+     value_default="0"
+     value_min="0"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1114"
+     group="0"
+     sex="female"
+     name="Breast_Physics_UpDown_Spring"
+     label="Breast Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1114"
+     id="1115"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Gain"
-     label="Breast Physics Side Gain"
+     name="Breast_Physics_UpDown_Gain"
+     label="Breast Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1115"
+     id="1116"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Damping"
-     label="Breast Physics Side Damping"
+     name="Breast_Physics_UpDown_Damping"
+     label="Breast Physics UpDown Damping"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default=".05"
      value_min="0"
-     value_max=".1">
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
 	 <param_driver />
     </param>
    <param
-     id="1116"
+     id="1117"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Drag"
-     label="Breast Physics Side Drag"
+     name="Breast_Physics_UpDown_Drag"
+     label="Breast Physics UpDown Drag"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
+
    <param
-     id="1117"
+     id="1118"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Max_Velocity"
-     label="Breast Physics Side Max Speed"
+     name="Breast_Physics_InOut_Max_Velocity"
+     label="Breast Physics InOut Max Speed"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default="0"
      value_min="0"
      value_max="10">
 	 <param_driver />
     </param>
     <param
-     id="1118"
+     id="1119"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Spring"
-     label="Breast Physics UpDown Spring"
+     name="Breast_Physics_InOut_Spring"
+     label="Breast Physics InOut Spring"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1119"
+     id="1120"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Gain"
-     label="Breast Physics UpDown Gain"
+     name="Breast_Physics_InOut_Gain"
+     label="Breast Physics InOut Gain"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1120"
+     id="1121"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Damping"
-     label="Breast Physics UpDown Damping"
+     name="Breast_Physics_InOut_Damping"
+     label="Breast Physics InOut Damping"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default=".05"
      value_min="0"
-     value_max=".1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1121"
+     id="1122"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Drag"
-     label="Breast Physics UpDown Drag"
+     name="Breast_Physics_InOut_Drag"
+     label="Breast Physics InOut Drag"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
-   <param
-     id="1122"
-     group="0"
-     sex="female"
-     name="Breast_Physics_UpDown_Max_Velocity"
-     label="Breast Physics UpDown Max Speed"
-     wearable="physics"
-     edit_group="physics_breasts"
-     value_default="0"
-     value_min="0"
-     value_max="10">
-	 <param_driver />
-    </param>
 
     <param
      id="1130"
@@ -11946,7 +11948,7 @@ render_pass="bump">
      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">
 	 <param_driver />
     </param>
-    <param
+   <param
      id="1133"
      group="0"
+     name="Belly_Physics_UpDown_Max_Velocity"
+     label="Belly Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics_belly_updown"
+     value_default="0"
+     value_min="0"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1134"
+     group="0"
      name="Belly_Physics_UpDown_Spring"
      label="Belly Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1134"
+     id="1135"
      group="0"
      name="Belly_Physics_UpDown_Gain"
      label="Belly Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1135"
+     id="1136"
      group="0"
      name="Belly_Physics_UpDown_Damping"
      label="Belly Physics UpDown Damping"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1136"
+     id="1137"
      group="0"
      name="Belly_Physics_UpDown_Drag"
      label="Belly Physics UpDown Drag"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
-   <param
-     id="1137"
-     group="0"
-     name="Belly_Physics_UpDown_Max_Velocity"
-     label="Belly Physics UpDown Max Speed"
-     wearable="physics"
-     edit_group="physics_belly"
-     value_default="0"
-     value_min="0"
-     value_max="10">
-	 <param_driver />
-    </param>
 
     <param
      id="1140"
@@ -12043,7 +12045,7 @@ render_pass="bump">
      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">
 	 <param_driver />
     </param>
-    <param
+   <param
      id="1143"
      group="0"
+     name="Butt_Physics_UpDown_Max_Velocity"
+     label="Butt Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics_butt_updown"
+     value_default="0"
+     value_min="0"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1144"
+     group="0"
      name="Butt_Physics_UpDown_Spring"
      label="Butt Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1144"
+     id="1145"
      group="0"
      name="Butt_Physics_UpDown_Gain"
      label="Butt Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1145"
+     id="1146"
      group="0"
      name="Butt_Physics_UpDown_Damping"
      label="Butt Physics UpDown Damping"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1146"
+     id="1147"
      group="0"
      name="Butt_Physics_UpDown_Drag"
      label="Butt Physics UpDown Drag"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
+
    <param
-     id="1147"
+     id="1148"
      group="0"
-     name="Butt_Physics_UpDown_Max_Velocity"
-     label="Butt Physics UpDown Max Speed"
+     name="Butt_Physics_LeftRight_Max_Velocity"
+     label="Butt Physics LeftRight Max Speed"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default="0"
      value_min="0"
      value_max="10">
 	 <param_driver />
     </param>
     <param
-     id="1148"
+     id="1149"
      group="0"
      name="Butt_Physics_LeftRight_Spring"
      label="Butt Physics LeftRight Spring"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1149"
+     id="1150"
      group="0"
      name="Butt_Physics_LeftRight_Gain"
      label="Butt Physics LeftRight Gain"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1150"
+     id="1151"
      group="0"
      name="Butt_Physics_LeftRight_Damping"
      label="Butt Physics LeftRight Damping"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1151"
+     id="1152"
      group="0"
      name="Butt_Physics_LeftRight_Drag"
      label="Butt Physics LeftRight Drag"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
-   <param
-     id="1152"
-     group="0"
-     name="Butt_Physics_LeftRight_Max_Velocity"
-     label="Butt Physics LeftRight Max Speed"
-     wearable="physics"
-     edit_group="physics_butt"
-     value_default="0"
-     value_min="0"
-     value_max="10">
-	 <param_driver />
-    </param>
+
 
   </driver_parameters>
 
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index d04604a644..a7ee5a03b7 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -95,9 +95,11 @@ enum ESubpart {
 	SUBPART_SKIRT,
 	SUBPART_ALPHA,
 	SUBPART_TATTOO,
-	SUBPART_PHYSICS_BREASTS,
-	SUBPART_PHYSICS_BELLY,
-	SUBPART_PHYSICS_BUTT
+	SUBPART_PHYSICS_BREASTS_UPDOWN,
+	SUBPART_PHYSICS_BREASTS_INOUT,
+	SUBPART_PHYSICS_BELLY_UPDOWN,
+	SUBPART_PHYSICS_BUTT_UPDOWN,
+	SUBPART_PHYSICS_BUTT_LEFTRIGHT
  };
 
 using namespace LLVOAvatarDefines;
@@ -236,7 +238,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,3, SUBPART_PHYSICS_BREASTS, SUBPART_PHYSICS_BELLY, SUBPART_PHYSICS_BUTT));
+	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));
 }
 
 LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@@ -307,9 +309,11 @@ LLEditWearableDictionary::Subparts::Subparts()
 	addEntry(SUBPART_UNDERPANTS, new SubpartEntry(SUBPART_UNDERPANTS, "mPelvis", "underpants", "underpants_main_param_list", "underpants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
 	addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
 	addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
-	addEntry(SUBPART_PHYSICS_BREASTS, new SubpartEntry(SUBPART_PHYSICS_BREASTS, "mTorso", "physics_breasts", "physics_breasts_param_list", "physics_breasts_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
-	addEntry(SUBPART_PHYSICS_BELLY, new SubpartEntry(SUBPART_PHYSICS_BELLY, "mTorso", "physics_belly", "physics_belly_param_list", "physics_belly_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
-	addEntry(SUBPART_PHYSICS_BUTT, new SubpartEntry(SUBPART_PHYSICS_BUTT, "mTorso", "physics_butt", "physics_butt_param_list", "physics_butt_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+	addEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
+	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));
 }
 
 LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index fd83f4d482..e6fe6fe924 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -244,12 +244,12 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
 		controller["Mass"] = "Breast_Physics_Mass";
 		controller["Smoothing"] = "Breast_Physics_Smoothing";
 		controller["Gravity"] = "Breast_Physics_Gravity";
-		controller["Damping"] = "Breast_Physics_Side_Damping";
-		controller["Drag"] = "Breast_Physics_Side_Drag";
-		controller["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
-		controller["Spring"] = "Breast_Physics_Side_Spring";
-		controller["Gain"] = "Breast_Physics_Side_Gain";
-		LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_Side_Controller",
+		controller["Damping"] = "Breast_Physics_InOut_Damping";
+		controller["Drag"] = "Breast_Physics_InOut_Drag";
+		controller["MaxSpeed"] = "Breast_Physics_InOut_Max_Velocity";
+		controller["Spring"] = "Breast_Physics_InOut_Spring";
+		controller["Gain"] = "Breast_Physics_InOut_Gain";
+		LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_InOut_Controller",
 													  "",
 													  "mChest",
 													  character,
@@ -630,7 +630,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	if ((pixel_area > area_for_this_setting) || is_self)
 	{
 		const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);
-		const F32 min_delta = (1.01f-lod_factor)*0.75f; // 75% is just an experimental magic number.
+		const F32 min_delta = (1.01f-lod_factor)*0.5f; // 75% is just an experimental magic number.
 		if (llabs(position_diff_local) > min_delta)
 		{
 			update_visuals = TRUE;
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 6e89a8cb1a..94cb68abbc 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
@@ -22,9 +22,8 @@
          top_pad="10"
          width="313">
      <accordion
-        fit_parent="true"
         follows="all"
-        height ="300"
+        height ="388"
         layout="topleft"
         left="0"
 		single_expansion="true"
@@ -35,13 +34,27 @@
 			layout="topleft"
             fit_panel="false"
 			min_height="50"
-			name="physics_breasts_tab"
-			title="Breasts">
+			name="physics_breasts_updown_tab"
+			title="Breasts Bounce">
 			<scrolling_panel_list
 				follows="all"
                 layout="topleft"
 				left="0"
-				name="physics_breasts_param_list"
+				name="physics_breasts_updown_param_list"
+				top="0"
+				width="303" />
+		</accordion_tab>
+		<accordion_tab
+			layout="topleft"
+            fit_panel="false"
+			min_height="50"
+			name="physics_breasts_inout_tab"
+			title="Breasts Cleavage">
+			<scrolling_panel_list
+				follows="all"
+                layout="topleft"
+				left="0"
+				name="physics_breasts_inout_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
@@ -50,12 +63,12 @@
             fit_panel="false"
 			min_height="50"
 			name="physics_belly_tab"
-			title="Belly">
+			title="Belly Bounce">
 			<scrolling_panel_list
 				follows="all"
                 layout="topleft"
 				left="0"
-				name="physics_belly_param_list"
+				name="physics_belly_updown_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
@@ -65,12 +78,27 @@
             fit_panel="false"
 			min_height="50"
 			name="physics_butt_tab"
-			title="Butt">
+			title="Butt Bounce">
+			<scrolling_panel_list
+				follows="all"
+                layout="topleft"
+				left="0"
+				name="physics_butt_updown_param_list"
+				top="0"
+				width="303" />
+		</accordion_tab>
+
+		<accordion_tab
+			layout="topleft"
+            fit_panel="false"
+			min_height="50"
+			name="physics_butt_leftright_tab"
+			title="Butt Sway">
 			<scrolling_panel_list
 				follows="all"
                 layout="topleft"
 				left="0"
-				name="physics_butt_param_list"
+				name="physics_butt_leftright_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e12f7c679e..88b5eb7e23 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2501,7 +2501,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 
 <string name="Bow Legged">Bow Legged</string>
 <string name="Breast Physics UpDown Controller">Breast Buoyancy</string>
-<string name="Breast Physics Side Controller">Breast Cleavage</string>
+<string name="Breast Physics InOut Controller">Breast Cleavage</string>
 <string name="Breast Size">Breast Size</string>
 <string name="Bridge Width">Bridge Width</string>
 <string name="Broad">Broad</string>
@@ -2511,42 +2511,47 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Bulbous">Bulbous</string>
 <string name="Bulbous Nose">Bulbous Nose</string>
 
-<string name="Breast Physics Mass">Breast Mass</string>
-<string name="Breast Physics Smoothing">Breast Smoothing</string>
-<string name="Breast Physics Gravity">Breast Gravity</string>
-<string name="Breast Physics Side Spring">Breast Side Spring</string>
-<string name="Breast Physics Side Gain">Breast Side Gain</string>
-<string name="Breast Physics Side Damping">Breast Side Damping</string>
-<string name="Breast Physics Side Drag">Breast Side Drag</string>
-<string name="Breast Physics Side Max Speed">Breast Side Max Speed</string>
-<string name="Breast Physics UpDown Spring">Breast UpDown Spring</string>
-<string name="Breast Physics UpDown Gain">Breast UpDown Gain</string>
-<string name="Breast Physics UpDown Damping">Breast UpDown Damping</string>
-<string name="Breast Physics UpDown Drag">Breast UpDown Drag</string>
-<string name="Breast Physics UpDown Max Speed">Breast UpDown Max Speed</string>
-
-<string name="Belly Physics Mass">Belly Mass</string>
-<string name="Belly Physics Smoothing">Belly Smoothing</string>
-<string name="Belly Physics Gravity">Belly Gravity</string>
-<string name="Belly Physics UpDown Spring">Belly UpDown Spring</string>
-<string name="Belly Physics UpDown Gain">Belly UpDown Gain</string>
-<string name="Belly Physics UpDown Damping">Belly UpDown Damping</string>
-<string name="Belly Physics UpDown Drag">Belly UpDown Drag</string>
-<string name="Belly Physics UpDown Max Speed">Belly UpDown Max Speed</string>
+<string name="Breast Physics Mass">Mass</string>
+<string name="Breast Physics Smoothing">Smoothing</string>
+<string name="Breast Physics Gravity">Gravity</string>
+
+<string name="Breast Physics InOut Max Speed">Max Effect</string>
+<string name="Breast Physics InOut Spring">Spring</string>
+<string name="Breast Physics InOut Gain">Gain</string>
+<string name="Breast Physics InOut Damping">Damping</string>
+<string name="Breast Physics InOut Drag">Drag</string>
+
+<string name="Breast Physics UpDown Max Speed">Max Effect</string>
+<string name="Breast Physics UpDown Spring">Spring</string>
+<string name="Breast Physics UpDown Gain">Gain</string>
+<string name="Breast Physics UpDown Damping">Damping</string>
+<string name="Breast Physics UpDown Drag">Drag</string>
+
+<string name="Belly Physics Mass">Mass</string>
+<string name="Belly Physics Smoothing">Smoothing</string>
+<string name="Belly Physics Gravity">Gravity</string>
+
+<string name="Belly Physics UpDown Max Speed">Max Effect</string>
+<string name="Belly Physics UpDown Spring">Spring</string>
+<string name="Belly Physics UpDown Gain">Gain</string>
+<string name="Belly Physics UpDown Damping">Damping</string>
+<string name="Belly Physics UpDown Drag">Drag</string>
 
 <string name="Butt Physics Mass">Butt Mass</string>
 <string name="Butt Physics Smoothing">Butt Smoothing</string>
 <string name="Butt Physics Gravity">Butt Gravity</string>
-<string name="Butt Physics UpDown Spring">Butt UpDown Spring</string>
-<string name="Butt Physics UpDown Gain">Butt UpDown Gain</string>
-<string name="Butt Physics UpDown Damping">Butt UpDown Damping</string>
-<string name="Butt Physics UpDown Drag">Butt UpDown Drag</string>
-<string name="Butt Physics UpDown Max Speed">Butt UpDown Max Speed</string>
-<string name="Butt Physics LeftRight Spring">Butt LeftRight Spring</string>
-<string name="Butt Physics LeftRight Gain">Butt LeftRight Gain</string>
-<string name="Butt Physics LeftRight Damping">Butt LeftRight Damping</string>
-<string name="Butt Physics LeftRight Drag">Butt LeftRight Drag</string>
-<string name="Butt Physics LeftRight Max Speed">Butt LeftRight Max Speed</string>
+
+<string name="Butt Physics UpDown Max Speed">Max Effect</string>
+<string name="Butt Physics UpDown Spring">Spring</string>
+<string name="Butt Physics UpDown Gain">Gain</string>
+<string name="Butt Physics UpDown Damping">Damping</string>
+<string name="Butt Physics UpDown Drag">Drag</string>
+
+<string name="Butt Physics LeftRight Max Speed">Max Effect</string>
+<string name="Butt Physics LeftRight Spring">Spring</string>
+<string name="Butt Physics LeftRight Gain">Gain</string>
+<string name="Butt Physics LeftRight Damping">Damping</string>
+<string name="Butt Physics LeftRight Drag">Drag</string>
 
 <string name="Bushy Eyebrows">Bushy Eyebrows</string>
 <string name="Bushy Hair">Bushy Hair</string>
-- 
cgit v1.3


From 107ca5d7c8f7a511e6606a91930b893edbfe884e Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 31 Mar 2011 15:41:01 -0400
Subject: Simple fix for out-of-bounds parameter issues.

---
 indra/newview/llphysicsmotion.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index e6fe6fe924..157d13e1a4 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -482,12 +482,13 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	F32 behavior_maxspeed = getParamValue("MaxSpeed");
 	if (physics_test)
 		behavior_maxspeed = 100.0f;
-	/*
+
 	if (behavior_maxspeed == 0)
 		return FALSE;
-	*/
 
-	F32 position_current_local = mPosition_local; // Normalized [0,1] range
+	F32 position_current_local = llclamp(mPosition_local,
+					     0.0f,
+					     1.0f); // Normalized [0,1] range
 
 	// Normalize the param position to be from [0,1].
 	// We have to use normalized values because there may be more than one driven param,
-- 
cgit v1.3


From ba0c369aa20cdbfd7940a2435dd3c6630f0d54ae Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 31 Mar 2011 15:56:33 -0400
Subject: Tweaking of avatar physics detail slider.

---
 indra/newview/llphysicsmotion.cpp                              |  2 +-
 .../skins/default/xui/en/panel_preferences_graphics1.xml       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llphysicsmotion.cpp')

diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 157d13e1a4..73de1cef3f 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -631,7 +631,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	if ((pixel_area > area_for_this_setting) || is_self)
 	{
 		const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);
-		const F32 min_delta = (1.01f-lod_factor)*0.5f; // 75% is just an experimental magic number.
+		const F32 min_delta = (1.01f-lod_factor)*0.4f;
 		if (llabs(position_diff_local) > min_delta)
 		{
 			update_visuals = TRUE;
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 6904cfa50e..d74197d965 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -331,16 +331,16 @@
         control_name="RenderAvatarPhysicsLODFactor"
         follows="left|top"
         height="16"
-        increment="0.125"
-        initial_value="160"
+        initial_value="100"
+	increment=".05"
         label="  Avatar Physics:"
         label_width="85"
         layout="topleft"
-        left_delta="-6"
+        left_delta="-16"
         name="AvatarPhysicsDetail"
         show_text="false"
         top_pad="12"
-        width="154">
+        width="160">
            <slider.commit_callback
             function="Pref.UpdateSliderText"
             parameter="AvatarPhysicsDetailText" />
@@ -351,7 +351,7 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left_delta="160"
+        left_delta="165"
         name="AvatarPhysicsDetailText"
         top_pad="-16"
         width="128">
-- 
cgit v1.3