From d03d4b8df5e210c6ae0a84a2c2aba3bf4bd6c81e Mon Sep 17 00:00:00 2001 From: Luigi Castelli Date: Wed, 21 Aug 2019 21:52:01 +0200 Subject: [PATCH] new name for euler sequence (#94) * new name for angle sequence --- include/cglm/call/euler.h | 2 +- include/cglm/euler.h | 20 +++++++++++--------- include/cglm/struct/euler.h | 6 +++--- src/euler.c | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/include/cglm/call/euler.h b/include/cglm/call/euler.h index 9b85485..2de68fb 100644 --- a/include/cglm/call/euler.h +++ b/include/cglm/call/euler.h @@ -47,7 +47,7 @@ glmc_euler_yxz(vec3 angles, mat4 dest); CGLM_EXPORT void -glmc_euler_by_order(vec3 angles, glm_euler_sq axis, mat4 dest); +glmc_euler_by_order(vec3 angles, glm_euler_seq axis, mat4 dest); #ifdef __cplusplus } diff --git a/include/cglm/euler.h b/include/cglm/euler.h index 1ff5f6d..8ae0c83 100644 --- a/include/cglm/euler.h +++ b/include/cglm/euler.h @@ -15,10 +15,10 @@ /* Types: - enum glm_euler_sq + enum glm_euler_seq Functions: - CGLM_INLINE glm_euler_sq glm_euler_order(int newOrder[3]); + CGLM_INLINE glm_euler_seq glm_euler_order(int newOrder[3]); CGLM_INLINE void glm_euler_angles(mat4 m, vec3 dest); CGLM_INLINE void glm_euler(vec3 angles, mat4 dest); CGLM_INLINE void glm_euler_xyz(vec3 angles, mat4 dest); @@ -28,7 +28,7 @@ CGLM_INLINE void glm_euler_yzx(vec3 angles, mat4 dest); CGLM_INLINE void glm_euler_yxz(vec3 angles, mat4 dest); CGLM_INLINE void glm_euler_by_order(vec3 angles, - glm_euler_sq ord, + glm_euler_seq ord, mat4 dest); */ @@ -41,24 +41,26 @@ * if you have axis order like vec3 orderVec = [0, 1, 2] or [0, 2, 1]... * vector then you can convert it to this enum by doing this: * @code - * glm_euler_sq order; + * glm_euler_seq order; * order = orderVec[0] | orderVec[1] << 2 | orderVec[2] << 4; * @endcode * you may need to explicit cast if required */ -typedef enum glm_euler_sq { +typedef enum glm_euler_seq { GLM_EULER_XYZ = 0 << 0 | 1 << 2 | 2 << 4, GLM_EULER_XZY = 0 << 0 | 2 << 2 | 1 << 4, GLM_EULER_YZX = 1 << 0 | 2 << 2 | 0 << 4, GLM_EULER_YXZ = 1 << 0 | 0 << 2 | 2 << 4, GLM_EULER_ZXY = 2 << 0 | 0 << 2 | 1 << 4, GLM_EULER_ZYX = 2 << 0 | 1 << 2 | 0 << 4 -} glm_euler_sq; +} glm_euler_seq; + +typedef glm_euler_seq glm_euler_sq; CGLM_INLINE -glm_euler_sq +glm_euler_seq glm_euler_order(int ord[3]) { - return (glm_euler_sq)(ord[0] << 0 | ord[1] << 2 | ord[2] << 4); + return (glm_euler_seq)(ord[0] << 0 | ord[1] << 2 | ord[2] << 4); } /*! @@ -352,7 +354,7 @@ glm_euler_zyx(vec3 angles, mat4 dest) { */ CGLM_INLINE void -glm_euler_by_order(vec3 angles, glm_euler_sq ord, mat4 dest) { +glm_euler_by_order(vec3 angles, glm_euler_seq ord, mat4 dest) { float cx, cy, cz, sx, sy, sz; diff --git a/include/cglm/struct/euler.h b/include/cglm/struct/euler.h index 272ea7f..6575930 100644 --- a/include/cglm/struct/euler.h +++ b/include/cglm/struct/euler.h @@ -15,7 +15,7 @@ /* Types: - enum glm_euler_sq + enum glm_euler_seq Functions: CGLM_INLINE vec3s glms_euler_angles(mat4s m) @@ -25,7 +25,7 @@ CGLM_INLINE mat4s glms_euler_yzx(vec3s angles) CGLM_INLINE mat4s glms_euler_zxy(vec3s angles) CGLM_INLINE mat4s glms_euler_zyx(vec3s angles) - CGLM_INLINE mat4s glms_euler_by_order(vec3s angles, glm_euler_sq ord) + CGLM_INLINE mat4s glms_euler_by_order(vec3s angles, glm_euler_seq ord) */ #ifndef cglms_euler_h @@ -143,7 +143,7 @@ glms_euler_zyx(vec3s angles) { */ CGLM_INLINE mat4s -glms_euler_by_order(vec3s angles, glm_euler_sq ord) { +glms_euler_by_order(vec3s angles, glm_euler_seq ord) { mat4s dest; glm_euler_by_order(angles.raw, ord, dest.raw); return dest; diff --git a/src/euler.c b/src/euler.c index 44d6edb..a59b1df 100644 --- a/src/euler.c +++ b/src/euler.c @@ -58,6 +58,6 @@ glmc_euler_yxz(vec3 angles, mat4 dest) { CGLM_EXPORT void -glmc_euler_by_order(vec3 angles, glm_euler_sq axis, mat4 dest) { +glmc_euler_by_order(vec3 angles, glm_euler_seq axis, mat4 dest) { glm_euler_by_order(angles, axis, dest); }