From efb37ab0f767c2e95505a703c6a342167ec017fa Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sat, 11 Nov 2017 15:51:17 +0300 Subject: [PATCH] vec: helper / special macros for initializing white and black colors --- include/cglm/vec3.h | 7 ++++++- include/cglm/vec4.h | 12 +++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/cglm/vec3.h b/include/cglm/vec3.h index a87220d..71d4399 100644 --- a/include/cglm/vec3.h +++ b/include/cglm/vec3.h @@ -13,7 +13,9 @@ /* Macros: glm_vec_dup(v, dest) - + GLM_VEC3_ONE_INIT + GLM_VEC3_ONE + Functions: CGLM_INLINE void glm_vec_copy(vec3 a, vec3 dest); CGLM_INLINE float glm_vec_dot(vec3 a, vec3 b); @@ -47,6 +49,9 @@ /* DEPRECATED! use _copy, _ucopy versions */ #define glm_vec_dup(v, dest) glm_vec_copy(v, dest) +#define GLM_VEC3_ONE_INIT {1.0f, 1.0f, 1.0f} +#define GLM_VEC3_ONE (vec3)GLM_VEC3_ONE_INIT + /*! * @brief copy all members of [a] to [dest] * diff --git a/include/cglm/vec4.h b/include/cglm/vec4.h index f39b17b..7c4cc2b 100644 --- a/include/cglm/vec4.h +++ b/include/cglm/vec4.h @@ -14,7 +14,11 @@ Macros: glm_vec4_dup3(v, dest) glm_vec4_dup(v, dest) - + GLM_VEC4_ONE_INIT + GLM_VEC4_BLACK_INIT + GLM_VEC4_ONE + GLM_VEC4_BLACK + Functions: CGLM_INLINE void glm_vec4_copy3(vec4 a, vec3 dest); CGLM_INLINE void glm_vec4_copy(vec4 v, vec4 dest); @@ -44,6 +48,12 @@ #define glm_vec4_dup3(v, dest) glm_vec4_copy3(v, dest) #define glm_vec4_dup(v, dest) glm_vec4_copy(v, dest) +#define GLM_VEC4_ONE_INIT {1.0f, 1.0f, 1.0f, 1.0f} +#define GLM_VEC4_BLACK_INIT {0.0f, 0.0f, 0.0f, 1.0f} + +#define GLM_VEC4_ONE (vec4)GLM_VEC4_ONE_INIT +#define GLM_VEC4_BLACK (vec4)GLM_VEC4_BLACK_INIT + /*! * @brief copy first 3 members of [a] to [dest] *