mirror of
https://github.com/g-truc/glm.git
synced 2024-11-30 03:44:38 +00:00
Fixed build
This commit is contained in:
parent
456dde14f4
commit
633ca9a2f0
@ -1,8 +1,8 @@
|
|||||||
/// @ref gtc_packing
|
/// @ref gtc_packing
|
||||||
/// @file glm/gtc/packing.inl
|
/// @file glm/gtc/packing.inl
|
||||||
|
|
||||||
|
#include "../ext/vector_relational.hpp"
|
||||||
#include "../common.hpp"
|
#include "../common.hpp"
|
||||||
#include "../vector_relational.hpp"
|
|
||||||
#include "../vec2.hpp"
|
#include "../vec2.hpp"
|
||||||
#include "../vec3.hpp"
|
#include "../vec3.hpp"
|
||||||
#include "../vec4.hpp"
|
#include "../vec4.hpp"
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../detail/setup.hpp"
|
#include "../detail/setup.hpp"
|
||||||
#include "../detail/qualifier.hpp"
|
#include "../detail/qualifier.hpp"
|
||||||
#include "../detail/type_int.hpp"
|
#include "../detail/type_int.hpp"
|
||||||
#include "../detail/compute_vector_relational.hpp"
|
#include "../ext/vector_relational.hpp"
|
||||||
|
|
||||||
#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
|
#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_ulp extension included")
|
# pragma message("GLM: GLM_GTC_ulp extension included")
|
||||||
|
@ -82,13 +82,13 @@ namespace detail
|
|||||||
if((ix>0x7f800000) || // x is nan
|
if((ix>0x7f800000) || // x is nan
|
||||||
(iy>0x7f800000)) // y is nan
|
(iy>0x7f800000)) // y is nan
|
||||||
return x+y;
|
return x+y;
|
||||||
if(equal(x, y, epsilon<float>()))
|
if(abs(y - x) <= epsilon<float>())
|
||||||
return y; // x=y, return y
|
return y; // x=y, return y
|
||||||
if(ix==0)
|
if(ix==0)
|
||||||
{ // x == 0
|
{ // x == 0
|
||||||
GLM_SET_FLOAT_WORD(x,(hy&0x80000000)|1);// return +-minsubnormal
|
GLM_SET_FLOAT_WORD(x,(hy&0x80000000)|1);// return +-minsubnormal
|
||||||
t = x*x;
|
t = x*x;
|
||||||
if(equal(t, x, epsilon<float>()))
|
if(abs(t - x) <= epsilon<float>())
|
||||||
return t;
|
return t;
|
||||||
else
|
else
|
||||||
return x; // raise underflow flag
|
return x; // raise underflow flag
|
||||||
@ -113,7 +113,7 @@ namespace detail
|
|||||||
if(hy<0x00800000) // underflow
|
if(hy<0x00800000) // underflow
|
||||||
{
|
{
|
||||||
t = x*x;
|
t = x*x;
|
||||||
if(!detail::compute_equal<float, true>::call(t, x))
|
if(abs(t - x) > epsilon<float>())
|
||||||
{ // raise underflow flag
|
{ // raise underflow flag
|
||||||
GLM_SET_FLOAT_WORD(y,hx);
|
GLM_SET_FLOAT_WORD(y,hx);
|
||||||
return y;
|
return y;
|
||||||
@ -137,13 +137,13 @@ namespace detail
|
|||||||
if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) || // x is nan
|
if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) || // x is nan
|
||||||
((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) // y is nan
|
((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) // y is nan
|
||||||
return x+y;
|
return x+y;
|
||||||
if(equal(x, y, epsilon<double>()))
|
if(abs(y - x) <= epsilon<double>())
|
||||||
return y; // x=y, return y
|
return y; // x=y, return y
|
||||||
if((ix|lx)==0)
|
if((ix|lx)==0)
|
||||||
{ // x == 0
|
{ // x == 0
|
||||||
GLM_INSERT_WORDS(x, hy & 0x80000000, 1); // return +-minsubnormal
|
GLM_INSERT_WORDS(x, hy & 0x80000000, 1); // return +-minsubnormal
|
||||||
t = x*x;
|
t = x*x;
|
||||||
if(equal(t, x, epsilon<double>()))
|
if(abs(t - x) <= epsilon<double>())
|
||||||
return t;
|
return t;
|
||||||
else
|
else
|
||||||
return x; // raise underflow flag
|
return x; // raise underflow flag
|
||||||
@ -171,7 +171,7 @@ namespace detail
|
|||||||
if(hy<0x00100000)
|
if(hy<0x00100000)
|
||||||
{ // underflow
|
{ // underflow
|
||||||
t = x*x;
|
t = x*x;
|
||||||
if(!detail::compute_equal<double, true>::call(t, x))
|
if(abs(t - x) > epsilon<double>())
|
||||||
{ // raise underflow flag
|
{ // raise underflow flag
|
||||||
GLM_INSERT_WORDS(y,hx,lx);
|
GLM_INSERT_WORDS(y,hx,lx);
|
||||||
return y;
|
return y;
|
||||||
|
Loading…
Reference in New Issue
Block a user