Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 01:46:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

direction on compare in positional theta function

Browse source
This commit is contained in:
amantley 2019-02-21 09:00:23 -08:00
parent b6bc467f4b
commit 33fd64c68c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/animation/src/Rig.cpp
View file

@ -1721,10 +1721,10 @@ static float getHandPositionTheta(glm::vec3 armToHand, float defaultArmLength, b
const float LOWER_ANATOMICAL_ANGLE = 175.0f;
const float UPPER_ANATOMICAL_ANGLE = 50.0f;
if (handPositionTheta < LOWER_ANATOMICAL_ANGLE) {
if (handPositionTheta > LOWER_ANATOMICAL_ANGLE) {
handPositionTheta = LOWER_ANATOMICAL_ANGLE;
}
if (handPositionTheta > UPPER_ANATOMICAL_ANGLE) {
if (handPositionTheta < UPPER_ANATOMICAL_ANGLE) {
handPositionTheta = UPPER_ANATOMICAL_ANGLE;
}
@ -1876,7 +1876,9 @@ bool Rig::calculateElbowPoleVectorOptimized(int handIndex, int elbowIndex, int s
// get the pole vector theta based on the hand position relative to the shoulder.
float positionalTheta = getHandPositionTheta(armToHand, defaultArmLength, left);
if (left) {
qCDebug(animation) << "positional theta left "<< positionalTheta;
}
// now we calculate the contribution of the hand rotation relative to the arm
glm::quat relativeHandRotation = (elbowPose.inverse() * handPose).rot();