Browse Source

Move noise, random and ulp test to GTC tests

Christophe Riccio 13 years ago
parent
commit
b2f0f4d3f9

+ 4 - 1
glm/gtx/noise.hpp

@@ -22,5 +22,8 @@
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
 
 
 #if(defined(GLM_MESSAGES))
 #if(defined(GLM_MESSAGES))
-#	pragma message("GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random instead")
+#	pragma message("GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random (glm/gtc/noise.hpp) instead")
 #endif
 #endif
+
+// Promoted:
+#include "../gtc/noise.hpp"

+ 3 - 0
glm/gtx/random.hpp

@@ -24,3 +24,6 @@
 #if(defined(GLM_MESSAGES))
 #if(defined(GLM_MESSAGES))
 #	pragma message("GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random instead")
 #	pragma message("GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random instead")
 #endif
 #endif
+
+// Promoted:
+#include "../gtc/random.hpp"

+ 4 - 1
glm/gtx/ulp.hpp

@@ -22,5 +22,8 @@
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
 
 
 #if(defined(GLM_MESSAGES))
 #if(defined(GLM_MESSAGES))
-#	pragma message("GLM: GLM_GTX_ulp extension is deprecated, include GLM_GTC_ulp instead")
+#	pragma message("GLM: GLM_GTX_ulp extension is deprecated, include GLM_GTC_ulp (glm/gtc/ulp.hpp) instead")
 #endif
 #endif
+
+// Promoted:
+#include "../gtc/ulp.hpp"

+ 1 - 0
test/gtc/CMakeLists.txt

@@ -9,3 +9,4 @@ glmCreateTestGTC(gtc_random)
 glmCreateTestGTC(gtc_swizzle)
 glmCreateTestGTC(gtc_swizzle)
 glmCreateTestGTC(gtc_type_precision)
 glmCreateTestGTC(gtc_type_precision)
 glmCreateTestGTC(gtc_type_ptr)
 glmCreateTestGTC(gtc_type_ptr)
+glmCreateTestGTC(gtc_ulp)

+ 0 - 0
test/gtx/gtx_ulp.cpp → test/gtc/gtc_ulp.cpp


+ 0 - 2
test/gtx/CMakeLists.txt

@@ -4,11 +4,9 @@ glmCreateTestGTC(gtx_integer)
 glmCreateTestGTC(gtx_matrix_query)
 glmCreateTestGTC(gtx_matrix_query)
 glmCreateTestGTC(gtx_noise)
 glmCreateTestGTC(gtx_noise)
 glmCreateTestGTC(gtx_quaternion)
 glmCreateTestGTC(gtx_quaternion)
-glmCreateTestGTC(gtx_random)
 glmCreateTestGTC(gtx_rotate_vector)
 glmCreateTestGTC(gtx_rotate_vector)
 glmCreateTestGTC(gtx_simd_vec4)
 glmCreateTestGTC(gtx_simd_vec4)
 glmCreateTestGTC(gtx_simd_mat4)
 glmCreateTestGTC(gtx_simd_mat4)
 glmCreateTestGTC(gtx_string_cast)
 glmCreateTestGTC(gtx_string_cast)
-glmCreateTestGTC(gtx_ulp)
 glmCreateTestGTC(gtx_vector_angle)
 glmCreateTestGTC(gtx_vector_angle)
 glmCreateTestGTC(gtx_vector_query)
 glmCreateTestGTC(gtx_vector_query)

+ 5 - 5
test/gtx/gtx_simd_mat4.cpp

@@ -10,7 +10,7 @@
 #include <glm/glm.hpp>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/random.hpp>
+#include <glm/gtc/random.hpp>
 #include <glm/gtx/simd_vec4.hpp>
 #include <glm/gtx/simd_vec4.hpp>
 #include <glm/gtx/simd_mat4.hpp>
 #include <glm/gtx/simd_mat4.hpp>
 #include <iostream>
 #include <iostream>
@@ -238,10 +238,10 @@ int main()
 	std::vector<glm::mat4> Data(64 * 64 * 1);
 	std::vector<glm::mat4> Data(64 * 64 * 1);
 	for(std::size_t i = 0; i < Data.size(); ++i)
 	for(std::size_t i = 0; i < Data.size(); ++i)
 		Data[i] = glm::mat4(
 		Data[i] = glm::mat4(
-			glm::vec4(glm::compRand4(-2.0f, 2.0f)),
-			glm::vec4(glm::compRand4(-2.0f, 2.0f)),
-			glm::vec4(glm::compRand4(-2.0f, 2.0f)),
-			glm::vec4(glm::compRand4(-2.0f, 2.0f)));
+			glm::vec4(glm::linearRand(glm::vec4(-2.0f), glm::vec4(2.0f))),
+			glm::vec4(glm::linearRand(glm::vec4(-2.0f), glm::vec4(2.0f))),
+			glm::vec4(glm::linearRand(glm::vec4(-2.0f), glm::vec4(2.0f))),
+			glm::vec4(glm::linearRand(glm::vec4(-2.0f), glm::vec4(2.0f))));
 
 
 	{
 	{
 		std::vector<glm::mat4> TestInvA;
 		std::vector<glm::mat4> TestInvA;