diff --git a/test/core/core_type_mat2x2.cpp b/test/core/core_type_mat2x2.cpp index ea5145ca..6f6fef63 100644 --- a/test/core/core_type_mat2x2.cpp +++ b/test/core/core_type_mat2x2.cpp @@ -124,6 +124,11 @@ int main() { int Error(0); +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat2::rows == glm::mat2::row_type::components); + assert(glm::mat2::cols == glm::mat2::col_type::components); +#endif + Error += test_ctr(); Error += test_operators(); Error += test_inverse(); diff --git a/test/core/core_type_mat2x3.cpp b/test/core/core_type_mat2x3.cpp index 45cad31b..195a94d2 100644 --- a/test/core/core_type_mat2x3.cpp +++ b/test/core/core_type_mat2x3.cpp @@ -98,6 +98,11 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat2x3::rows == glm::mat2x3::row_type::components); + assert(glm::mat2x3::cols == glm::mat2x3::col_type::components); +#endif + Error += test_ctr(); Error += test_operators(); diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp index 4811ee09..c030d98d 100644 --- a/test/core/core_type_mat2x4.cpp +++ b/test/core/core_type_mat2x4.cpp @@ -98,6 +98,11 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat2x4::rows == glm::mat2x4::row_type::components); + assert(glm::mat2x4::cols == glm::mat2x4::col_type::components); +#endif + Error += test_ctr(); Error += test_operators(); diff --git a/test/core/core_type_mat3x2.cpp b/test/core/core_type_mat3x2.cpp index a1b631e6..9ff88783 100644 --- a/test/core/core_type_mat3x2.cpp +++ b/test/core/core_type_mat3x2.cpp @@ -102,6 +102,11 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat3x2::rows == glm::mat3x2::row_type::components); + assert(glm::mat3x2::cols == glm::mat3x2::col_type::components); +#endif + Error += test_ctr(); Error += test_operators(); diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp index d4d5f3a0..5555cdf0 100644 --- a/test/core/core_type_mat3x3.cpp +++ b/test/core/core_type_mat3x3.cpp @@ -161,6 +161,11 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat3::rows == glm::mat3::row_type::components); + assert(glm::mat3::cols == glm::mat3::col_type::components); +#endif + Error += test_ctr(); Error += test_mat3x3(); Error += test_operators(); diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp index 0b29887a..3d7c380a 100644 --- a/test/core/core_type_mat3x4.cpp +++ b/test/core/core_type_mat3x4.cpp @@ -101,7 +101,12 @@ int test_ctr() int main() { int Error = 0; - + +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat3x4::rows == glm::mat3x4::row_type::components); + assert(glm::mat3x4::cols == glm::mat3x4::col_type::components); +#endif + Error += test_ctr(); Error += test_operators(); diff --git a/test/core/core_type_mat4x2.cpp b/test/core/core_type_mat4x2.cpp index 13bea3f6..f732478b 100644 --- a/test/core/core_type_mat4x2.cpp +++ b/test/core/core_type_mat4x2.cpp @@ -106,6 +106,11 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat4x2::rows == glm::mat4x2::row_type::components); + assert(glm::mat4x2::cols == glm::mat4x2::col_type::components); +#endif + Error += test_ctr(); Error += test_operators(); diff --git a/test/core/core_type_mat4x3.cpp b/test/core/core_type_mat4x3.cpp index a91f7e25..f8b6aa62 100644 --- a/test/core/core_type_mat4x3.cpp +++ b/test/core/core_type_mat4x3.cpp @@ -106,6 +106,11 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat4x3::rows == glm::mat4x3::row_type::components); + assert(glm::mat4x3::cols == glm::mat4x3::col_type::components); +#endif + Error += test_ctr(); Error += test_operators(); diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index c37f2deb..4a073c02 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -278,6 +278,11 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::mat4::rows == glm::mat4::row_type::components); + assert(glm::mat4::cols == glm::mat4::col_type::components); +#endif + Error += test_ctr(); Error += test_inverse_dmat4x4(); Error += test_inverse_mat4x4(); diff --git a/test/core/core_type_vec1.cpp b/test/core/core_type_vec1.cpp index f648e9d2..9a14efe1 100644 --- a/test/core/core_type_vec1.cpp +++ b/test/core/core_type_vec1.cpp @@ -190,6 +190,7 @@ int main() assert(v.length() == 1); # ifdef GLM_META_PROG_HELPERS + assert(glm::vec1::components == glm::vec1().length()); assert(glm::vec1::components == 1); # endif diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index 2701d7a6..3f6cee99 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -349,6 +349,7 @@ int main() assert(v.length() == 2); # ifdef GLM_META_PROG_HELPERS + assert(glm::vec2::components == glm::vec2().length()); assert(glm::vec2::components == 2); # endif diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index 025253d5..2e41729f 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -517,6 +517,7 @@ int main() assert(v.length() == 3); # ifdef GLM_META_PROG_HELPERS + assert(glm::vec3::components == glm::vec3().length()); assert(glm::vec3::components == 3); # endif diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index 2a3adfd9..be3eb30c 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -493,6 +493,7 @@ int main() assert(v.length() == 4); # ifdef GLM_META_PROG_HELPERS + assert(glm::vec4::components == glm::vec4().length()); assert(glm::vec4::components == 4); # endif diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp index d9b3ddf1..4c3b74ce 100644 --- a/test/gtc/gtc_quaternion.cpp +++ b/test/gtc/gtc_quaternion.cpp @@ -325,7 +325,10 @@ int main() { int Error(0); - assert(glm::quat::components == 4); +#ifdef GLM_META_PROG_HELPERS + assert(glm::quat::components == 4); + assert(glm::quat::components == glm::quat().length()); +#endif Error += test_quat_ctr(); Error += test_quat_mul_vec(); diff --git a/test/gtx/gtx_dual_quaternion.cpp b/test/gtx/gtx_dual_quaternion.cpp index 01a81b3d..c3fdaccc 100644 --- a/test/gtx/gtx_dual_quaternion.cpp +++ b/test/gtx/gtx_dual_quaternion.cpp @@ -209,6 +209,10 @@ int main() { int Error(0); +#ifdef GLM_META_PROG_HELPERS + assert(glm::dualquat::components == glm::dualquat().length()); +#endif + Error += test_dual_quat_ctr(); Error += test_dquat_type(); Error += test_scalars(); diff --git a/test/gtx/gtx_simd_mat4.cpp b/test/gtx/gtx_simd_mat4.cpp index c7ea4592..11230466 100644 --- a/test/gtx/gtx_simd_mat4.cpp +++ b/test/gtx/gtx_simd_mat4.cpp @@ -256,6 +256,15 @@ int main() { int Error = 0; +#ifdef GLM_META_PROG_HELPERS + assert(glm::simdMat4::rows == glm::simdMat4::row_type::components); + assert(glm::simdMat4::cols == glm::simdMat4::col_type::components); + + assert(glm::simdMat4::components == glm::simdMat4::pure_type::components); + assert(glm::simdMat4::rows == glm::simdMat4::pure_row_type::components); + assert(glm::simdMat4::cols == glm::simdMat4::pure_col_type::components); +#endif + std::vector Data(64 * 64 * 1); for(std::size_t i = 0; i < Data.size(); ++i) Data[i] = glm::mat4( diff --git a/test/gtx/gtx_simd_vec4.cpp b/test/gtx/gtx_simd_vec4.cpp index e71a60b9..b86eb272 100644 --- a/test/gtx/gtx_simd_vec4.cpp +++ b/test/gtx/gtx_simd_vec4.cpp @@ -37,6 +37,11 @@ int main() { + +#ifdef GLM_META_PROG_HELPERS + assert(glm::simdVec4::components == glm::simdVec4::pure_type::components); +#endif + glm::simdVec4 A1(0.0f, 0.1f, 0.2f, 0.3f); glm::simdVec4 B1(0.4f, 0.5f, 0.6f, 0.7f); glm::simdVec4 C1 = A1 + B1;