From d84fa89cb850c3a1bec0f56ba735fb74d0359b05 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 28 Jun 2014 21:08:53 +0200 Subject: [PATCH] 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