From d68fd2d97eba7e8138b63082dadf699773e76fec Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 26 Dec 2013 00:32:09 +0100 Subject: [PATCH] Fixed space characters --- glm/gtx/vector_angle.inl | 24 ++++++++++++------------ readme.txt | 7 ++++++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/glm/gtx/vector_angle.inl b/glm/gtx/vector_angle.inl index 737e1cef..c51dfb4c 100644 --- a/glm/gtx/vector_angle.inl +++ b/glm/gtx/vector_angle.inl @@ -18,12 +18,12 @@ namespace glm { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'angle' only accept floating-point inputs"); - genType Dot = clamp(dot(x, y), genType(0), genType(1)); + genType const Angle(acos(clamp(dot(x, y), genType(0), genType(1)))); #ifdef GLM_FORCE_RADIANS - return acos(Dot); + return Angle; #else - return degrees(acos(Dot)); + return degrees(Angle); #endif } @@ -36,12 +36,12 @@ namespace glm { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'angle' only accept floating-point inputs"); - T Dot = clamp(dot(x, y), T(0), T(1)); + genType const Angle(acos(clamp(dot(x, y), T(0), T(1))); #ifdef GLM_FORCE_RADIANS - return acos(Dot); + return Angle; #else - return degrees(acos(Dot)); + return degrees(Angle); #endif } @@ -55,12 +55,12 @@ namespace glm { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'orientedAngle' only accept floating-point inputs"); - T Dot = clamp(dot(x, y), T(0), T(1)); + T const Dot = clamp(dot(x, y), T(0), T(1)); #ifdef GLM_FORCE_RADIANS - T const Angle(acos(Dot)); + T const Angle(acos(Dot)); #else - T const Angle(degrees(acos(Dot))); + T const Angle(degrees(acos(Dot))); #endif detail::tvec2 const TransformedVector(glm::rotate(x, Angle)); if(all(epsilonEqual(y, TransformedVector, T(0.01)))) @@ -79,12 +79,12 @@ namespace glm { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'orientedAngle' only accept floating-point inputs"); - T Dot = clamp(dot(x, y), T(0), T(1)); + T const Dot = clamp(dot(x, y), T(0), T(1)); #ifdef GLM_FORCE_RADIANS - T const Angle(acos(Dot)); + T const Angle(acos(Dot)); #else - T const Angle(degrees(acos(Dot))); + T const Angle(degrees(acos(Dot))); #endif if(dot(ref, cross(x, y)) < T(0)) diff --git a/readme.txt b/readme.txt index 30a5b16e..ea6fc64a 100644 --- a/readme.txt +++ b/readme.txt @@ -36,7 +36,12 @@ 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 -================================================================================s +================================================================================ +GLM 0.9.5.1: 2014-XX-XX +-------------------------------------------------------------------------------- +- Fixed angle and orientedAngle that sometimes return NaN values (#145) + +================================================================================ GLM 0.9.5.0: 2013-12-25 -------------------------------------------------------------------------------- - Added forward declarations (glm/fwd.hpp) for faster compilations