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

fix crash bug

Browse source
This commit is contained in:
Andrew Meadows 2015-09-11 15:01:31 -07:00
parent c589f0e58e
commit d01c5d1ae5
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,7 +272,7 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
const float alpha = glm::clamp(dt / RELAXATION_TIMESCALE, 0.0f, 1.0f); const float alpha = glm::clamp(dt / RELAXATION_TIMESCALE, 0.0f, 1.0f);
int numJoints = (int)_relativePoses.size(); int numJoints = (int)_relativePoses.size();
for (int i = 0; i < numJoints; ++i) { for (int i = 0; i < numJoints; ++i) {
float dotSign = copysignf(1.0f, glm::dot(_relativePoses[i].rot, _defaultRelativePoses[i].rot)); float dotSign = copysignf(1.0f, glm::dot(_relativePoses[i].rot, underPoses[i].rot));
_relativePoses[i].rot = glm::normalize(glm::lerp(_relativePoses[i].rot, dotSign * underPoses[i].rot, alpha)); _relativePoses[i].rot = glm::normalize(glm::lerp(_relativePoses[i].rot, dotSign * underPoses[i].rot, alpha));
} }
} }
@ -604,11 +604,13 @@ void AnimInverseKinematics::setSkeletonInternal(AnimSkeleton::ConstPointer skele
_maxTargetIndex = 0; _maxTargetIndex = 0;
/*
if (skeleton) { if (skeleton) {
initConstraints(); initConstraints();
} else { } else {
clearConstraints(); clearConstraints();
} }
*/
} }
void AnimInverseKinematics::relaxTowardDefaults(float dt) { void AnimInverseKinematics::relaxTowardDefaults(float dt) {