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

Renamed bindTransformIsValid to bindTransformFoundInCluster

Browse source
This commit is contained in:
Anthony J. Thibault 2015-09-02 13:44:34 -07:00
parent 91fbbf7d4e
commit 99586f259c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/animation/src/AnimSkeleton.cpp
View file

@ -67,7 +67,7 @@ AnimSkeleton::AnimSkeleton(const std::vector<FBXJoint>& joints, const AnimPose&
// iterate over FBXJoints and extract the bind pose information. // iterate over FBXJoints and extract the bind pose information.
for (size_t i = 0; i < joints.size(); i++) { for (size_t i = 0; i < joints.size(); i++) {
if (_joints[i].bindTransformIsValid) { if (_joints[i].bindTransformFoundInCluster) {
// Use the FBXJoint::bindTransform, which is absolute model coordinates // Use the FBXJoint::bindTransform, which is absolute model coordinates
// i.e. not relative to it's parent. // i.e. not relative to it's parent.
AnimPose absoluteBindPose(_joints[i].bindTransform); AnimPose absoluteBindPose(_joints[i].bindTransform);

4
libraries/fbx/src/FBXReader.cpp
View file

@ -2309,7 +2309,7 @@ FBXGeometry* extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping
} }
} }
joint.bindTransformIsValid = false; joint.bindTransformFoundInCluster = false;
geometry.joints.append(joint); geometry.joints.append(joint);
geometry.jointIndices.insert(model.name, geometry.joints.size()); geometry.jointIndices.insert(model.name, geometry.joints.size());
@ -2538,7 +2538,7 @@ FBXGeometry* extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping
FBXJoint& joint = geometry.joints[fbxCluster.jointIndex]; FBXJoint& joint = geometry.joints[fbxCluster.jointIndex];
joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink)); joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink));
joint.bindTransform = cluster.transformLink; joint.bindTransform = cluster.transformLink;
joint.bindTransformIsValid = true; joint.bindTransformFoundInCluster = true;
// update the bind pose extents // update the bind pose extents
glm::vec3 bindTranslation = extractTranslation(geometry.offset * joint.bindTransform); glm::vec3 bindTranslation = extractTranslation(geometry.offset * joint.bindTransform);

2
libraries/fbx/src/FBXReader.h
View file

@ -84,7 +84,7 @@ public:
glm::mat4 bindTransform; glm::mat4 bindTransform;
QString name; QString name;
bool isSkeletonJoint; bool isSkeletonJoint;
bool bindTransformIsValid; bool bindTransformFoundInCluster;
}; };