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

CR

Browse source
This commit is contained in:
Atlante45 2014-07-29 13:35:13 -07:00
parent 6183c4d97e
commit 8354763e36
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
interface/src/renderer/JointState.cpp
View file

@ -27,7 +27,7 @@ JointState::JointState() :
} }
JointState::JointState(const JointState& other) : _constraint(NULL) { JointState::JointState(const JointState& other) : _constraint(NULL) {
_transformChanged = true; _transformChanged = other._transformChanged;
_transform = other._transform; _transform = other._transform;
_rotation = other._rotation; _rotation = other._rotation;
_rotationInConstrainedFrame = other._rotationInConstrainedFrame; _rotationInConstrainedFrame = other._rotationInConstrainedFrame;
@ -49,10 +49,9 @@ JointState::~JointState() {
void JointState::setFBXJoint(const FBXJoint* joint) { void JointState::setFBXJoint(const FBXJoint* joint) {
assert(joint != NULL); assert(joint != NULL);
if (joint->rotation != _rotationInConstrainedFrame) { _rotationInConstrainedFrame = joint->rotation;
_rotationInConstrainedFrame = joint->rotation; _transformChanged = true;
_transformChanged = true;
}
// NOTE: JointState does not own the FBXJoint to which it points. // NOTE: JointState does not own the FBXJoint to which it points.
_fbxJoint = joint; _fbxJoint = joint;
if (_constraint) { if (_constraint) {
@ -76,7 +75,7 @@ void JointState::updateConstraint() {
void JointState::copyState(const JointState& state) { void JointState::copyState(const JointState& state) {
_animationPriority = state._animationPriority; _animationPriority = state._animationPriority;
_transform = state._transform; _transform = state._transform;
_transformChanged = true; _transformChanged = state._transformChanged;
_rotation = extractRotation(_transform); _rotation = extractRotation(_transform);
_rotationInConstrainedFrame = state._rotationInConstrainedFrame; _rotationInConstrainedFrame = state._rotationInConstrainedFrame;
_positionInParentFrame = state._positionInParentFrame; _positionInParentFrame = state._positionInParentFrame;
@ -102,11 +101,11 @@ void JointState::computeTransform(const glm::mat4& parentTransform, bool parentT
glm::quat rotationInParentFrame = _fbxJoint->preRotation * _rotationInConstrainedFrame * _fbxJoint->postRotation; glm::quat rotationInParentFrame = _fbxJoint->preRotation * _rotationInConstrainedFrame * _fbxJoint->postRotation;
glm::mat4 transformInParentFrame = _fbxJoint->preTransform * glm::mat4_cast(rotationInParentFrame) * _fbxJoint->postTransform; glm::mat4 transformInParentFrame = _fbxJoint->preTransform * glm::mat4_cast(rotationInParentFrame) * _fbxJoint->postTransform;
glm::mat4 newTransform = parentTransform * glm::translate(_fbxJoint->translation) * transformInParentFrame; glm::mat4 newTransform = parentTransform * glm::translate(_fbxJoint->translation) * transformInParentFrame;
_transformChanged = true;
if (newTransform != _transform) { if (newTransform != _transform) {
_transform = newTransform; _transform = newTransform;
_rotation = extractRotation(_transform); _rotation = extractRotation(_transform);
_transformChanged = true;
} }
} }
@ -171,15 +170,14 @@ void JointState::applyRotationDelta(const glm::quat& delta, bool constrain, floa
return; return;
} }
_animationPriority = priority; _animationPriority = priority;
glm::quat targetRotation = _rotationInConstrainedFrame * glm::inverse(_rotation) * delta * _rotation;
if (!constrain || _constraint == NULL) { if (!constrain || _constraint == NULL) {
// no constraints // no constraints
_rotationInConstrainedFrame = _rotationInConstrainedFrame * glm::inverse(_rotation) * delta * _rotation; _rotationInConstrainedFrame = targetRotation;
_transformChanged = true;
_rotation = delta * _rotation; _rotation = delta * _rotation;
return; return;
} }
glm::quat targetRotation = _rotationInConstrainedFrame * glm::inverse(_rotation) * delta * _rotation;
setRotationInConstrainedFrame(targetRotation); setRotationInConstrainedFrame(targetRotation);
} }
@ -226,6 +224,7 @@ glm::quat JointState::computeVisibleParentRotation() const {
void JointState::setRotationInConstrainedFrame(const glm::quat& targetRotation) { void JointState::setRotationInConstrainedFrame(const glm::quat& targetRotation) {
glm::quat parentRotation = computeParentRotation(); glm::quat parentRotation = computeParentRotation();
_rotationInConstrainedFrame = targetRotation; _rotationInConstrainedFrame = targetRotation;
_transformChanged = true;
// R' = Rp * Rpre * r' * Rpost // R' = Rp * Rpre * r' * Rpost
_rotation = parentRotation * _fbxJoint->preRotation * _rotationInConstrainedFrame * _fbxJoint->postRotation; _rotation = parentRotation * _fbxJoint->preRotation * _rotationInConstrainedFrame * _fbxJoint->postRotation;
} }