SL-315 - context strings, comments, debugging. joint_test temporarily disabled.

8 files changed, 36 insertions, 13 deletions

diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
index 2573417b26..a17a5b0aa6 100755
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -91,12 +91,12 @@ target_link_libraries(
 
 
 # Add tests
-if (LL_TESTS)
-    include(LLAddBuildTest)
-    # UNIT TESTS
-    SET(llcharacter_TEST_SOURCE_FILES
-      lljoint.cpp
-      )
-    LL_ADD_PROJECT_UNIT_TESTS(llcharacter "${llcharacter_TEST_SOURCE_FILES}")
-endif (LL_TESTS)
+#if (LL_TESTS)
+#    include(LLAddBuildTest)
+#    # UNIT TESTS
+#    SET(llcharacter_TEST_SOURCE_FILES
+#      lljoint.cpp
+#      )
+#    LL_ADD_PROJECT_UNIT_TESTS(llcharacter "${llcharacter_TEST_SOURCE_FILES}")
+#endif (LL_TESTS)
 
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
index f4a37a139a..ddf89f30f2 100755
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -117,6 +117,7 @@ LLMotion::LLMotionInitStatus LLEditingMotion::onInitialize(LLCharacter *characte
 	addJointState( mWristState );
 
 	// propagate joint positions to kinematic chain
+    // SL-315
 	mParentJoint.setPosition(	mParentState->getJoint()->getWorldPosition() );
 	mShoulderJoint.setPosition(	mShoulderState->getJoint()->getPosition() );
 	mElbowJoint.setPosition(	mElbowState->getJoint()->getPosition() );
@@ -143,6 +144,7 @@ LLMotion::LLMotionInitStatus LLEditingMotion::onInitialize(LLCharacter *characte
 BOOL LLEditingMotion::onActivate()
 {
 	// propagate joint positions to kinematic chain
+    // SL-315
 	mParentJoint.setPosition(	mParentState->getJoint()->getWorldPosition() );
 	mShoulderJoint.setPosition(	mShoulderState->getJoint()->getPosition() );
 	mElbowJoint.setPosition(	mElbowState->getJoint()->getPosition() );
@@ -181,6 +183,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 	focus_pt += mCharacter->getCharacterPosition();
 
 	// propagate joint positions to kinematic chain
+    // SL-315
 	mParentJoint.setPosition(	mParentState->getJoint()->getWorldPosition() );
 	mShoulderJoint.setPosition(	mShoulderState->getJoint()->getPosition() );
 	mElbowJoint.setPosition(	mElbowState->getJoint()->getPosition() );
@@ -217,7 +220,8 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 			" and focus point " << focus_pt << LL_ENDL;
 		target.setVec(1.f, 1.f, 1.f);
 	}
-	
+
+    // SL-315
 	mTarget.setPosition( target + mParentJoint.getPosition());
 
 //	LL_INFOS() << "Point At: " << mTarget.getPosition() << LL_ENDL;
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index a314692edc..a43e13aaa2 100755
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -327,12 +327,15 @@ bool do_debug_joint(const std::string& name)
 //--------------------------------------------------------------------
 void LLJoint::setPosition( const LLVector3& pos )
 {
+    LLScopedContextString str("setPosition");
 	if (pos != getPosition())
 	{
 		if (do_debug_joint(getName()))
 		{
             LLCallStack cs;
+			LLContextStatus con_status;
 			LL_DEBUGS("Avatar") << " joint " << getName() << " set pos " << pos << LL_ENDL;
+			LL_DEBUGS("Avatar") << "CONTEXT:\n" << "====================\n" << con_status << "====================" << LL_ENDL;
 			LL_DEBUGS("Avatar") << "STACK:\n" << "====================\n" << cs << "====================" << LL_ENDL;
 		}
 	}
@@ -424,12 +427,18 @@ void LLJoint::updatePos(const std::string& av_info)
 	LLUUID mesh_id;
 	if (m_attachmentOverrides.findActiveOverride(mesh_id,found_pos))
 	{
-		LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updatePos, winner of " << m_attachmentOverrides.count() << " is mesh " << mesh_id << " pos " << found_pos << LL_ENDL;
+        if (do_debug_joint(getName()))
+        {
+            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updatePos, winner of " << m_attachmentOverrides.count() << " is mesh " << mesh_id << " pos " << found_pos << LL_ENDL;
+        }
 		pos = found_pos;
 	}
 	else
 	{
-		LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updatePos, winner is posBeforeOverrides " << m_posBeforeOverrides << LL_ENDL;
+        if (do_debug_joint(getName()))
+        {
+            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " updatePos, winner is posBeforeOverrides " << m_posBeforeOverrides << LL_ENDL;
+        }
 		pos = m_posBeforeOverrides;
 	}
 	setPosition(pos);
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index ab21f73122..8a5b313634 100755
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -186,7 +186,8 @@ public:
 	// get/set local position
 	const LLVector3& getPosition();
 	void setPosition( const LLVector3& pos );
-	
+
+    // BENTO - history? Not implemented or used.
 	void setDefaultPosition( const LLVector3& pos );
 	
 	// get/set world position
diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp
index fdeddf55e1..02c1d3cdbd 100755
--- a/indra/llcharacter/llkeyframestandmotion.cpp
+++ b/indra/llcharacter/llkeyframestandmotion.cpp
@@ -201,10 +201,12 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	//-------------------------------------------------------------------------
 	// propagate joint positions to internal versions
 	//-------------------------------------------------------------------------
+    // SL-315
 	mPelvisJoint.setPosition(
 			root_world_pos +
 			mPelvisState->getPosition() );
 
+    // SL-315
 	mHipLeftJoint.setPosition( mHipLeftState->getJoint()->getPosition() );
 	mKneeLeftJoint.setPosition( mKneeLeftState->getJoint()->getPosition() );
 	mAnkleLeftJoint.setPosition( mAnkleLeftState->getJoint()->getPosition() );
@@ -213,6 +215,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	mKneeLeftJoint.setScale( mKneeLeftState->getJoint()->getScale() );
 	mAnkleLeftJoint.setScale( mAnkleLeftState->getJoint()->getScale() );
 
+    // SL-315
 	mHipRightJoint.setPosition( mHipRightState->getJoint()->getPosition() );
 	mKneeRightJoint.setPosition( mKneeRightState->getJoint()->getPosition() );
 	mAnkleRightJoint.setPosition( mAnkleRightState->getJoint()->getPosition() );
@@ -265,6 +268,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 		mCharacter->getGround( mAnkleLeftJoint.getWorldPosition(), mPositionLeft, mNormalLeft);
 		mCharacter->getGround( mAnkleRightJoint.getWorldPosition(), mPositionRight, mNormalRight);
 
+        // SL-315
 		mTargetLeft.setPosition( mPositionLeft );
 		mTargetRight.setPosition( mPositionRight );
 	}
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index 2d646b4ed2..82def47ddb 100755
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -114,7 +114,7 @@ void LLMotion::addJointState(const LLPointer<LLJointState>& jointState)
     S32 joint_num = jointState->getJoint()->getJointNum();
     if ((joint_num >= (S32)LL_CHARACTER_MAX_JOINTS) || (joint_num < 0))
     {
-        LL_WARNS() << "joint_num " << joint_num << " is outside of legal range [0-" << LL_CHARACTER_MAX_JOINTS << ")" << LL_ENDL;
+        LL_WARNS() << "joint_num " << joint_num << " is outside of legal range [0-" << LL_CHARACTER_MAX_JOINTS << ") for joint " << jointState->getJoint()->getName() << LL_ENDL;
     }
 	mJointSignature[0][joint_num] = (usage & LLJointState::POS) ? (0xff >> (7 - priority)) : 0;
 	mJointSignature[1][joint_num] = (usage & LLJointState::ROT) ? (0xff >> (7 - priority)) : 0;
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index b1a7ebb159..fc95fafd61 100755
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -386,6 +386,7 @@ void LLJointStateBlender::blendJointStates(BOOL apply_now)
 	}
 
 	// apply transforms
+    // SL-315
 	target_joint->setPosition(blended_pos + added_pos);
 	target_joint->setScale(blended_scale + added_scale);
 	target_joint->setRotation(added_rot * blended_rot);
@@ -417,6 +418,7 @@ void LLJointStateBlender::interpolate(F32 u)
 		return;
 	}
 
+    // SL-315
 	target_joint->setPosition(lerp(target_joint->getPosition(), mJointCache.getPosition(), u));
 	target_joint->setScale(lerp(target_joint->getScale(), mJointCache.getScale(), u));
 	target_joint->setRotation(nlerp(u, target_joint->getRotation(), mJointCache.getRotation()));
@@ -444,6 +446,7 @@ void LLJointStateBlender::resetCachedJoint()
 		return;
 	}
 	LLJoint* source_joint = mJointStates[0]->getJoint();
+    // SL-315
 	mJointCache.setPosition(source_joint->getPosition());
 	mJointCache.setScale(source_joint->getScale());
 	mJointCache.setRotation(source_joint->getRotation());
diff --git a/indra/llcharacter/tests/lljoint_test.cpp b/indra/llcharacter/tests/lljoint_test.cpp
index da151808f2..617f31b0e4 100755
--- a/indra/llcharacter/tests/lljoint_test.cpp
+++ b/indra/llcharacter/tests/lljoint_test.cpp
@@ -88,6 +88,7 @@ namespace tut
 	{
 		LLJoint lljoint;
 		LLVector3 vec3(2.3f,30.f,10.f);
+		// SL-315
 		lljoint.setPosition(vec3);
 		LLVector3 pos = lljoint.getPosition();
 		ensure("setPosition()/getPosition() failed ", (vec3 == pos));
@@ -98,6 +99,7 @@ namespace tut
 	{
 		LLJoint lljoint;
 		LLVector3 vec3(2.3f,30.f,10.f);
+		// SL-315
 		lljoint.setWorldPosition(vec3);
 		LLVector3 pos = lljoint.getWorldPosition();
 		ensure("1:setWorldPosition()/getWorldPosition() failed ", (vec3 == pos));