From d35356348b7072210aa829c945a262fac07375ad Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 7 Nov 2013 16:24:46 -0800 Subject: [PATCH] Demagicked a couple of numbers. --- interface/src/avatar/Avatar.cpp | 3 ++- interface/src/avatar/SkeletonModel.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 9f1eb263e7..929b5b600b 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -665,7 +665,8 @@ void Avatar::updateArmIKAndConstraints(float deltaTime, AvatarJointID fingerTipJ float distance = glm::length(armVector); // don't let right hand get dragged beyond maximum arm length... - float armLength = _maxArmLength * 0.75f; + const float ARM_RETRACTION = 0.75f; + float armLength = _maxArmLength * ARM_RETRACTION; if (distance > armLength) { // reset right hand to be constrained to maximum arm length fingerJoint.position = shoulderJoint.position; diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index c6ea16f9ad..7da4cf14b8 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -140,7 +140,7 @@ void SkeletonModel::applyPalmData(int jointIndex, const QVector& fingerJoin setJointPosition(jointIndex, palm.getPosition()); float sign = (jointIndex == geometry.rightHandJointIndex) ? 1.0f : -1.0f; glm::quat palmRotation = rotationBetween(_rotation * IDENTITY_UP, -palm.getNormal()) * _rotation * - glm::angleAxis(90.0f, 0.0f, sign, 0.0f); + glm::angleAxis(90.0f, 0.0f, sign, 0.0f); // ninety degree rotation to face fingers forward from bind pose setJointRotation(jointIndex, palmRotation, true); // no point in continuing if there are no fingers