Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 18:44:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2949 from AndrewMeadows/inertia

Browse source 
safe copy of JointState data
This commit is contained in:
Clément Brisset 2014-05-29 14:44:05 -07:00
commit 21d1a18bd5
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,8 +138,9 @@ void Model::initSkinProgram(ProgramObject& program, Model::SkinLocations& locati
QVector<JointState> Model::createJointStates(const FBXGeometry& geometry) {
QVector<JointState> jointStates;
foreach (const FBXJoint& joint, geometry.joints) {
// NOTE: the state keeps a pointer to an FBXJoint
JointState state;
state.setFBXJoint(joint);
state.setFBXJoint(&joint);
jointStates.append(state);
}
@ -408,7 +409,7 @@ bool Model::updateGeometry() {
int oldIndex = it.value() - 1;
int newIndex = newGeometry.getJointIndex(it.key());
if (newIndex != -1) {
newJointStates[newIndex] = _jointStates.at(oldIndex);
newJointStates[newIndex].copyState(_jointStates[oldIndex]);
}
}
}
@ -1890,15 +1891,26 @@ JointState::JointState() :
_fbxJoint(NULL) {
}
void JointState::setFBXJoint(const FBXJoint& joint) {
assert(&joint != NULL);
_translation = joint.translation;
_rotation = joint.rotation;
_fbxJoint = &joint;
void JointState::setFBXJoint(const FBXJoint* joint) {
assert(joint != NULL);
_translation = joint->translation;
_rotation = joint->rotation;
// NOTE: JointState does not own the FBXJoint to which it points.
_fbxJoint = joint;
}
void JointState::updateWorldTransform(const glm::mat4& baseTransform, const glm::quat& parentRotation) {
assert(_fbxJoint != NULL);
glm::quat combinedRotation = _fbxJoint->preRotation * _rotation * _fbxJoint->postRotation;
_transform = baseTransform * glm::translate(_translation) * _fbxJoint->preTransform * glm::mat4_cast(combinedRotation) * _fbxJoint->postTransform;
_combinedRotation = parentRotation * combinedRotation;
}
void JointState::copyState(const JointState& state) {
_translation = state._translation;
_rotation = state._rotation;
_transform = state._transform;
_combinedRotation = state._combinedRotation;
_animationPriority = state._animationPriority;
// DO NOT copy _fbxJoint
}

6
interface/src/renderer/Model.h
View file

@ -35,11 +35,13 @@ class JointState {
public:
JointState();
void setFBXJoint(const FBXJoint& joint);
void setFBXJoint(const FBXJoint* joint);
const FBXJoint& getFBXJoint() const { return *_fbxJoint; }
void updateWorldTransform(const glm::mat4& baseTransform, const glm::quat& parentRotation);
void copyState(const JointState& state);
glm::vec3 _translation; // translation relative to parent
glm::quat _rotation; // rotation relative to parent
glm::mat4 _transform; // rotation to world frame + translation in model frame
@ -47,7 +49,7 @@ public:
float _animationPriority; // the priority of the animation affecting this joint
private:
const FBXJoint* _fbxJoint; // JointState does not own its FBXJoint
const FBXJoint* _fbxJoint; // JointState does NOT own its FBXJoint
};
/// A generic 3D model displaying geometry loaded from a URL.