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

Switch order of precondition and setSecondaryTargets

Browse source
This commit is contained in:
Anthony J. Thibault 2017-08-01 13:17:33 -07:00
parent 2383933252
commit 25b5cb4762
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1056,8 +1056,9 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
{ {
PROFILE_RANGE_EX(simulation_animation, "ik/ccd", 0xffff00ff, 0); PROFILE_RANGE_EX(simulation_animation, "ik/ccd", 0xffff00ff, 0);
preconditionRelativePosesToAvoidLimbLock(context, targets);
setSecondaryTargets(context); setSecondaryTargets(context);
preconditionRelativePosesToAvoidLimbLock(context, targets);
solve(context, targets, dt, jointChainInfoVec); solve(context, targets, dt, jointChainInfoVec);
} }
@ -1610,7 +1611,7 @@ void AnimInverseKinematics::debugDrawRelativePoses(const AnimContext& context) c
const vec4 GREEN(0.0f, 1.0f, 0.0f, 1.0f); const vec4 GREEN(0.0f, 1.0f, 0.0f, 1.0f);
const vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f); const vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f);
const vec4 GRAY(0.2f, 0.2f, 0.2f, 1.0f); const vec4 GRAY(0.2f, 0.2f, 0.2f, 1.0f);
const float AXIS_LENGTH = 2.0f; // cm const float AXIS_LENGTH = 10.0f; // cm
// draw each pose // draw each pose
for (int i = 0; i < (int)poses.size(); i++) { for (int i = 0; i < (int)poses.size(); i++) {