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

AnimController fix for crash if underPoses vector was empty.

Browse source
This commit is contained in:
Anthony J. Thibault 2015-09-08 21:42:42 -07:00
parent 75ecf0020d
commit 39aef6edc9
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/animation/src/AnimController.cpp
View file

@ -56,7 +56,12 @@ const AnimPoseVec& AnimController::overlay(const AnimVariantMap& animVars, float
} }
if (jointVar.jointIndex >= 0) { if (jointVar.jointIndex >= 0) {
AnimPose pose(animVars.lookup(jointVar.var, underPoses[jointVar.jointIndex])); AnimPose pose;
if (jointVar.jointIndex <= (int)underPoses.size()) {
pose = AnimPose(animVars.lookup(jointVar.var, underPoses[jointVar.jointIndex]));
} else {
pose = AnimPose(animVars.lookup(jointVar.var, AnimPose::identity));
}
_poses[jointVar.jointIndex] = pose; _poses[jointVar.jointIndex] = pose;
} }
} }

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

@ -962,7 +962,7 @@ void Rig::updateLeanJoint(int index, float leanSideways, float leanForward, floa
AnimPose pose = _animSkeleton->getRelativeBindPose(index); AnimPose pose = _animSkeleton->getRelativeBindPose(index);
pose.rot = rot; pose.rot = rot;
_animVars.set("lean", static_cast<glm::mat4>(pose)); _animVars.set("lean", static_cast<glm::mat4>(pose));
} else { } else if (!_enableAnimGraph) {
auto& parentState = _jointStates[_jointStates[index].getParentIndex()]; auto& parentState = _jointStates[_jointStates[index].getParentIndex()];
// get the rotation axes in joint space and use them to adjust the rotation // get the rotation axes in joint space and use them to adjust the rotation