Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 23:03:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better fix for looking down at your own body.

Browse source
This commit is contained in:
Anthony J. Thibault 2018-06-05 14:43:33 -07:00
parent 558711f906
commit 94c39bc4af
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libraries/animation/src/AnimUtil.cpp
View file

@ -120,22 +120,27 @@ glm::quat computeBodyFacingFromHead(const glm::quat& headRot, const glm::vec3& u
// initially take the body facing from the head. // initially take the body facing from the head.
glm::vec3 headUp = headRot * Vectors::UNIT_Y; glm::vec3 headUp = headRot * Vectors::UNIT_Y;
glm::vec3 headForward = headRot * Vectors::UNIT_Z; glm::vec3 headForward = headRot * Vectors::UNIT_Z;
const float THRESHOLD = cosf(glm::radians(30.0f)); glm::vec3 headLeft = headRot * Vectors::UNIT_X;
const float NOD_THRESHOLD = cosf(glm::radians(45.0f));
const float TILT_THRESHOLD = cosf(glm::radians(30.0f));
glm::vec3 bodyForward = headForward; glm::vec3 bodyForward = headForward;
float dot = glm::dot(headForward, bodyUp); float nodDot = glm::dot(headForward, bodyUp);
float tiltDot = glm::dot(headLeft, bodyUp);
if (dot < -THRESHOLD) { // head is looking down if (fabsf(tiltDot) < TILT_THRESHOLD) { // if we are not tilting too much
// the body should face in the same direction as the top the head. if (nodDot < -NOD_THRESHOLD) { // head is looking downward
bodyForward = headUp; // the body should face in the same direction as the top the head.
} else if (dot > THRESHOLD) { // head is looking upward bodyForward = headUp;
// the body should face away from the top of the head. } else if (nodDot > NOD_THRESHOLD) { // head is looking upward
bodyForward = -headUp; // the body should face away from the top of the head.
bodyForward = -headUp;
}
} }
// cancel out upward component // cancel out upward component
bodyForward = glm::normalize(bodyForward - dot * bodyUp); bodyForward = glm::normalize(bodyForward - nodDot * bodyUp);
glm::vec3 u, v, w; glm::vec3 u, v, w;
generateBasisVectors(bodyForward, bodyUp, u, v, w); generateBasisVectors(bodyForward, bodyUp, u, v, w);