Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-22 10:29:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup unnecessary scope and swap if-check order

Browse source
This commit is contained in:
Andrew Meadows 2016-12-21 15:37:23 -08:00
parent 0b0c3f0be4
commit 890e35e96e
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/animation/src/Rig.cpp
View file

@ -1195,7 +1195,7 @@ bool Rig::getModelRegistrationPoint(glm::vec3& modelRegistrationPointOut) const
void Rig::applyOverridePoses() { void Rig::applyOverridePoses() {
PerformanceTimer perfTimer("override"); PerformanceTimer perfTimer("override");
if (!_animSkeleton || _numOverrides == 0) { if (_numOverrides == 0 || !_animSkeleton) {
return; return;
} }
@ -1218,7 +1218,6 @@ void Rig::buildAbsoluteRigPoses(const AnimPoseVec& relativePoses, AnimPoseVec& a
ASSERT(_animSkeleton->getNumJoints() == (int)relativePoses.size()); ASSERT(_animSkeleton->getNumJoints() == (int)relativePoses.size());
{
absolutePosesOut.resize(relativePoses.size()); absolutePosesOut.resize(relativePoses.size());
AnimPose geometryToRigTransform(_geometryToRigTransform); AnimPose geometryToRigTransform(_geometryToRigTransform);
for (int i = 0; i < (int)relativePoses.size(); i++) { for (int i = 0; i < (int)relativePoses.size(); i++) {
@ -1231,7 +1230,6 @@ void Rig::buildAbsoluteRigPoses(const AnimPoseVec& relativePoses, AnimPoseVec& a
} }
} }
} }
}
glm::mat4 Rig::getJointTransform(int jointIndex) const { glm::mat4 Rig::getJointTransform(int jointIndex) const {
if (isIndexValid(jointIndex)) { if (isIndexValid(jointIndex)) {