From 74591613643e3d3048bad5dac6844805333bcb83 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 28 Jun 2014 20:45:45 +0200 Subject: [PATCH 1/3] Updated revision fornext release --- glm/detail/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index c982c469..6ad9bdc0 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -38,7 +38,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 5 -#define GLM_VERSION_REVISION 4 +#define GLM_VERSION_REVISION 5 /////////////////////////////////////////////////////////////////////////////////////////////////// // Platform From 9a3f42279ba2dd5b338a59e0ffd9479f39b4fdce Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 28 Jun 2014 20:56:12 +0200 Subject: [PATCH 2/3] - Fixed std::nextafter not supported with C++11 on Android #213 --- glm/gtc/ulp.inl | 10 +++++++--- readme.txt | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl index 4099812b..91846b22 100644 --- a/glm/gtc/ulp.inl +++ b/glm/gtc/ulp.inl @@ -201,8 +201,10 @@ namespace glm { # if((GLM_LANG & GLM_LANG_CXX11_FLAG) && !(GLM_PLATFORM & GLM_PLATFORM_ANDROID)) return std::nextafter(x, std::numeric_limits::max()); -# elif((GLM_PLATFORM & GLM_PLATFORM_ANDROID) || (GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))) +# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))) return detail::nextafterf(x, FLT_MAX); +# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID) + return _nextafterf(x, FLT_MAX); # else return nextafterf(x, FLT_MAX); # endif @@ -213,7 +215,7 @@ namespace glm { # if((GLM_LANG & GLM_LANG_CXX11_FLAG) && !(GLM_PLATFORM & GLM_PLATFORM_ANDROID)) return std::nextafter(x, std::numeric_limits::max()); -# elif((GLM_PLATFORM & GLM_PLATFORM_ANDROID) || (GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))) +# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))) return detail::nextafter(x, std::numeric_limits::max()); # else return nextafter(x, DBL_MAX); @@ -233,8 +235,10 @@ namespace glm { # if((GLM_LANG & GLM_LANG_CXX11_FLAG) && !(GLM_PLATFORM & GLM_PLATFORM_ANDROID)) return std::nextafter(x, std::numeric_limits::min()); -# elif((GLM_PLATFORM & GLM_PLATFORM_ANDROID) || (GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))) +# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))) return detail::nextafterf(x, FLT_MIN); +# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID) + return _nextafterf(x, FLT_MIN); # else return nextafterf(x, FLT_MIN); # endif diff --git a/readme.txt b/readme.txt index 9c3d238c..7328ad1d 100644 --- a/readme.txt +++ b/readme.txt @@ -36,6 +36,11 @@ GLM is a header only library, there is nothing to build, just include it. More informations in GLM manual: http://glm.g-truc.net/glm.pdf +================================================================================ +GLM 0.9.5.5: 2014-XX-XX +-------------------------------------------------------------------------------- +- Fixed std::nextafter not supported with C++11 on Android #213 + ================================================================================ GLM 0.9.5.4: 2014-06-21 -------------------------------------------------------------------------------- From d84fa89cb850c3a1bec0f56ba735fb74d0359b05 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 28 Jun 2014 21:08:53 +0200 Subject: [PATCH 3/3] Fixed missing value_type for dual quaternion, Fixed return type of dual quaternion length --- glm/gtc/quaternion.hpp | 2 +- glm/gtx/dual_quaternion.hpp | 4 ++-- glm/gtx/dual_quaternion.inl | 2 +- readme.txt | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 1470a85d..a8b0c904 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -59,7 +59,7 @@ namespace detail { enum ctor{null}; - typedef T value_type; + typedef T value_type; typedef tvec4 bool_type; public: diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index c7c6c50a..101c28ae 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -57,13 +57,13 @@ namespace detail struct tdualquat { enum ctor{null}; - + typedef T value_type; typedef glm::detail::tquat part_type; public: glm::detail::tquat real, dual; - GLM_FUNC_DECL GLM_CONSTEXPR int length() const; + GLM_FUNC_DECL GLM_CONSTEXPR length_t length() const; // Constructors GLM_FUNC_DECL tdualquat(); diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl index 7f4aadd6..bd69f537 100644 --- a/glm/gtx/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -33,7 +33,7 @@ namespace glm{ namespace detail { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR int tdualquat::length() const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR length_t tdualquat::length() const { return 8; } diff --git a/readme.txt b/readme.txt index 7328ad1d..5320c51d 100644 --- a/readme.txt +++ b/readme.txt @@ -40,6 +40,8 @@ http://glm.g-truc.net/glm.pdf GLM 0.9.5.5: 2014-XX-XX -------------------------------------------------------------------------------- - Fixed std::nextafter not supported with C++11 on Android #213 +- Fixed missing value_type for dual quaternion +- Fixed return type of dual quaternion length ================================================================================ GLM 0.9.5.4: 2014-06-21