diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
| commit | 3c16beedc0d41834f22527aa916bd6c609786587 (patch) | |
| tree | 7a7d2c3d4d5835adaef85179bd1cdcd8e2b954f5 /indra/llcharacter/lleditingmotion.cpp | |
| parent | 2337134497fa5103d5baf9a0e790b2f294cd9750 (diff) | |
| parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) | |
Automated merge with lindenlab/viewer64 (itself, merged from viewer-release after bento/5.0 release)
Diffstat (limited to 'indra/llcharacter/lleditingmotion.cpp')
| -rw-r--r-- | indra/llcharacter/lleditingmotion.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp index f4a37a139a..ddf89f30f2 100644 --- 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; |