Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 13:59:59 +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

22
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,17 +1218,15 @@ 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++) { int parentIndex = _animSkeleton->getParentIndex(i);
int parentIndex = _animSkeleton->getParentIndex(i); if (parentIndex == -1) {
if (parentIndex == -1) { // transform all root absolute poses into rig space
// transform all root absolute poses into rig space absolutePosesOut[i] = geometryToRigTransform * relativePoses[i];
absolutePosesOut[i] = geometryToRigTransform * relativePoses[i]; } else {
} else { absolutePosesOut[i] = absolutePosesOut[parentIndex] * relativePoses[i];
absolutePosesOut[i] = absolutePosesOut[parentIndex] * relativePoses[i];
}
} }
} }
} }