From 8ad273475f8c2a0e6e68bcef3bd7cd8ac95a7339 Mon Sep 17 00:00:00 2001
From: Carsten Hartenfels <carsten.hartenfels@gmail.com>
Date: Sun, 24 Nov 2019 13:35:42 -0500
Subject: [PATCH] Make GLMS_ initializers use the GLM_ versions

So that we don't write them twice. More consistent this way.
---
 include/cglm/struct/mat3.h |  8 ++------
 include/cglm/struct/mat4.h | 11 ++---------
 include/cglm/struct/quat.h |  2 +-
 include/cglm/struct/vec3.h | 10 +++++-----
 include/cglm/struct/vec4.h | 18 +++++++++---------
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/include/cglm/struct/mat3.h b/include/cglm/struct/mat3.h
index c5c6a2a..53a7273 100644
--- a/include/cglm/struct/mat3.h
+++ b/include/cglm/struct/mat3.h
@@ -38,12 +38,8 @@
 #include "../mat3.h"
 #include "vec3.h"
 
-#define GLMS_MAT3_IDENTITY_INIT  {{1.0f, 0.0f, 0.0f,                         \
-                                   0.0f, 1.0f, 0.0f,                         \
-                                   0.0f, 0.0f, 1.0f}}
-#define GLMS_MAT3_ZERO_INIT      {{0.0f, 0.0f, 0.0f,                         \
-                                   0.0f, 0.0f, 0.0f,                         \
-                                   0.0f, 0.0f, 0.0f}}
+#define GLMS_MAT3_IDENTITY_INIT  {GLM_MAT3_IDENTITY_INIT}
+#define GLMS_MAT3_ZERO_INIT      {GLM_MAT3_ZERO_INIT}
 
 /* for C only */
 #define GLMS_MAT3_IDENTITY ((mat3s)GLMS_MAT3_IDENTITY_INIT)
diff --git a/include/cglm/struct/mat4.h b/include/cglm/struct/mat4.h
index d27d4ec..28f80a3 100644
--- a/include/cglm/struct/mat4.h
+++ b/include/cglm/struct/mat4.h
@@ -53,15 +53,8 @@
 #include "vec4.h"
 #include "vec3.h"
 
-#define GLMS_MAT4_IDENTITY_INIT  {{1.0f, 0.0f, 0.0f, 0.0f,                   \
-                                   0.0f, 1.0f, 0.0f, 0.0f,                   \
-                                   0.0f, 0.0f, 1.0f, 0.0f,                   \
-                                   0.0f, 0.0f, 0.0f, 1.0f}}
-
-#define GLMS_MAT4_ZERO_INIT      {{0.0f, 0.0f, 0.0f, 0.0f,                   \
-                                   0.0f, 0.0f, 0.0f, 0.0f,                   \
-                                   0.0f, 0.0f, 0.0f, 0.0f,                   \
-                                   0.0f, 0.0f, 0.0f, 0.0f}}
+#define GLMS_MAT4_IDENTITY_INIT  {GLM_MAT4_IDENTITY_INIT}
+#define GLMS_MAT4_ZERO_INIT      {GLM_MAT4_ZERO_INIT}
 
 /* for C only */
 #define GLMS_MAT4_IDENTITY ((mat4s)GLMS_MAT4_IDENTITY_INIT)
diff --git a/include/cglm/struct/quat.h b/include/cglm/struct/quat.h
index 9807632..2938478 100644
--- a/include/cglm/struct/quat.h
+++ b/include/cglm/struct/quat.h
@@ -62,7 +62,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#define GLMS_QUAT_IDENTITY_INIT  GLM_QUAT_IDENTITY_INIT
+#define GLMS_QUAT_IDENTITY_INIT  {GLM_QUAT_IDENTITY_INIT}
 #define GLMS_QUAT_IDENTITY       ((versors)GLMS_QUAT_IDENTITY_INIT)
 
 /*!
diff --git a/include/cglm/struct/vec3.h b/include/cglm/struct/vec3.h
index 3fbec1b..7fa5b06 100644
--- a/include/cglm/struct/vec3.h
+++ b/include/cglm/struct/vec3.h
@@ -86,15 +86,15 @@
 #include "../vec3.h"
 #include "vec3-ext.h"
 
-#define GLMS_VEC3_ONE_INIT   {1.0f, 1.0f, 1.0f}
-#define GLMS_VEC3_ZERO_INIT  {0.0f, 0.0f, 0.0f}
+#define GLMS_VEC3_ONE_INIT   {GLM_VEC3_ONE_INIT}
+#define GLMS_VEC3_ZERO_INIT  {GLM_VEC3_ZERO_INIT}
 
 #define GLMS_VEC3_ONE  ((vec3s)GLMS_VEC3_ONE_INIT)
 #define GLMS_VEC3_ZERO ((vec3s)GLMS_VEC3_ZERO_INIT)
 
-#define GLMS_YUP  ((vec3s){0.0f, 1.0f, 0.0f})
-#define GLMS_ZUP  ((vec3s){0.0f, 0.0f, 1.0f})
-#define GLMS_XUP  ((vec3s){1.0f, 0.0f, 0.0f})
+#define GLMS_YUP  ((vec3s){{0.0f, 1.0f, 0.0f}})
+#define GLMS_ZUP  ((vec3s){{0.0f, 0.0f, 1.0f}})
+#define GLMS_XUP  ((vec3s){{1.0f, 0.0f, 0.0f}})
 
 /*!
  * @brief init vec3 using vec4
diff --git a/include/cglm/struct/vec4.h b/include/cglm/struct/vec4.h
index 7bccf67..4469cb2 100644
--- a/include/cglm/struct/vec4.h
+++ b/include/cglm/struct/vec4.h
@@ -7,12 +7,12 @@
 
 /*
  Macros:
-   GLM_VEC4_ONE_INIT
-   GLM_VEC4_BLACK_INIT
-   GLM_VEC4_ZERO_INIT
-   GLM_VEC4_ONE
-   GLM_VEC4_BLACK
-   GLM_VEC4_ZERO
+   GLMS_VEC4_ONE_INIT
+   GLMS_VEC4_BLACK_INIT
+   GLMS_VEC4_ZERO_INIT
+   GLMS_VEC4_ONE
+   GLMS_VEC4_BLACK
+   GLMS_VEC4_ZERO
 
  Functions:
    CGLM_INLINE vec4s glms_vec4(vec3s v3, float last);
@@ -72,9 +72,9 @@
 #include "../vec4.h"
 #include "vec4-ext.h"
 
-#define GLMS_VEC4_ONE_INIT   {1.0f, 1.0f, 1.0f, 1.0f}
-#define GLMS_VEC4_BLACK_INIT {0.0f, 0.0f, 0.0f, 1.0f}
-#define GLMS_VEC4_ZERO_INIT  {0.0f, 0.0f, 0.0f, 0.0f}
+#define GLMS_VEC4_ONE_INIT   {GLM_VEC4_ONE_INIT}
+#define GLMS_VEC4_BLACK_INIT {GLM_VEC4_BLACK_INIT}
+#define GLMS_VEC4_ZERO_INIT  {GLM_VEC4_ZERO_INIT}
 
 #define GLMS_VEC4_ONE        ((vec4s)GLM_VEC4_ONE_INIT)
 #define GLMS_VEC4_BLACK      ((vec4s)GLM_VEC4_BLACK_INIT)