Merge pull request #368 from JesseTG/jtg/oops-sorry

Fixed some of my own metaprogramming-helper mistakes #368

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();

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();
 

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();
 

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();
 

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();

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();
 

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();
 

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();
 

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();

test/core/core_type_vec1.cpp

@@ -174,6 +174,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
 

test/core/core_type_vec2.cpp

@@ -333,6 +333,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
 

test/core/core_type_vec3.cpp

@@ -501,6 +501,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
 

test/core/core_type_vec4.cpp

@@ -477,6 +477,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