mewin/glm
1
0
Fork 0
Code Releases Activity

Renamed equalEpsilon function into epsilonEqual and added tests

Browse Source
This commit is contained in:
Christophe Riccio
2012-11-05 19:39:22 +01:00
parent a350a26e3b
commit 9d9a625493
8 changed files with 77 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/gtc/gtc_constants.cpp
View File

@@ -14,7 +14,7 @@ int main()
{
int Error(0);
return Error;
}

44
test/gtc/gtc_epsilon.cpp
View File

@@ -8,13 +8,55 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
#include <glm/glm.hpp>
#include <glm/gtc/half_float.hpp>
#include <glm/gtc/epsilon.hpp>
#include <glm/gtc/constants.hpp>
template <typename T>
int test_equal()
{
int Error(0);
{
T A = glm::epsilon<T>();
T B = glm::epsilon<T>();
Error += glm::epsilonEqual(A, B, glm::epsilon<T>()) ? 0 : 1;
}
{
T A(0);
T B = T(0) + glm::epsilon<T>();
Error += glm::epsilonEqual(A, B, glm::epsilon<T>()) ? 0 : 1;
}
{
T A(0);
T B = T(0) - glm::epsilon<T>();
Error += glm::epsilonEqual(A, B, glm::epsilon<T>()) ? 0 : 1;
}
{
T A = T(0) + glm::epsilon<T>();
T B = T(0);
Error += glm::epsilonEqual(A, B, glm::epsilon<T>()) ? 0 : 1;
}
{
T A = T(0) - glm::epsilon<T>();
T B = T(0);
Error += glm::epsilonEqual(A, B, glm::epsilon<T>()) ? 0 : 1;
}
return Error;
}
int main()
{
int Error(0);
Error += test_equal<glm::half>();
Error += test_equal<float>();
Error += test_equal<double>();
return Error;
}

16
test/gtx/gtx_quaternion.cpp
View File

@@ -20,10 +20,10 @@ int test_quat_fastMix()
glm::quat C = glm::fastMix(A, B, 0.5f);
glm::quat D = glm::angleAxis(45.0f, glm::vec3(0, 0, 1));
Error += glm::equalEpsilon(C.x, D.x, 0.01f) ? 0 : 1;
Error += glm::equalEpsilon(C.y, D.y, 0.01f) ? 0 : 1;
Error += glm::equalEpsilon(C.z, D.z, 0.01f) ? 0 : 1;
Error += glm::equalEpsilon(C.w, D.w, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.x, D.x, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.y, D.y, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.z, D.z, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.w, D.w, 0.01f) ? 0 : 1;
return Error;
}
@@ -37,10 +37,10 @@ int test_quat_shortMix()
glm::quat C = glm::shortMix(A, B, 0.5f);
glm::quat D = glm::angleAxis(45.0f, glm::vec3(0, 0, 1));
Error += glm::equalEpsilon(C.x, D.x, 0.01f) ? 0 : 1;
Error += glm::equalEpsilon(C.y, D.y, 0.01f) ? 0 : 1;
Error += glm::equalEpsilon(C.z, D.z, 0.01f) ? 0 : 1;
Error += glm::equalEpsilon(C.w, D.w, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.x, D.x, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.y, D.y, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.z, D.z, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(C.w, D.w, 0.01f) ? 0 : 1;
return Error;
}

6
test/gtx/gtx_vector_angle.cpp
View File

@@ -17,11 +17,11 @@ int test_angle()
int Error = 0;
float AngleA = glm::angle(glm::vec2(1, 0), glm::normalize(glm::vec2(1, 1)));
Error += glm::equalEpsilon(AngleA, 45.f, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(AngleA, 45.f, 0.01f) ? 0 : 1;
float AngleB = glm::angle(glm::vec3(1, 0, 0), glm::normalize(glm::vec3(1, 1, 0)));
Error += glm::equalEpsilon(AngleB, 45.f, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(AngleB, 45.f, 0.01f) ? 0 : 1;
float AngleC = glm::angle(glm::vec4(1, 0, 0, 0), glm::normalize(glm::vec4(1, 1, 0, 0)));
Error += glm::equalEpsilon(AngleC, 45.f, 0.01f) ? 0 : 1;
Error += glm::epsilonEqual(AngleC, 45.f, 0.01f) ? 0 : 1;
return Error;
}