From 890e35e96ec38e1aa24c892ac4b6a9efdf2bc064 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 21 Dec 2016 15:37:23 -0800 Subject: [PATCH] cleanup unnecessary scope and swap if-check order --- libraries/animation/src/Rig.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index b6bb8ccc8f..eec8035957 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -1195,7 +1195,7 @@ bool Rig::getModelRegistrationPoint(glm::vec3& modelRegistrationPointOut) const void Rig::applyOverridePoses() { PerformanceTimer perfTimer("override"); - if (!_animSkeleton || _numOverrides == 0) { + if (_numOverrides == 0 || !_animSkeleton) { return; } @@ -1218,17 +1218,15 @@ void Rig::buildAbsoluteRigPoses(const AnimPoseVec& relativePoses, AnimPoseVec& a ASSERT(_animSkeleton->getNumJoints() == (int)relativePoses.size()); - { - absolutePosesOut.resize(relativePoses.size()); - AnimPose geometryToRigTransform(_geometryToRigTransform); - for (int i = 0; i < (int)relativePoses.size(); i++) { - int parentIndex = _animSkeleton->getParentIndex(i); - if (parentIndex == -1) { - // transform all root absolute poses into rig space - absolutePosesOut[i] = geometryToRigTransform * relativePoses[i]; - } else { - absolutePosesOut[i] = absolutePosesOut[parentIndex] * relativePoses[i]; - } + absolutePosesOut.resize(relativePoses.size()); + AnimPose geometryToRigTransform(_geometryToRigTransform); + for (int i = 0; i < (int)relativePoses.size(); i++) { + int parentIndex = _animSkeleton->getParentIndex(i); + if (parentIndex == -1) { + // transform all root absolute poses into rig space + absolutePosesOut[i] = geometryToRigTransform * relativePoses[i]; + } else { + absolutePosesOut[i] = absolutePosesOut[parentIndex] * relativePoses[i]; } } }