olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: remove use of glm::quaternion

This commit is contained in:
Eric Wasylishen 2017-04-23 17:58:24 -06:00
parent eeb00bf74c
commit 4da864707c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
light/settings.cc
View File

@ -20,8 +20,6 @@
#include <light/settings.hh> #include <light/settings.hh>
#include <glm/gtx/quaternion.hpp>
glm::vec3 vec_from_mangle(const glm::vec3 &m) glm::vec3 vec_from_mangle(const glm::vec3 &m)
{ {
const glm::vec3 tmp = m * static_cast<float>(Q_PI / 180.0f); const glm::vec3 tmp = m * static_cast<float>(Q_PI / 180.0f);
@ -34,10 +32,21 @@ glm::vec3 vec_from_mangle(const glm::vec3 &m)
glm::vec3 mangle_from_vec(const glm::vec3 &v) glm::vec3 mangle_from_vec(const glm::vec3 &v)
{ {
const glm::vec3 up(0, 0, 1);
const glm::vec3 east(1, 0, 0); const glm::vec3 east(1, 0, 0);
const glm::quat rotationQuat = glm::rotation(east, v); const glm::vec3 north(0, 1, 0);
const glm::vec3 eulerAngles = glm::eulerAngles(rotationQuat);
const glm::vec3 mangle = glm::vec3(eulerAngles.z, -eulerAngles.y, 0) * static_cast<float>(180.0f / Q_PI); // get rotation about Z axis
float x = glm::dot(east, v);
float y = glm::dot(north, v);
float theta = atan2f(y, x);
// get angle away from Z axis
float cosangleFromUp = glm::dot(up, v);
cosangleFromUp = qmin(qmax(-1.0f, cosangleFromUp), 1.0f);
float radiansFromUp = acosf(cosangleFromUp);
const glm::vec3 mangle = glm::vec3(theta, -(radiansFromUp - Q_PI/2.0), 0) * static_cast<float>(180.0f / Q_PI);
return mangle; return mangle;
} }