From 2fea1d5d33ec1b41a3cfa4307a1bfa58d8014f88 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 19 Aug 2010 12:25:15 -0500 Subject: Integrate SIMD API from oreh/server-trunk-oreh --- indra/llcharacter/llkeyframemotion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index 7bc9e97eb1..bce272082e 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -1151,7 +1151,7 @@ void LLKeyframeMotion::applyConstraint(JointConstraint* constraint, F32 time, U8 constraint->mPositions[joint_num] = new_pos; } constraint->mFixupDistanceRMS *= 1.f / (constraint->mTotalLength * (F32)(shared_data->mChainLength - 1)); - constraint->mFixupDistanceRMS = fsqrtf(constraint->mFixupDistanceRMS); + constraint->mFixupDistanceRMS = (F32) sqrt(constraint->mFixupDistanceRMS); //reset old joint rots for (joint_num = 0; joint_num <= shared_data->mChainLength; joint_num++) -- cgit v1.2.3 From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 21 Sep 2010 13:26:52 -0400 Subject: Fix for build failures - disabling tcmalloc for now --- indra/llcharacter/CMakeLists.txt | 0 indra/llcharacter/llanimationstates.cpp | 0 indra/llcharacter/llanimationstates.h | 0 indra/llcharacter/llbvhconsts.h | 0 indra/llcharacter/llbvhloader.cpp | 0 indra/llcharacter/llbvhloader.h | 0 indra/llcharacter/llcharacter.cpp | 0 indra/llcharacter/llcharacter.h | 0 indra/llcharacter/lleditingmotion.cpp | 0 indra/llcharacter/lleditingmotion.h | 0 indra/llcharacter/llgesture.cpp | 0 indra/llcharacter/llgesture.h | 0 indra/llcharacter/llhandmotion.cpp | 0 indra/llcharacter/llhandmotion.h | 0 indra/llcharacter/llheadrotmotion.cpp | 0 indra/llcharacter/llheadrotmotion.h | 0 indra/llcharacter/lljoint.cpp | 0 indra/llcharacter/lljoint.h | 0 indra/llcharacter/lljointsolverrp3.cpp | 0 indra/llcharacter/lljointsolverrp3.h | 0 indra/llcharacter/lljointstate.h | 0 indra/llcharacter/llkeyframefallmotion.cpp | 0 indra/llcharacter/llkeyframefallmotion.h | 0 indra/llcharacter/llkeyframemotion.cpp | 0 indra/llcharacter/llkeyframemotion.h | 0 indra/llcharacter/llkeyframemotionparam.cpp | 0 indra/llcharacter/llkeyframemotionparam.h | 0 indra/llcharacter/llkeyframestandmotion.cpp | 0 indra/llcharacter/llkeyframestandmotion.h | 0 indra/llcharacter/llkeyframewalkmotion.cpp | 0 indra/llcharacter/llkeyframewalkmotion.h | 0 indra/llcharacter/llmotion.cpp | 0 indra/llcharacter/llmotion.h | 0 indra/llcharacter/llmotioncontroller.cpp | 0 indra/llcharacter/llmotioncontroller.h | 0 indra/llcharacter/llmultigesture.cpp | 0 indra/llcharacter/llmultigesture.h | 0 indra/llcharacter/llpose.cpp | 0 indra/llcharacter/llpose.h | 0 indra/llcharacter/llstatemachine.cpp | 0 indra/llcharacter/llstatemachine.h | 0 indra/llcharacter/lltargetingmotion.cpp | 0 indra/llcharacter/lltargetingmotion.h | 0 indra/llcharacter/llvisualparam.cpp | 0 indra/llcharacter/llvisualparam.h | 0 indra/llcharacter/tests/lljoint_test.cpp | 0 46 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/llcharacter/CMakeLists.txt mode change 100644 => 100755 indra/llcharacter/llanimationstates.cpp mode change 100644 => 100755 indra/llcharacter/llanimationstates.h mode change 100644 => 100755 indra/llcharacter/llbvhconsts.h mode change 100644 => 100755 indra/llcharacter/llbvhloader.cpp mode change 100644 => 100755 indra/llcharacter/llbvhloader.h mode change 100644 => 100755 indra/llcharacter/llcharacter.cpp mode change 100644 => 100755 indra/llcharacter/llcharacter.h mode change 100644 => 100755 indra/llcharacter/lleditingmotion.cpp mode change 100644 => 100755 indra/llcharacter/lleditingmotion.h mode change 100644 => 100755 indra/llcharacter/llgesture.cpp mode change 100644 => 100755 indra/llcharacter/llgesture.h mode change 100644 => 100755 indra/llcharacter/llhandmotion.cpp mode change 100644 => 100755 indra/llcharacter/llhandmotion.h mode change 100644 => 100755 indra/llcharacter/llheadrotmotion.cpp mode change 100644 => 100755 indra/llcharacter/llheadrotmotion.h mode change 100644 => 100755 indra/llcharacter/lljoint.cpp mode change 100644 => 100755 indra/llcharacter/lljoint.h mode change 100644 => 100755 indra/llcharacter/lljointsolverrp3.cpp mode change 100644 => 100755 indra/llcharacter/lljointsolverrp3.h mode change 100644 => 100755 indra/llcharacter/lljointstate.h mode change 100644 => 100755 indra/llcharacter/llkeyframefallmotion.cpp mode change 100644 => 100755 indra/llcharacter/llkeyframefallmotion.h mode change 100644 => 100755 indra/llcharacter/llkeyframemotion.cpp mode change 100644 => 100755 indra/llcharacter/llkeyframemotion.h mode change 100644 => 100755 indra/llcharacter/llkeyframemotionparam.cpp mode change 100644 => 100755 indra/llcharacter/llkeyframemotionparam.h mode change 100644 => 100755 indra/llcharacter/llkeyframestandmotion.cpp mode change 100644 => 100755 indra/llcharacter/llkeyframestandmotion.h mode change 100644 => 100755 indra/llcharacter/llkeyframewalkmotion.cpp mode change 100644 => 100755 indra/llcharacter/llkeyframewalkmotion.h mode change 100644 => 100755 indra/llcharacter/llmotion.cpp mode change 100644 => 100755 indra/llcharacter/llmotion.h mode change 100644 => 100755 indra/llcharacter/llmotioncontroller.cpp mode change 100644 => 100755 indra/llcharacter/llmotioncontroller.h mode change 100644 => 100755 indra/llcharacter/llmultigesture.cpp mode change 100644 => 100755 indra/llcharacter/llmultigesture.h mode change 100644 => 100755 indra/llcharacter/llpose.cpp mode change 100644 => 100755 indra/llcharacter/llpose.h mode change 100644 => 100755 indra/llcharacter/llstatemachine.cpp mode change 100644 => 100755 indra/llcharacter/llstatemachine.h mode change 100644 => 100755 indra/llcharacter/lltargetingmotion.cpp mode change 100644 => 100755 indra/llcharacter/lltargetingmotion.h mode change 100644 => 100755 indra/llcharacter/llvisualparam.cpp mode change 100644 => 100755 indra/llcharacter/llvisualparam.h mode change 100644 => 100755 indra/llcharacter/tests/lljoint_test.cpp (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llanimationstates.h b/indra/llcharacter/llanimationstates.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llbvhconsts.h b/indra/llcharacter/llbvhconsts.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lleditingmotion.h b/indra/llcharacter/lleditingmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llgesture.cpp b/indra/llcharacter/llgesture.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llgesture.h b/indra/llcharacter/llgesture.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llhandmotion.cpp b/indra/llcharacter/llhandmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llhandmotion.h b/indra/llcharacter/llhandmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llheadrotmotion.cpp b/indra/llcharacter/llheadrotmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llheadrotmotion.h b/indra/llcharacter/llheadrotmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lljointsolverrp3.cpp b/indra/llcharacter/lljointsolverrp3.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lljointsolverrp3.h b/indra/llcharacter/lljointsolverrp3.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lljointstate.h b/indra/llcharacter/lljointstate.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframefallmotion.h b/indra/llcharacter/llkeyframefallmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframemotionparam.h b/indra/llcharacter/llkeyframemotionparam.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframestandmotion.h b/indra/llcharacter/llkeyframestandmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llkeyframewalkmotion.h b/indra/llcharacter/llkeyframewalkmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llstatemachine.h b/indra/llcharacter/llstatemachine.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lltargetingmotion.cpp b/indra/llcharacter/lltargetingmotion.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/lltargetingmotion.h b/indra/llcharacter/lltargetingmotion.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp old mode 100644 new mode 100755 diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h old mode 100644 new mode 100755 diff --git a/indra/llcharacter/tests/lljoint_test.cpp b/indra/llcharacter/tests/lljoint_test.cpp old mode 100644 new mode 100755 -- cgit v1.2.3 From c7f5a9419b4b93efdc04ebfbb8e05a2ef0e09142 Mon Sep 17 00:00:00 2001 From: prep linden Date: Fri, 24 Sep 2010 13:11:53 -0400 Subject: Added support for joint offsets --- indra/llcharacter/lljoint.cpp | 15 +++++++++++++++ indra/llcharacter/lljoint.h | 4 ++++ 2 files changed, 19 insertions(+) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 5c49214051..2449b01e15 100755 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -239,6 +239,21 @@ void LLJoint::setPosition( const LLVector3& pos ) } } +//-------------------------------------------------------------------- +// storeCurrentXform() +//-------------------------------------------------------------------- +void LLJoint::storeCurrentXform( const LLVector3& pos ) +{ + mOldXform = mXform; + setPosition( pos ); +} +//-------------------------------------------------------------------- +// restoreOldXform() +//-------------------------------------------------------------------- +void LLJoint::restoreOldXform( void ) +{ + mXform = mOldXform; +} //-------------------------------------------------------------------- // getWorldPosition() diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 0473d1599a..cf644e899f 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -86,6 +86,7 @@ protected: // explicit transformation members LLXformMatrix mXform; + LLXformMatrix mOldXform; public: U32 mDirtyFlags; @@ -178,6 +179,9 @@ public: S32 getJointNum() const { return mJointNum; } void setJointNum(S32 joint_num) { mJointNum = joint_num; } + + void restoreOldXform( void ); + void storeCurrentXform( const LLVector3& pos ); }; #endif // LL_LLJOINT_H -- cgit v1.2.3