diff --git a/include/cglm/mat2x3.h b/include/cglm/mat2x3.h
index aca921d..81d682d 100644
--- a/include/cglm/mat2x3.h
+++ b/include/cglm/mat2x3.h
@@ -19,10 +19,10 @@
#include "common.h"
-#define GLM_MAT2X3_ZERO_INIT {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}
+#define GLM_MAT2X3_ZERO_INIT {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}
/* for C only */
-#define GLM_MAT2X3_ZERO ((mat2x3)GLM_MAT2X3_ZERO_INIT)
+#define GLM_MAT2X3_ZERO GLM_MAT2X3_ZERO_INIT
/*!
* @brief Create mat2x3 matrix from pointer
diff --git a/include/cglm/mat2x4.h b/include/cglm/mat2x4.h
index 7a05dad..a77976b 100644
--- a/include/cglm/mat2x4.h
+++ b/include/cglm/mat2x4.h
@@ -22,7 +22,7 @@
#define GLM_MAT2X4_ZERO_INIT {{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}
/* for C only */
-#define GLM_MAT2X4_ZERO GLM_MAT2X4_ZERO_INIT
+#define GLM_MAT2X4_ZERO GLM_MAT2X4_ZERO_INIT
/*!
* @brief Create mat2x4 matrix from pointer
diff --git a/include/cglm/struct/mat2x3.h b/include/cglm/struct/mat2x3.h
index 1d8e79c..659f7cc 100644
--- a/include/cglm/struct/mat2x3.h
+++ b/include/cglm/struct/mat2x3.h
@@ -24,10 +24,10 @@
/* api definition */
#define glms_mat2x3_(NAME) CGLM_STRUCTAPI(mat2x3, NAME)
-#define GLMS_MAT2X3_ZERO_INIT {GLM_MAT2X3_ZERO_INIT}
+#define GLMS_MAT2X3_ZERO_INIT {GLM_MAT2X3_ZERO_INIT}
/* for C only */
-#define GLMS_MAT2X3_ZERO ((mat2x3s)GLMS_MAT2X3_ZERO_INIT)
+#define GLMS_MAT2X3_ZERO ((mat2x3s)GLMS_MAT2X3_ZERO_INIT)
/*!
* @brief Create mat2x3 matrix from pointer
diff --git a/include/cglm/struct/mat2x4.h b/include/cglm/struct/mat2x4.h
index 91cbe03..81cf5da 100644
--- a/include/cglm/struct/mat2x4.h
+++ b/include/cglm/struct/mat2x4.h
@@ -24,10 +24,10 @@
/* api definition */
#define glms_mat2x4_(NAME) CGLM_STRUCTAPI(mat2x4, NAME)
-#define GLMS_MAT2X4_ZERO_INIT {GLM_MAT2X4_ZERO_INIT}
+#define GLMS_MAT2X4_ZERO_INIT {GLM_MAT2X4_ZERO_INIT}
/* for C only */
-#define GLMS_MAT2X4_ZERO ((mat2x4s)GLMS_MAT2X4_ZERO_INIT)
+#define GLMS_MAT2X4_ZERO ((mat2x4s)GLMS_MAT2X4_ZERO_INIT)
/*!
* @brief Create mat2x4 matrix from pointer
diff --git a/test/src/test_mat2x3.h b/test/src/test_mat2x3.h
index 287efc3..566230c 100644
--- a/test/src/test_mat2x3.h
+++ b/test/src/test_mat2x3.h
@@ -10,16 +10,15 @@
#ifndef CGLM_TEST_MAT2X3_ONCE
#define CGLM_TEST_MAT2X3_ONCE
-TEST_IMPL(MACRO_GLM_MAT2X3_ZERO_INIT) {
- mat2x3 m = GLM_MAT2X3_ZERO_INIT;
-
- ASSERT(test_eq(m[0][0], 0.0f))
- ASSERT(test_eq(m[0][1], 0.0f))
- ASSERT(test_eq(m[0][2], 0.0f))
- ASSERT(test_eq(m[1][0], 0.0f))
- ASSERT(test_eq(m[1][1], 0.0f))
- ASSERT(test_eq(m[1][2], 0.0f))
+TEST_IMPL(MACRO_GLM_MAT2X3_ZERO_INIT) {
+ mat2x3 mat2x3_zero = GLM_MAT2X3_ZERO_INIT;
+ test_assert_mat2x3_eq_zero(mat2x3_zero);
+ TEST_SUCCESS
+}
+TEST_IMPL(MACRO_GLM_MAT2X3_ZERO) {
+ mat2x3 mat2x3_zero = GLM_MAT2X3_ZERO;
+ test_assert_mat2x3_eq_zero(mat2x3_zero);
TEST_SUCCESS
}
diff --git a/test/src/test_struct.c b/test/src/test_struct.c
index 83ac0f6..d4c0cd7 100644
--- a/test/src/test_struct.c
+++ b/test/src/test_struct.c
@@ -9,8 +9,12 @@
TEST_IMPL(mat2x3s_zero_init) {
mat2x3s mat2x3_zero = GLMS_MAT2X3_ZERO_INIT;
- mat2x3 mat2x3_zero_a = GLM_MAT2X3_ZERO_INIT;
- test_assert_mat2x3_eq_zero(mat2x3_zero_a);
+ test_assert_mat2x3_eq_zero(mat2x3_zero.raw);
+ TEST_SUCCESS
+}
+
+TEST_IMPL(mat2x3s_zero) {
+ mat2x3s mat2x3_zero = GLMS_MAT2X3_ZERO;
test_assert_mat2x3_eq_zero(mat2x3_zero.raw);
TEST_SUCCESS
}
@@ -21,6 +25,12 @@ TEST_IMPL(mat2x4s_zero_init) {
TEST_SUCCESS
}
+TEST_IMPL(mat2x4s_zero) {
+ mat2x4s mat2x4_zero = GLMS_MAT2X4_ZERO;
+ test_assert_mat2x4_eq_zero(mat2x4_zero.raw);
+ TEST_SUCCESS
+}
+
TEST_IMPL(mat3s_identity_init) {
mat3s mat3_identity = GLMS_MAT3_IDENTITY_INIT;
mat3 mat3_identity_a = GLM_MAT3_IDENTITY_INIT;
diff --git a/test/tests.h b/test/tests.h
index 9e02be1..0ca5a92 100644
--- a/test/tests.h
+++ b/test/tests.h
@@ -228,6 +228,8 @@ TEST_DECLARE(glmc_mat2_swap_row)
TEST_DECLARE(glmc_mat2_rmc)
TEST_DECLARE(glmc_mat2_make)
+TEST_DECLARE(MACRO_GLM_MAT2X3_ZERO_INIT)
+TEST_DECLARE(MACRO_GLM_MAT2X3_ZERO)
TEST_DECLARE(glm_mat2x3_make)
TEST_DECLARE(glmc_mat2x3_make)
@@ -867,6 +869,10 @@ TEST_DECLARE(glmc_ivec4_clamp)
TEST_DECLARE(glmc_ivec4_abs)
/* structs */
+TEST_DECLARE(mat2x3s_zero_init)
+TEST_DECLARE(mat2x3s_zero)
+TEST_DECLARE(mat2x4s_zero_init)
+TEST_DECLARE(mat2x4s_zero)
TEST_DECLARE(mat3s_identity_init)
TEST_DECLARE(mat3s_zero_init)
TEST_DECLARE(mat4s_identity_init)
@@ -1093,6 +1099,8 @@ TEST_LIST {
TEST_ENTRY(glmc_mat2_rmc)
TEST_ENTRY(glmc_mat2_make)
+ TEST_ENTRY(MACRO_GLM_MAT2X3_ZERO_INIT)
+ TEST_ENTRY(MACRO_GLM_MAT2X3_ZERO)
TEST_ENTRY(glm_mat2x3_make)
TEST_ENTRY(glmc_mat2x3_make)
@@ -1729,6 +1737,10 @@ TEST_LIST {
TEST_ENTRY(glmc_ivec4_abs)
/* structs */
+ TEST_ENTRY(mat2x3s_zero_init)
+ TEST_ENTRY(mat2x3s_zero)
+ TEST_ENTRY(mat2x4s_zero_init)
+ TEST_ENTRY(mat2x4s_zero)
TEST_ENTRY(mat3s_identity_init)
TEST_ENTRY(mat3s_zero_init)
TEST_ENTRY(mat4s_identity_init)
diff --git a/win/cglm.vcxproj.filters b/win/cglm.vcxproj.filters
index a22c365..4332c87 100644
--- a/win/cglm.vcxproj.filters
+++ b/win/cglm.vcxproj.filters
@@ -402,6 +402,9 @@
include\cglm\call
+
+ include\cglm\call
+
include\cglm\call
@@ -411,6 +414,9 @@
include\cglm\struct
+
+ include\cglm\struct
+
include\cglm\struct
@@ -420,6 +426,9 @@
include\cglm
+
+ include\cglm
+
include\cglm