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,46 +10,15 @@
#include "cglm.h"
/*!
* @brief build rotation matrix from euler angles (zxy)
*/
CGLM_INLINE
void
glm_euler_zxy(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 - sx * sy * sz;
dest[1][0] = cy * sz + cz * sx * sy;
dest[2][0] =-cx * sy;
dest[0][1] =-cx * sz;
dest[1][1] = cx * cz;
dest[2][1] = sx;
dest[0][2] = cz * sy + cy * sx * sz;
dest[1][2] = sy * sz - cy * cz * 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/yaw-pitch-roll (xyz)
*/
CGLM_INLINE
void
glm_yaw_pitch_roll(float yaw,
float pitch,
float roll,
mat4 dest) {
glm_euler(float yaw,
float pitch,
float roll,
mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
@@ -72,4 +41,35 @@ glm_yaw_pitch_roll(float yaw,
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles (zxy)
*/
CGLM_INLINE
void
glm_euler_zxy(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 - sx * sy * sz;
dest[1][0] = cy * sz + cz * sx * sy;
dest[2][0] =-cx * sy;
dest[0][1] =-cx * sz;
dest[1][1] = cx * cz;
dest[2][1] = sx;
dest[0][2] = cz * sy + cy * sx * sz;
dest[1][2] = sy * sz - cy * cz * 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 */