mewin/glm
1
0
Fork 0
Code Releases Activity

Added vector ulp functions

Browse Source
This commit is contained in:
Christophe Riccio
2018-09-26 18:27:55 +02:00
parent 32573c86ec
commit 76683aa287
11 changed files with 796 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
test/core/core_func_exponential.cpp
View File

@@ -1,31 +1,31 @@
#include <glm/common.hpp>
#include <glm/exponential.hpp>
#include <glm/gtc/constants.hpp>
#include <glm/gtc/ulp.hpp>
#include <glm/ext/scalar_relational.hpp>
#include <glm/ext/vector_relational.hpp>
#include <glm/ext/vector_float1.hpp>
#include <glm/ext/vector_float2.hpp>
#include <glm/ext/vector_float3.hpp>
#include <glm/ext/vector_float4.hpp>
#include <glm/common.hpp>
#include <glm/exponential.hpp>
static int test_pow()
{
int Error(0);
float A = glm::pow(2.f, 2.f);
Error += glm::epsilonEqual(A, 4.f, 0.01f) ? 0 : 1;
Error += glm::equal(A, 4.f, 0.01f) ? 0 : 1;
glm::vec1 B = glm::pow(glm::vec1(2.f), glm::vec1(2.f));
Error += glm::all(glm::epsilonEqual(B, glm::vec1(4.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(B, glm::vec1(4.f), 0.01f)) ? 0 : 1;
glm::vec2 C = glm::pow(glm::vec2(2.f), glm::vec2(2.f));
Error += glm::all(glm::epsilonEqual(C, glm::vec2(4.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(C, glm::vec2(4.f), 0.01f)) ? 0 : 1;
glm::vec3 D = glm::pow(glm::vec3(2.f), glm::vec3(2.f));
Error += glm::all(glm::epsilonEqual(D, glm::vec3(4.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(D, glm::vec3(4.f), 0.01f)) ? 0 : 1;
glm::vec4 E = glm::pow(glm::vec4(2.f), glm::vec4(2.f));
Error += glm::all(glm::epsilonEqual(E, glm::vec4(4.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(E, glm::vec4(4.f), 0.01f)) ? 0 : 1;
return Error;
}
@@ -35,42 +35,41 @@ static int test_sqrt()
int Error = 0;
float A = glm::sqrt(4.f);
Error += glm::epsilonEqual(A, 2.f, 0.01f) ? 0 : 1;
Error += glm::equal(A, 2.f, 0.01f) ? 0 : 1;
glm::vec1 B = glm::sqrt(glm::vec1(4.f));
Error += glm::all(glm::epsilonEqual(B, glm::vec1(2.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(B, glm::vec1(2.f), 0.01f)) ? 0 : 1;
glm::vec2 C = glm::sqrt(glm::vec2(4.f));
Error += glm::all(glm::epsilonEqual(C, glm::vec2(2.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(C, glm::vec2(2.f), 0.01f)) ? 0 : 1;
glm::vec3 D = glm::sqrt(glm::vec3(4.f));
Error += glm::all(glm::epsilonEqual(D, glm::vec3(2.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(D, glm::vec3(2.f), 0.01f)) ? 0 : 1;
glm::vec4 E = glm::sqrt(glm::vec4(4.f));
Error += glm::all(glm::epsilonEqual(E, glm::vec4(2.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(E, glm::vec4(2.f), 0.01f)) ? 0 : 1;
return Error;
}
static int test_exp()
{
int Error = 0;
float A = glm::exp(1.f);
Error += glm::epsilonEqual(A, glm::e<float>(), 0.01f) ? 0 : 1;
Error += glm::equal(A, glm::e<float>(), 0.01f) ? 0 : 1;
glm::vec1 B = glm::exp(glm::vec1(1.f));
Error += glm::all(glm::epsilonEqual(B, glm::vec1(glm::e<float>()), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(B, glm::vec1(glm::e<float>()), 0.01f)) ? 0 : 1;
glm::vec2 C = glm::exp(glm::vec2(1.f));
Error += glm::all(glm::epsilonEqual(C, glm::vec2(glm::e<float>()), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(C, glm::vec2(glm::e<float>()), 0.01f)) ? 0 : 1;
glm::vec3 D = glm::exp(glm::vec3(1.f));
Error += glm::all(glm::epsilonEqual(D, glm::vec3(glm::e<float>()), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(D, glm::vec3(glm::e<float>()), 0.01f)) ? 0 : 1;
glm::vec4 E = glm::exp(glm::vec4(1.f));
Error += glm::all(glm::epsilonEqual(E, glm::vec4(glm::e<float>()), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(E, glm::vec4(glm::e<float>()), 0.01f)) ? 0 : 1;
return Error;
}
@@ -80,19 +79,19 @@ static int test_log()
int Error = 0;
float const A = glm::log(glm::e<float>());
Error += glm::epsilonEqual(A, 1.f, 0.01f) ? 0 : 1;
Error += glm::equal(A, 1.f, 0.01f) ? 0 : 1;
glm::vec1 const B = glm::log(glm::vec1(glm::e<float>()));
Error += glm::all(glm::epsilonEqual(B, glm::vec1(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(B, glm::vec1(1.f), 0.01f)) ? 0 : 1;
glm::vec2 const C = glm::log(glm::vec2(glm::e<float>()));
Error += glm::all(glm::epsilonEqual(C, glm::vec2(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(C, glm::vec2(1.f), 0.01f)) ? 0 : 1;
glm::vec3 const D = glm::log(glm::vec3(glm::e<float>()));
Error += glm::all(glm::epsilonEqual(D, glm::vec3(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(D, glm::vec3(1.f), 0.01f)) ? 0 : 1;
glm::vec4 const E = glm::log(glm::vec4(glm::e<float>()));
Error += glm::all(glm::epsilonEqual(E, glm::vec4(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(E, glm::vec4(1.f), 0.01f)) ? 0 : 1;
return Error;
}
@@ -102,26 +101,26 @@ static int test_exp2()
int Error = 0;
float A = glm::exp2(4.f);
Error += glm::epsilonEqual(A, 16.f, 0.01f) ? 0 : 1;
Error += glm::equal(A, 16.f, 0.01f) ? 0 : 1;
glm::vec1 B = glm::exp2(glm::vec1(4.f));
Error += glm::all(glm::epsilonEqual(B, glm::vec1(16.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(B, glm::vec1(16.f), 0.01f)) ? 0 : 1;
glm::vec2 C = glm::exp2(glm::vec2(4.f, 3.f));
Error += glm::all(glm::epsilonEqual(C, glm::vec2(16.f, 8.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(C, glm::vec2(16.f, 8.f), 0.01f)) ? 0 : 1;
glm::vec3 D = glm::exp2(glm::vec3(4.f, 3.f, 2.f));
Error += glm::all(glm::epsilonEqual(D, glm::vec3(16.f, 8.f, 4.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(D, glm::vec3(16.f, 8.f, 4.f), 0.01f)) ? 0 : 1;
glm::vec4 E = glm::exp2(glm::vec4(4.f, 3.f, 2.f, 1.f));
Error += glm::all(glm::epsilonEqual(E, glm::vec4(16.f, 8.f, 4.f, 2.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(E, glm::vec4(16.f, 8.f, 4.f, 2.f), 0.01f)) ? 0 : 1;
# if GLM_HAS_CXX11_STL
//large exponent
float F = glm::exp2(23.f);
Error += glm::epsilonEqual(F, 8388608.f, 0.01f) ? 0 : 1;
//large exponent
float F = glm::exp2(23.f);
Error += glm::equal(F, 8388608.f, 0.01f) ? 0 : 1;
# endif
return Error;
}
@@ -130,19 +129,19 @@ static int test_log2()
int Error = 0;
float A = glm::log2(16.f);
Error += glm::epsilonEqual(A, 4.f, 0.01f) ? 0 : 1;
Error += glm::equal(A, 4.f, 0.01f) ? 0 : 1;
glm::vec1 B = glm::log2(glm::vec1(16.f));
Error += glm::all(glm::epsilonEqual(B, glm::vec1(4.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(B, glm::vec1(4.f), 0.01f)) ? 0 : 1;
glm::vec2 C = glm::log2(glm::vec2(16.f, 8.f));
Error += glm::all(glm::epsilonEqual(C, glm::vec2(4.f, 3.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(C, glm::vec2(4.f, 3.f), 0.01f)) ? 0 : 1;
glm::vec3 D = glm::log2(glm::vec3(16.f, 8.f, 4.f));
Error += glm::all(glm::epsilonEqual(D, glm::vec3(4.f, 3.f, 2.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(D, glm::vec3(4.f, 3.f, 2.f), 0.01f)) ? 0 : 1;
glm::vec4 E = glm::log2(glm::vec4(16.f, 8.f, 4.f, 2.f));
Error += glm::all(glm::epsilonEqual(E, glm::vec4(4.f, 3.f, 2.f, 1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(E, glm::vec4(4.f, 3.f, 2.f, 1.f), 0.01f)) ? 0 : 1;
return Error;
}
@@ -152,19 +151,19 @@ static int test_inversesqrt()
int Error = 0;
float A = glm::inversesqrt(16.f) * glm::sqrt(16.f);
Error += glm::epsilonEqual(A, 1.f, 0.01f) ? 0 : 1;
Error += glm::equal(A, 1.f, 0.01f) ? 0 : 1;
glm::vec1 B = glm::inversesqrt(glm::vec1(16.f)) * glm::sqrt(16.f);;
Error += glm::all(glm::epsilonEqual(B, glm::vec1(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(B, glm::vec1(1.f), 0.01f)) ? 0 : 1;
glm::vec2 C = glm::inversesqrt(glm::vec2(16.f)) * glm::sqrt(16.f);;
Error += glm::all(glm::epsilonEqual(C, glm::vec2(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(C, glm::vec2(1.f), 0.01f)) ? 0 : 1;
glm::vec3 D = glm::inversesqrt(glm::vec3(16.f)) * glm::sqrt(16.f);;
Error += glm::all(glm::epsilonEqual(D, glm::vec3(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(D, glm::vec3(1.f), 0.01f)) ? 0 : 1;
glm::vec4 E = glm::inversesqrt(glm::vec4(16.f)) * glm::sqrt(16.f);
Error += glm::all(glm::epsilonEqual(E, glm::vec4(1.f), 0.01f)) ? 0 : 1;
Error += glm::all(glm::equal(E, glm::vec4(1.f), 0.01f)) ? 0 : 1;
return Error;
}

3
test/ext/CMakeLists.txt
View File

@@ -11,6 +11,7 @@ glmCreateTestGTC(ext_scalar_common)
glmCreateTestGTC(ext_scalar_constants)
glmCreateTestGTC(ext_scalar_int_sized)
glmCreateTestGTC(ext_scalar_uint_sized)
glmCreateTestGTC(ext_scalar_ulp)
glmCreateTestGTC(ext_scalar_relational)
glmCreateTestGTC(ext_vec1)
glmCreateTestGTC(ext_vector_bool1)
@@ -18,3 +19,5 @@ glmCreateTestGTC(ext_vector_common)
glmCreateTestGTC(ext_vector_iec559)
glmCreateTestGTC(ext_vector_integer)
glmCreateTestGTC(ext_vector_relational)
glmCreateTestGTC(ext_vector_ulp)

96
test/ext/ext_scalar_ulp.cpp Normal file
View File

@@ -0,0 +1,96 @@
#include <glm/ext/scalar_ulp.hpp>
#include <glm/ext/scalar_relational.hpp>
static int test_ulp_float_dist()
{
int Error = 0;
float A = 1.0f;
float B = glm::next_float(A);
Error += glm::notEqual(A, B, 0) ? 0 : 1;
float C = glm::prev_float(B);
Error += glm::equal(A, C, 0) ? 0 : 1;
int D = glm::float_distance(A, B);
Error += D == 1 ? 0 : 1;
int E = glm::float_distance(A, C);
Error += E == 0 ? 0 : 1;
return Error;
}
static int test_ulp_float_step()
{
int Error = 0;
float A = 1.0f;
for(int i = 10; i < 1000; i *= 10)
{
float B = glm::next_float(A, i);
Error += glm::notEqual(A, B, 0) ? 0 : 1;
float C = glm::prev_float(B, i);
Error += glm::equal(A, C, 0) ? 0 : 1;
int D = glm::float_distance(A, B);
Error += D == i ? 0 : 1;
int E = glm::float_distance(A, C);
Error += E == 0 ? 0 : 1;
}
return Error;
}
static int test_ulp_double_dist()
{
int Error = 0;
double A = 1.0;
double B = glm::next_float(A);
Error += glm::notEqual(A, B, 0) ? 0 : 1;
double C = glm::prev_float(B);
Error += glm::equal(A, C, 0) ? 0 : 1;
glm::int64 const D = glm::float_distance(A, B);
Error += D == 1 ? 0 : 1;
glm::int64 const E = glm::float_distance(A, C);
Error += E == 0 ? 0 : 1;
return Error;
}
static int test_ulp_double_step()
{
int Error = 0;
double A = 1.0;
for(int i = 10; i < 1000; i *= 10)
{
double B = glm::next_float(A, i);
Error += glm::notEqual(A, B, 0) ? 0 : 1;
double C = glm::prev_float(B, i);
Error += glm::equal(A, C, 0) ? 0 : 1;
glm::int64 const D = glm::float_distance(A, B);
Error += D == i ? 0 : 1;
glm::int64 const E = glm::float_distance(A, C);
Error += E == 0 ? 0 : 1;
}
return Error;
}
int main()
{
int Error = 0;
Error += test_ulp_float_dist();
Error += test_ulp_float_step();
Error += test_ulp_double_dist();
Error += test_ulp_double_step();
return Error;
}

99
test/ext/ext_vector_ulp.cpp Normal file
View File

@@ -0,0 +1,99 @@
#include <glm/ext/vector_ulp.hpp>
#include <glm/ext/vector_relational.hpp>
#include <glm/ext/vector_float4.hpp>
#include <glm/ext/vector_double4.hpp>
#include <glm/ext/vector_int4.hpp>
static int test_ulp_float_dist()
{
int Error = 0;
glm::vec4 const A(1.0f);
glm::vec4 const B = glm::next_float(A);
Error += glm::any(glm::notEqual(A, B, 0)) ? 0 : 1;
glm::vec4 const C = glm::prev_float(B);
Error += glm::all(glm::equal(A, C, 0)) ? 0 : 1;
glm::ivec4 const D = glm::float_distance(A, B);
Error += D == glm::ivec4(1) ? 0 : 1;
glm::ivec4 const E = glm::float_distance(A, C);
Error += E == glm::ivec4(0) ? 0 : 1;
return Error;
}
static int test_ulp_float_step()
{
int Error = 0;
glm::vec4 const A(1.0f);
for(int i = 10; i < 1000; i *= 10)
{
glm::vec4 const B = glm::next_float(A, i);
Error += glm::any(glm::notEqual(A, B, 0)) ? 0 : 1;
glm::vec4 const C = glm::prev_float(B, i);
Error += glm::all(glm::equal(A, C, 0)) ? 0 : 1;
glm::ivec4 const D = glm::float_distance(A, B);
Error += D == glm::ivec4(i) ? 0 : 1;
glm::ivec4 const E = glm::float_distance(A, C);
Error += E == glm::ivec4(0) ? 0 : 1;
}
return Error;
}
static int test_ulp_double_dist()
{
int Error = 0;
glm::dvec4 const A(1.0);
glm::dvec4 const B = glm::next_float(A);
Error += glm::any(glm::notEqual(A, B, 0)) ? 0 : 1;
glm::dvec4 const C = glm::prev_float(B);
Error += glm::all(glm::equal(A, C, 0)) ? 0 : 1;
glm::ivec4 const D(glm::float_distance(A, B));
Error += D == glm::ivec4(1) ? 0 : 1;
glm::ivec4 const E = glm::float_distance(A, C);
Error += E == glm::ivec4(0) ? 0 : 1;
return Error;
}
static int test_ulp_double_step()
{
int Error = 0;
glm::dvec4 const A(1.0);
for(int i = 10; i < 1000; i *= 10)
{
glm::dvec4 const B = glm::next_float(A, i);
Error += glm::any(glm::notEqual(A, B, 0)) ? 0 : 1;
glm::dvec4 const C = glm::prev_float(B, i);
Error += glm::all(glm::equal(A, C, 0)) ? 0 : 1;
glm::ivec4 const D(glm::float_distance(A, B));
Error += D == glm::ivec4(i) ? 0 : 1;
glm::ivec4 const E(glm::float_distance(A, C));
Error += E == glm::ivec4(0) ? 0 : 1;
}
return Error;
}
int main()
{
int Error = 0;
Error += test_ulp_float_dist();
Error += test_ulp_float_step();
Error += test_ulp_double_dist();
Error += test_ulp_double_step();
return Error;
}