Browse Source

Tentative fixed of test with GCC

Christophe Riccio 7 years ago
parent
commit
4ed0bf7033
1 changed files with 9 additions and 7 deletions
  1. 9 7
      test/ext/ext_quaternion_geometric.cpp

+ 9 - 7
test/ext/ext_quaternion_geometric.cpp

@@ -12,6 +12,8 @@
 
 
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtc/quaternion.hpp>
 
 
+float const Epsilon = 0.001f;;
+
 static int test_angle()
 static int test_angle()
 {
 {
 	int Error = 0;
 	int Error = 0;
@@ -19,13 +21,13 @@ static int test_angle()
 	{
 	{
 		glm::quat const Q = glm::quat(glm::vec3(1, 0, 0), glm::vec3(0, 1, 0));
 		glm::quat const Q = glm::quat(glm::vec3(1, 0, 0), glm::vec3(0, 1, 0));
 		float const A = glm::degrees(glm::angle(Q));
 		float const A = glm::degrees(glm::angle(Q));
-		Error += glm::equal(A, 90.0f, glm::epsilon<float>()) ? 0 : 1;
+		Error += glm::equal(A, 90.0f, Epsilon) ? 0 : 1;
 	}
 	}
 
 
 	{
 	{
 		glm::quat const Q = glm::quat(glm::vec3(0, 1, 0), glm::vec3(1, 0, 0));
 		glm::quat const Q = glm::quat(glm::vec3(0, 1, 0), glm::vec3(1, 0, 0));
 		float const A = glm::degrees(glm::angle(Q));
 		float const A = glm::degrees(glm::angle(Q));
-		Error += glm::equal(A, 90.0f, glm::epsilon<float>()) ? 0 : 1;
+		Error += glm::equal(A, 90.0f, Epsilon) ? 0 : 1;
 	}
 	}
 
 
 	return Error;
 	return Error;
@@ -37,17 +39,17 @@ static int test_length()
 
 
 	{
 	{
 		float const A = glm::length(glm::quat(1, 0, 0, 0));
 		float const A = glm::length(glm::quat(1, 0, 0, 0));
-		Error += glm::equal(A, 1.0f, glm::epsilon<float>()) ? 0 : 1;
+		Error += glm::equal(A, 1.0f, Epsilon) ? 0 : 1;
 	}
 	}
 
 
 	{
 	{
 		float const A = glm::length(glm::quat(1, glm::vec3(0)));
 		float const A = glm::length(glm::quat(1, glm::vec3(0)));
-		Error += glm::equal(A, 1.0f, glm::epsilon<float>()) ? 0 : 1;
+		Error += glm::equal(A, 1.0f, Epsilon) ? 0 : 1;
 	}
 	}
 
 
 	{
 	{
 		float const A = glm::length(glm::quat(glm::vec3(1, 0, 0), glm::vec3(0, 1, 0)));
 		float const A = glm::length(glm::quat(glm::vec3(1, 0, 0), glm::vec3(0, 1, 0)));
-		Error += glm::equal(A, 1.0f, glm::epsilon<float>()) ? 0 : 1;
+		Error += glm::equal(A, 1.0f, Epsilon) ? 0 : 1;
 	}
 	}
 
 
 	return Error;
 	return Error;
@@ -60,13 +62,13 @@ static int test_normalize()
 	{
 	{
 		glm::quat const A = glm::quat(1, 0, 0, 0);
 		glm::quat const A = glm::quat(1, 0, 0, 0);
 		glm::quat const N = glm::normalize(A);
 		glm::quat const N = glm::normalize(A);
-		Error += glm::all(glm::equal(A, N, glm::epsilon<float>())) ? 0 : 1;
+		Error += glm::all(glm::equal(A, N, Epsilon)) ? 0 : 1;
 	}
 	}
 
 
 	{
 	{
 		glm::quat const A = glm::quat(1, glm::vec3(0));
 		glm::quat const A = glm::quat(1, glm::vec3(0));
 		glm::quat const N = glm::normalize(A);
 		glm::quat const N = glm::normalize(A);
-		Error += glm::all(glm::equal(A, N, glm::epsilon<float>())) ? 0 : 1;
+		Error += glm::all(glm::equal(A, N, Epsilon)) ? 0 : 1;
 	}
 	}
 
 
 	return Error;
 	return Error;