External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-03 16:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix extract euler angles

Browse Source
This commit is contained in:
Recep Aslantas
2017-01-08 16:35:37 +02:00
parent 072ccf5d63
commit 16107c4ba1
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LICENSE
View File

@@ -49,3 +49,6 @@ LICENSE:
David Eberly David Eberly
Geometric Tools, LLC http://www.geometrictools.com/ Geometric Tools, LLC http://www.geometrictools.com/
Copyright (c) 1998-2016. All Rights Reserved. Copyright (c) 1998-2016. All Rights Reserved.
Computing Euler angles from a rotation matrix (euler.pdf)
Gregory G. Slabaugh

14
include/cglm-euler.h
View File

@@ -43,8 +43,8 @@ glm_euler_order(char newOrder[3]) {
CGLM_INLINE CGLM_INLINE
void void
glm_euler_angles(mat4 m, vec3 dest) { glm_euler_angles(mat4 m, vec3 dest) {
if (m[2][0] < 1.0f) { if (m[0][2] < 1.0f) {
if (m[2][0] > -1.0f) { if (m[0][2] > -1.0f) {
vec3 a[2]; vec3 a[2];
float cy1, cy2; float cy1, cy2;
int path; int path;
@@ -66,13 +66,13 @@ glm_euler_angles(mat4 m, vec3 dest) {
glm_vec_dup(a[path], dest); glm_vec_dup(a[path], dest);
} else { } else {
dest[0] = -atan2(m[0][1], m[2][1]); dest[0] = atan2(m[1][0], m[2][0]);
dest[1] = -M_PI_2; dest[1] = M_PI_2;
dest[3] = 0.0f; dest[2] = 0.0f;
} }
} else { } else {
dest[0] = atan2f(m[0][1], m[1][1]); dest[0] = atan2f(-m[1][0], -m[2][0]);
dest[1] = M_PI_2; dest[1] =-M_PI_2;
dest[2] = 0.0f; dest[2] = 0.0f;
} }
} }