Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a comment

Browse source
This commit is contained in:
Andrew Meadows 2014-06-04 14:19:45 -07:00
parent f19b562e88
commit e1cb88471f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/renderer/Model.cpp
View file

@ -2020,6 +2020,7 @@ void JointState::restoreRotation(float fraction, float priority) {
void JointState::setRotationFromBindFrame(const glm::quat& rotation, float priority) { void JointState::setRotationFromBindFrame(const glm::quat& rotation, float priority) {
assert(_fbxJoint != NULL); assert(_fbxJoint != NULL);
if (priority >= _animationPriority) { if (priority >= _animationPriority) {
// rotation is from bind- to model-frame
_rotationInParentFrame = _rotationInParentFrame * glm::inverse(_rotation) * rotation * glm::inverse(_fbxJoint->inverseBindRotation); _rotationInParentFrame = _rotationInParentFrame * glm::inverse(_rotation) * rotation * glm::inverse(_fbxJoint->inverseBindRotation);
_animationPriority = priority; _animationPriority = priority;
} }