mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio 2011-05-05 13:36:07 +01:00
parent 378da68899
commit 06d0b33f7b
2 changed files with 32 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
glm/gtx/ulp.inl
View File

@ -7,12 +7,19 @@
// File : glm/gtx/ulp.inl
///////////////////////////////////////////////////////////////////////////////////////////////////
#include <cmath>
#include <cfloat>
#if(GLM_COMPILER & GLM_COMPILER_VC)
# include <cfloat>
# define GLM_NEXT_AFTER _nextafterf
# if(GLM_MODEL == GLM_MODEL_32)
# define GLM_NEXT_AFTER_FLT(x, toward) (float)_nextafter(x, float(toward))
# else
# define GLM_NEXT_AFTER_FLT(x, toward) _nextafterf(x, toward)
# endif
# define GLM_NEXT_AFTER_DBL(x, toward) _nextafter(x, toward)
#else
# include <cmath>
# define GLM_NEXT_AFTER nextafterf
# define GLM_NEXT_AFTER_FLT(x, toward) nextafterf(x, toward)
# define GLM_NEXT_AFTER_DBL(x, toward) nextafter(x, toward)
#endif
namespace glm{
@ -21,12 +28,12 @@ namespace ulp
{
GLM_FUNC_QUALIFIER float next_float(float const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<float>::max());
return GLM_NEXT_AFTER_FLT(x, std::numeric_limits<float>::max());
}
GLM_FUNC_QUALIFIER double next_float(double const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<double>::max());
return GLM_NEXT_AFTER_DBL(x, std::numeric_limits<double>::max());
}
template<typename T, template<typename> class vecType>
@ -40,12 +47,12 @@ namespace ulp
GLM_FUNC_QUALIFIER float prev_float(float const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<float>::min());
return GLM_NEXT_AFTER_FLT(x, std::numeric_limits<float>::min());
}
GLM_FUNC_QUALIFIER double prev_float(double const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<double>::min());
return GLM_NEXT_AFTER_DBL(x, std::numeric_limits<double>::min());
}
template<typename T, template<typename> class vecType>

117
test/gtx/gtx-ulp.cpp
View File

@ -12,124 +12,41 @@
#include <iostream>
#include <limits>
namespace
{
template <typename T>
T next_float(T const & x);
#if(GLM_COMPILER & GLM_COMPILER_VC)
# include <cfloat>
# define GLM_NEXT_AFTER _nextafterf
#else
# include <cmath>
# define GLM_NEXT_AFTER nextafterf
#endif
GLM_FUNC_QUALIFIER float next_float(float const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<float>::max());
}
GLM_FUNC_QUALIFIER double next_float(double const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<double>::max());
}
GLM_FUNC_QUALIFIER float prev_float(float const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<float>::min());
}
GLM_FUNC_QUALIFIER double prev_float(double const & x)
{
return GLM_NEXT_AFTER(x, std::numeric_limits<double>::min());
}
template <typename T>
GLM_FUNC_QUALIFIER T next_float(T const & x, std::size_t const & ulps)
{
T temp = x;
for(std::size_t i = 0; i < ulps; ++i)
temp = next_float(temp);
return temp;
}
template <typename T>
GLM_FUNC_QUALIFIER T prev_float(T const & x, std::size_t const & ulps)
{
T temp = x;
for(std::size_t i = 0; i < ulps; ++i)
temp = prev_float(temp);
return temp;
}
template <typename T>
GLM_FUNC_QUALIFIER std::size_t float_distance(T const & x, T const & y)
{
std::size_t ulp = 0;
if(x < y)
{
T temp = x;
while(temp != y && ulp < std::numeric_limits<std::size_t>::max())
{
++ulp;
temp = next_float(temp);
}
}
else if(y < x)
{
T temp = y;
while(temp != x && ulp < std::numeric_limits<std::size_t>::max())
{
++ulp;
temp = next_float(temp);
}
}
else // ==
{
}
return ulp;
}
}//namespace
int test_ulp_float()
{
std::cout.precision(std::numeric_limits<double>::digits10 + 1);
float W = 1.0f;
float X = next_float(W);
float X = glm::next_float(W);
double Y = 1.0;
double Z = next_float(Y);
double Z = glm::next_float(Y);
bool TestX = W != X;
bool TestZ = Y != Z;
std::cout << "1.0f, Next: " << float_distance(W, X)<< std::endl;
std::cout << "1.0f, Next(1000): " << float_distance(W, next_float(W, 1000)) << std::endl;
std::cout << "1.0f, Next: " << glm::float_distance(W, X)<< std::endl;
std::cout << "1.0f, Next(1000): " << glm::float_distance(W, glm::next_float(W, 1000)) << std::endl;
std::cout << "1.0f, Next: " << float_distance(X, W)<< std::endl;
std::cout << "1.0f, Next(1000): " << float_distance(next_float(W, 1000), W) << std::endl;
std::cout << "1.0f, Next: " << glm::float_distance(X, W)<< std::endl;
std::cout << "1.0f, Next(1000): " << glm::float_distance(glm::next_float(W, 1000), W) << std::endl;
std::cout << "1.0, Next: " << float_distance(Y, Z) << std::endl;
std::cout << "1.0, Next(1000): " << float_distance(next_float(Y, 1000), Y) << std::endl;
std::cout << "1.0, Next: " << glm::float_distance(Y, Z) << std::endl;
std::cout << "1.0, Next(1000): " << glm::float_distance(glm::next_float(Y, 1000), Y) << std::endl;
std::cout << Z << " 0.01, 0.011" << std::endl;
std::cout << " 1.0, Next(1000000): " << next_float(Y, 1000000)<< std::endl;
std::cout << " 1.0, Next(1000000): " << glm::next_float(Y, 1000000)<< std::endl;
std::size_t A = glm::ulp(0.01, 0.02);
std::size_t B = glm::ulp(glm::vec2(0.01), glm::vec2(0.02));
std::size_t C = glm::ulp(glm::vec3(0.01), glm::vec3(0.02));
std::size_t D = glm::ulp(glm::vec4(0.01), glm::vec4(0.02));
std::cout << "glm::ulp test: " << A << std::endl;
std::cout << "glm::ulp test: " << B << std::endl;
std::cout << "glm::ulp test: " << C << std::endl;
std::cout << "glm::ulp test: " << D << std::endl;
//std::size_t A = glm::ulp(0.01, 0.02);
//std::size_t B = glm::ulp(glm::vec2(0.01), glm::vec2(0.02));
//std::size_t C = glm::ulp(glm::vec3(0.01), glm::vec3(0.02));
//std::size_t D = glm::ulp(glm::vec4(0.01), glm::vec4(0.02));
//std::cout << "glm::ulp test: " << A << std::endl;
//std::cout << "glm::ulp test: " << B << std::endl;
//std::cout << "glm::ulp test: " << C << std::endl;
//std::cout << "glm::ulp test: " << D << std::endl;
return 0;
}