Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 13:35:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup whitespace

Browse source
This commit is contained in:
Andrew Meadows 2015-09-16 12:18:59 -07:00
parent 9a86fc2e62
commit d4ea661aca
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/animation/src/AnimInverseKinematics.cpp
View file

@ -211,8 +211,8 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
// compute joint's new parent-relative rotation // compute joint's new parent-relative rotation
// Q' = dQ * Q and Q = Qp * q --> q' = Qp^ * dQ * Q // Q' = dQ * Q and Q = Qp * q --> q' = Qp^ * dQ * Q
glm::quat newRot = glm::normalize(glm::inverse( glm::quat newRot = glm::normalize(glm::inverse(
absolutePoses[parentIndex].rot) * absolutePoses[parentIndex].rot) *
deltaRotation * deltaRotation *
absolutePoses[pivotIndex].rot); absolutePoses[pivotIndex].rot);
RotationConstraint* constraint = getConstraint(pivotIndex); RotationConstraint* constraint = getConstraint(pivotIndex);
if (constraint) { if (constraint) {
@ -221,8 +221,8 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
// the constraint will modify the movement of the tip so we have to compute the modified // the constraint will modify the movement of the tip so we have to compute the modified
// model-frame deltaRotation // model-frame deltaRotation
// Q' = Qp^ * dQ * Q --> dQ = Qp * Q' * Q^ // Q' = Qp^ * dQ * Q --> dQ = Qp * Q' * Q^
deltaRotation = absolutePoses[parentIndex].rot * deltaRotation = absolutePoses[parentIndex].rot *
newRot * newRot *
glm::inverse(absolutePoses[pivotIndex].rot); glm::inverse(absolutePoses[pivotIndex].rot);
} }
} }
@ -319,7 +319,7 @@ void AnimInverseKinematics::initConstraints() {
// We create constraints for the joints shown here // We create constraints for the joints shown here
// (and their Left counterparts if applicable). // (and their Left counterparts if applicable).
// //
// //
// O RightHand // O RightHand
// Head / // Head /
// O / // O /
@ -473,7 +473,7 @@ void AnimInverseKinematics::initConstraints() {
const float MAX_HAND_SWING = PI / 2.0f; const float MAX_HAND_SWING = PI / 2.0f;
minDots.push_back(cosf(MAX_HAND_SWING)); minDots.push_back(cosf(MAX_HAND_SWING));
stConstraint->setSwingLimits(minDots); stConstraint->setSwingLimits(minDots);
constraint = static_cast<RotationConstraint*>(stConstraint); constraint = static_cast<RotationConstraint*>(stConstraint);
} else if (baseName.startsWith("Shoulder", Qt::CaseInsensitive)) { } else if (baseName.startsWith("Shoulder", Qt::CaseInsensitive)) {
SwingTwistConstraint* stConstraint = new SwingTwistConstraint(); SwingTwistConstraint* stConstraint = new SwingTwistConstraint();