mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-25 01:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GTX_norm cyclic include

Browse Source
This commit is contained in:
Christophe 2024-03-05 18:38:38 +01:00 committed by Christophe
parent e009bcbe7c
commit 61caae4d05
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glm/gtx/norm.hpp
View File

@ -16,7 +16,6 @@
// Dependency: // Dependency:
#include "../geometric.hpp" #include "../geometric.hpp"
#include "../gtx/quaternion.hpp"
#include "../gtx/component_wise.hpp" #include "../gtx/component_wise.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL #ifndef GLM_ENABLE_EXPERIMENTAL

28
test/gtx/gtx_norm.cpp
View File

@ -1,5 +1,9 @@
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/norm.hpp> #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() static int test_lMaxNorm()
{ {
@ -7,12 +11,12 @@ static int test_lMaxNorm()
{ {
float norm = glm::lMaxNorm(glm::vec3(-1, -2, -3)); 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)); 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; return Error;
@ -26,44 +30,44 @@ static int test_lxNorm()
unsigned int depth_1 = 1; unsigned int depth_1 = 1;
float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_1); float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_1);
float normB = glm::l1Norm(glm::vec3(2, 3, 1)); float normB = glm::l1Norm(glm::vec3(2, 3, 1));
Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
Error += glm::epsilonEqual(normA, 6.f, 0.00001f) ? 0 : 1; Error += glm::equal(normA, 6.f, 0.00001f) ? 0 : 1;
} }
{ {
unsigned int depth_1 = 1; unsigned int depth_1 = 1;
float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_1); float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_1);
float normB = glm::l1Norm(glm::vec3(-1, -2, -3)); float normB = glm::l1Norm(glm::vec3(-1, -2, -3));
Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
Error += glm::epsilonEqual(normA, 6.f, 0.00001f) ? 0 : 1; Error += glm::equal(normA, 6.f, 0.00001f) ? 0 : 1;
} }
{ {
unsigned int depth_2 = 2; unsigned int depth_2 = 2;
float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_2); float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_2);
float normB = glm::l2Norm(glm::vec3(2, 3, 1)); float normB = glm::l2Norm(glm::vec3(2, 3, 1));
Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
Error += glm::epsilonEqual(normA, 3.741657387f, 0.00001f) ? 0 : 1; Error += glm::equal(normA, 3.741657387f, 0.00001f) ? 0 : 1;
} }
{ {
unsigned int depth_2 = 2; unsigned int depth_2 = 2;
float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_2); float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_2);
float normB = glm::l2Norm(glm::vec3(-1, -2, -3)); float normB = glm::l2Norm(glm::vec3(-1, -2, -3));
Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; Error += glm::equal(normA, normB, 0.00001f) ? 0 : 1;
Error += glm::epsilonEqual(normA, 3.741657387f, 0.00001f) ? 0 : 1; Error += glm::equal(normA, 3.741657387f, 0.00001f) ? 0 : 1;
} }
{ {
unsigned int oddDepth = 3; unsigned int oddDepth = 3;
float norm = glm::lxNorm(glm::vec3(2, 3, 1), oddDepth); 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; unsigned int oddDepth = 3;
float norm = glm::lxNorm(glm::vec3(-1, -2, -3), oddDepth); 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; return Error;