Fix GTX_norm cyclic include

g-truc · Mar 5, 2024 · 2e4f01a · 2e4f01a
1 parent 49942a6
commit 2e4f01a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp
@@ -16,7 +16,6 @@
 
 // Dependency:
 #include "../geometric.hpp"
-#include "../gtx/quaternion.hpp"
 #include "../gtx/component_wise.hpp"
 
 #ifndef GLM_ENABLE_EXPERIMENTAL

diff --git a/test/gtx/gtx_norm.cpp b/test/gtx/gtx_norm.cpp
@@ -1,18 +1,22 @@
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/norm.hpp>
+#include <glm/ext/scalar_relational.hpp>
+#include <glm/vec2.hpp>
+#include <glm/vec3.hpp>
+#include <glm/vec4.hpp>
 
 static int test_lMaxNorm()
 {
 	int Error(0);
 
 	{
 		float norm = glm::lMaxNorm(glm::vec3(-1, -2, -3));
-		Error += glm::epsilonEqual(norm, 3.f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(norm, 3.f, 0.00001f) ? 0 : 1;
 	}
 
 	{
 		float norm = glm::lMaxNorm(glm::vec3(2, 3, 1));
-		Error += glm::epsilonEqual(norm, 3.f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(norm, 3.f, 0.00001f) ? 0 : 1;
 	}
 
 	return Error;
@@ -26,44 +30,44 @@ static int test_lxNorm()
 		unsigned int depth_1 = 1;
 		float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_1);
 		float normB = glm::l1Norm(glm::vec3(2, 3, 1));
-		Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1;
-		Error += glm::epsilonEqual(normA, 6.f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, 6.f, 0.00001f) ? 0 : 1;
 	}
 
 	{
 		unsigned int depth_1 = 1;
 		float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_1);
 		float normB = glm::l1Norm(glm::vec3(-1, -2, -3));
-		Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1;
-		Error += glm::epsilonEqual(normA, 6.f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, 6.f, 0.00001f) ? 0 : 1;
 	}
 
 	{
 		unsigned int depth_2 = 2;
 		float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_2);
 		float normB = glm::l2Norm(glm::vec3(2, 3, 1));
-		Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1;
-		Error += glm::epsilonEqual(normA, 3.741657387f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, 3.741657387f, 0.00001f) ? 0 : 1;
 	}
 
 	{
 		unsigned int depth_2 = 2;
 		float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_2);
 		float normB = glm::l2Norm(glm::vec3(-1, -2, -3));
-		Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1;
-		Error += glm::epsilonEqual(normA, 3.741657387f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
+		Error += glm::equal(normA, 3.741657387f, 0.00001f) ? 0 : 1;
 	}
 
 	{
 		unsigned int oddDepth = 3;
 		float norm = glm::lxNorm(glm::vec3(2, 3, 1), oddDepth);
-		Error += glm::epsilonEqual(norm, 3.301927249f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(norm, 3.301927249f, 0.00001f) ? 0 : 1;
 	}
 
 	{
 		unsigned int oddDepth = 3;
 		float norm = glm::lxNorm(glm::vec3(-1, -2, -3), oddDepth);
-		Error += glm::epsilonEqual(norm, 3.301927249f, 0.00001f) ? 0 : 1;
+		Error += glm::equal(norm, 3.301927249f, 0.00001f) ? 0 : 1;
 	}
 
 	return Error;