Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 17:53:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

AnimPose: bug fix for extracting rotations from matrices with large scale

Browse source
This commit is contained in:
Anthony J. Thibault 2015-11-18 16:02:30 -08:00
parent b481d7c73d
commit 5ffef7f41a
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/animation/src/AnimPose.cpp
View file

@ -9,7 +9,9 @@
//
#include "AnimPose.h"
#include "GLMHelpers.h"
#include <GLMHelpers.h>
#include <glm/gtc/matrix_transform.hpp>
#include <algorithm>
const AnimPose AnimPose::identity = AnimPose(glm::vec3(1.0f),
glm::quat(),
@ -17,7 +19,13 @@ const AnimPose AnimPose::identity = AnimPose(glm::vec3(1.0f),
AnimPose::AnimPose(const glm::mat4& mat) {
scale = extractScale(mat);
rot = glm::normalize(glm::quat_cast(mat));
if (std::max(std::max(scale.x, scale.y), scale.z) > 1.01f) {
// quat_cast doesn't work so well with scaled matrices, so cancel it out.
mat4 tmp = glm::scale(mat, 1.0f / scale);
rot = glm::normalize(glm::quat_cast(tmp));
} else {
rot = glm::normalize(glm::quat_cast(mat));
}
trans = extractTranslation(mat);
}