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

proper corner case check for Quat::lookAtSimple()

Browse source
This commit is contained in:
Andrew Meadows 2016-11-03 09:17:22 -07:00
parent cd5826e2ce
commit b7c6922545
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/script-engine/src/Quat.cpp
View file

@ -37,29 +37,30 @@ glm::quat Quat::lookAt(const glm::vec3& eye, const glm::vec3& center, const glm:
glm::quat Quat::lookAtSimple(const glm::vec3& eye, const glm::vec3& center) { glm::quat Quat::lookAtSimple(const glm::vec3& eye, const glm::vec3& center) {
auto dir = glm::normalize(center - eye); auto dir = glm::normalize(center - eye);
// if the direction is nearly aligned with the Y axis, then use the X axis for 'up' // if the direction is nearly aligned with the Y axis, then use the X axis for 'up'
if (dir.x < 0.001f && dir.z < 0.001f) { const float MAX_ABS_Y_COMPONENT = 0.9999991f;
if (fabsf(dir.y) > MAX_ABS_Y_COMPONENT) {
return lookAt(eye, center, Vectors::UNIT_X); return lookAt(eye, center, Vectors::UNIT_X);
} }
return lookAt(eye, center, Vectors::UNIT_Y); return lookAt(eye, center, Vectors::UNIT_Y);
} }
glm::quat Quat::multiply(const glm::quat& q1, const glm::quat& q2) { glm::quat Quat::multiply(const glm::quat& q1, const glm::quat& q2) {
return q1 * q2; return q1 * q2;
} }
glm::quat Quat::fromVec3Degrees(const glm::vec3& eulerAngles) { glm::quat Quat::fromVec3Degrees(const glm::vec3& eulerAngles) {
return glm::quat(glm::radians(eulerAngles)); return glm::quat(glm::radians(eulerAngles));
} }
glm::quat Quat::fromVec3Radians(const glm::vec3& eulerAngles) { glm::quat Quat::fromVec3Radians(const glm::vec3& eulerAngles) {
return glm::quat(eulerAngles); return glm::quat(eulerAngles);
} }
glm::quat Quat::fromPitchYawRollDegrees(float pitch, float yaw, float roll) { glm::quat Quat::fromPitchYawRollDegrees(float pitch, float yaw, float roll) {
return glm::quat(glm::radians(glm::vec3(pitch, yaw, roll))); return glm::quat(glm::radians(glm::vec3(pitch, yaw, roll)));
} }
glm::quat Quat::fromPitchYawRollRadians(float pitch, float yaw, float roll) { glm::quat Quat::fromPitchYawRollRadians(float pitch, float yaw, float roll) {
return glm::quat(glm::vec3(pitch, yaw, roll)); return glm::quat(glm::vec3(pitch, yaw, roll));
} }