YourWishes/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-02-17 03:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

change pitch and yaw order

Browse Source
This commit is contained in:
Recep Aslantas
2016-10-24 21:57:46 +03:00
parent 27dbdaad12
commit 025d7f4267
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/cglm-euler.h
View File

@@ -26,18 +26,18 @@ glm_euler_angles(mat4 m,
float * __restrict roll) { float * __restrict roll) {
if (m[2][0] < 1.0f) { if (m[2][0] < 1.0f) {
if (m[2][0] > -1.0f) { if (m[2][0] > -1.0f) {
float a[2][3]; vec3 a[2];
float cy1, cy2; float cy1, cy2;
int path; int path;
a[0][0] = asinf(m[2][0]); a[0][1] = asinf(m[2][0]);
a[1][0] = M_PI - a[0][0]; a[1][1] = M_PI - a[0][0];
cy1 = cosf(a[0][0]); cy1 = cosf(a[0][1]);
cy2 = cosf(a[1][0]); cy2 = cosf(a[1][1]);
a[0][1] = atan2f(-m[2][1] / cy1, m[2][2] / cy1); a[0][0] = atan2f(-m[2][1] / cy1, m[2][2] / cy1);
a[1][1] = atan2f(-m[2][1] / cy2, m[2][2] / cy2); a[1][0] = atan2f(-m[2][1] / cy2, m[2][2] / cy2);
a[0][2] = atan2f(-m[1][0] / cy1, m[0][0] / cy1); a[0][2] = atan2f(-m[1][0] / cy1, m[0][0] / cy1);
a[1][2] = atan2f(-m[1][0] / cy2, m[0][0] / cy2); a[1][2] = atan2f(-m[1][0] / cy2, m[0][0] / cy2);
@@ -45,18 +45,18 @@ glm_euler_angles(mat4 m,
path = (fabsf(a[0][0]) + fabsf(a[0][1]) + fabsf(a[0][2])) > path = (fabsf(a[0][0]) + fabsf(a[0][1]) + fabsf(a[0][2])) >
(fabsf(a[1][0]) + fabsf(a[1][1]) + fabsf(a[1][2])); (fabsf(a[1][0]) + fabsf(a[1][1]) + fabsf(a[1][2]));
*yaw = a[path][0]; *pitch = a[path][0];
*pitch = a[path][1]; *yaw = a[path][1];
*roll = a[path][2]; *roll = a[path][2];
} else { } else {
*yaw = -M_PI_2;
*pitch = -atan2(m[0][1], m[2][1]); *pitch = -atan2(m[0][1], m[2][1]);
*roll = 0; *yaw = -M_PI_2;
*roll = 0.0f;
} }
} else { } else {
*yaw = M_PI_2;
*pitch = atan2f(m[0][1], m[1][1]); *pitch = atan2f(m[0][1], m[1][1]);
*roll = 0; *yaw = M_PI_2;
*roll = 0.0f;
} }
} }