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

Rig: prevent normalization of a zero vector

Browse source
This commit is contained in:
Anthony J. Thibault 2016-02-18 10:24:36 -08:00
parent 73ac47724a
commit 613b60658e
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1083,6 +1083,7 @@ void Rig::updateFromHandParameters(const HandParameters& params, float dt) {
const float HAND_RADIUS = 0.05f; const float HAND_RADIUS = 0.05f;
const float BODY_RADIUS = params.bodyCapsuleRadius; const float BODY_RADIUS = params.bodyCapsuleRadius;
const float MIN_LENGTH = 1.0e-4f;
// project the hips onto the xz plane. // project the hips onto the xz plane.
auto hipsTrans = _internalPoseSet._absolutePoses[_animSkeleton->nameToJointIndex("Hips")].trans; auto hipsTrans = _internalPoseSet._absolutePoses[_animSkeleton->nameToJointIndex("Hips")].trans;
@ -1092,13 +1093,14 @@ void Rig::updateFromHandParameters(const HandParameters& params, float dt) {
// project the hand position onto the xz plane. // project the hand position onto the xz plane.
glm::vec2 handCircleCenter(params.leftPosition.x, params.leftPosition.z); glm::vec2 handCircleCenter(params.leftPosition.x, params.leftPosition.z);
auto d = handCircleCenter - bodyCircleCenter;
// check for 2d overlap of the hand and body circles. // check for 2d overlap of the hand and body circles.
float penetrationDistance = HAND_RADIUS + BODY_RADIUS - glm::length(d); auto circleToCircle = handCircleCenter - bodyCircleCenter;
if (penetrationDistance > 0) { const float circleToCircleLength = glm::length(circleToCircle);
const float penetrationDistance = HAND_RADIUS + BODY_RADIUS - circleToCircleLength;
if (penetrationDistance > 0.0f && circleToCircleLength > MIN_LENGTH) {
// push the hands out of the body // push the hands out of the body
handCircleCenter += penetrationDistance * glm::normalize(d); handCircleCenter += penetrationDistance * glm::normalize(circleToCircle);
} }
glm::vec3 handPosition(handCircleCenter.x, params.leftPosition.y, handCircleCenter.y); glm::vec3 handPosition(handCircleCenter.x, params.leftPosition.y, handCircleCenter.y);
@ -1115,13 +1117,14 @@ void Rig::updateFromHandParameters(const HandParameters& params, float dt) {
// project the hand position onto the xz plane. // project the hand position onto the xz plane.
glm::vec2 handCircleCenter(params.rightPosition.x, params.rightPosition.z); glm::vec2 handCircleCenter(params.rightPosition.x, params.rightPosition.z);
auto d = handCircleCenter - bodyCircleCenter;
// check for 2d overlap of the hand and body circles. // check for 2d overlap of the hand and body circles.
float penetrationDistance = HAND_RADIUS + BODY_RADIUS - glm::length(d); auto circleToCircle = handCircleCenter - bodyCircleCenter;
if (penetrationDistance > 0) { const float circleToCircleLength = glm::length(circleToCircle);
const float penetrationDistance = HAND_RADIUS + BODY_RADIUS - circleToCircleLength;
if (penetrationDistance > 0.0f && circleToCircleLength > MIN_LENGTH) {
// push the hands out of the body // push the hands out of the body
handCircleCenter += penetrationDistance * glm::normalize(d); handCircleCenter += penetrationDistance * glm::normalize(circleToCircle);
} }
glm::vec3 handPosition(handCircleCenter.x, params.rightPosition.y, handCircleCenter.y); glm::vec3 handPosition(handCircleCenter.x, params.rightPosition.y, handCircleCenter.y);