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

Fixed GTX_compatibility on Android r7

Browse Source
This commit is contained in:
Christophe Riccio 2012-04-19 11:29:57 +01:00
parent ac768ea12b
commit 958bb6f6ca
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glm/gtx/compatibility.hpp
View File

@ -52,6 +52,9 @@
#include <cfloat> #include <cfloat>
#elif(GLM_COMPILER & GLM_COMPILER_GCC) #elif(GLM_COMPILER & GLM_COMPILER_GCC)
#include <cmath> #include <cmath>
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
# undef isfinite
# endif
#endif//GLM_COMPILER #endif//GLM_COMPILER
namespace glm namespace glm

37
glm/gtx/compatibility.inl
View File

@ -14,11 +14,18 @@ namespace glm
GLM_FUNC_QUALIFIER bool isfinite( GLM_FUNC_QUALIFIER bool isfinite(
genType const & x) genType const & x)
{ {
#if(GLM_COMPILER & GLM_COMPILER_VC) # if(GLM_COMPILER & GLM_COMPILER_VC)
return _finite(x); return _finite(x);
#else//(GLM_COMPILER & GLM_COMPILER_GCC) # elif(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return _isfinite(x) != 0;
# else
return std::isfinite(x) != 0; return std::isfinite(x) != 0;
#endif # endif
# else
return std::isfinite(x) != 0;
# endif
} }
template <typename valType> template <typename valType>
@ -56,11 +63,17 @@ namespace glm
GLM_FUNC_QUALIFIER bool isinf( GLM_FUNC_QUALIFIER bool isinf(
genType const & x) genType const & x)
{ {
#if(GLM_COMPILER & GLM_COMPILER_VC) # if(GLM_COMPILER & GLM_COMPILER_VC)
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF; return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
#else # elif(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return _isinf(x) != 0;
# else
return std::isinf(x) != 0; return std::isinf(x) != 0;
#endif # endif
# else
return std::isinf(x) != 0;
# endif
} }
template <typename valType> template <typename valType>
@ -97,11 +110,17 @@ namespace glm
template <typename genType> template <typename genType>
GLM_FUNC_QUALIFIER bool isnan(genType const & x) GLM_FUNC_QUALIFIER bool isnan(genType const & x)
{ {
#if(GLM_COMPILER & GLM_COMPILER_VC) # if(GLM_COMPILER & GLM_COMPILER_VC)
return _isnan(x); return _isnan(x);
#else # elif(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return _isnan(x) != 0;
# else
return std::isnan(x) != 0; return std::isnan(x) != 0;
#endif # endif
# else
return std::isnan(x) != 0;
# endif
} }
template <typename valType> template <typename valType>