From 99586f259c394eaec1a6790f2689965fdf9f8eee Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 2 Sep 2015 13:44:34 -0700 Subject: [PATCH] Renamed bindTransformIsValid to bindTransformFoundInCluster --- libraries/animation/src/AnimSkeleton.cpp | 2 +- libraries/fbx/src/FBXReader.cpp | 4 ++-- libraries/fbx/src/FBXReader.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp index 9e600c4e15..3f11607f26 100644 --- a/libraries/animation/src/AnimSkeleton.cpp +++ b/libraries/animation/src/AnimSkeleton.cpp @@ -67,7 +67,7 @@ AnimSkeleton::AnimSkeleton(const std::vector& joints, const AnimPose& // iterate over FBXJoints and extract the bind pose information. 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 // i.e. not relative to it's parent. AnimPose absoluteBindPose(_joints[i].bindTransform); diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp index 7c80b97117..c885f56b55 100644 --- a/libraries/fbx/src/FBXReader.cpp +++ b/libraries/fbx/src/FBXReader.cpp @@ -2309,7 +2309,7 @@ FBXGeometry* extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping } } - joint.bindTransformIsValid = false; + joint.bindTransformFoundInCluster = false; geometry.joints.append(joint); 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]; joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink)); joint.bindTransform = cluster.transformLink; - joint.bindTransformIsValid = true; + joint.bindTransformFoundInCluster = true; // update the bind pose extents glm::vec3 bindTranslation = extractTranslation(geometry.offset * joint.bindTransform); diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h index d8e1ae59e6..158b5581c6 100644 --- a/libraries/fbx/src/FBXReader.h +++ b/libraries/fbx/src/FBXReader.h @@ -84,7 +84,7 @@ public: glm::mat4 bindTransform; QString name; bool isSkeletonJoint; - bool bindTransformIsValid; + bool bindTransformFoundInCluster; };