rename glm_yaw_pitch_roll to glm_euler

This commit is contained in:
Recep Aslantas
2016-10-13 18:06:48 +03:00
parent e2f1c7eb6a
commit 46c84781f6

View File

@@ -10,6 +10,37 @@
#include "cglm.h"
/*!
* @brief build rotation matrix from euler angles/yaw-pitch-roll (xyz)
*/
CGLM_INLINE
void
glm_euler(float yaw,
float pitch,
float roll,
mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx = sinf(pitch); cx = cosf(pitch);
sy = sinf(yaw); cy = cosf(yaw);
sz = sinf(roll); cz = cosf(roll);
dest[0][0] = cy * cz;
dest[0][1] = cz * sx * sy - cx * sz;
dest[0][2] = cx * cz * sy + sx * sz;
dest[1][0] = cy * sz;
dest[1][1] = cx* cz + sx * sy * sz;
dest[1][2] =-cz * sx + cx * sy * sz;
dest[2][0] =-sy;
dest[2][1] = cy * sx;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles (zxy)
*/
@@ -41,35 +72,4 @@ glm_euler_zxy(float yaw,
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles/yaw-pitch-roll (xyz)
*/
CGLM_INLINE
void
glm_yaw_pitch_roll(float yaw,
float pitch,
float roll,
mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx = sinf(pitch); cx = cosf(pitch);
sy = sinf(yaw); cy = cosf(yaw);
sz = sinf(roll); cz = cosf(roll);
dest[0][0] = cy * cz;
dest[0][1] = cz * sx * sy - cx * sz;
dest[0][2] = cx * cz * sy + sx * sz;
dest[1][0] = cy * sz;
dest[1][1] = cx* cz + sx * sy * sz;
dest[1][2] =-cz * sx + cx * sy * sz;
dest[2][0] =-sy;
dest[2][1] = cy * sx;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][3] = 1.0f;
}
#endif /* cglm_euler_h */