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

Merge pull request #145 from jsb/0.9.5

Browse Source 
angle and orientedAngle sometimes return NaN values
This commit is contained in:
Christophe Riccio 2013-12-25 15:25:08 -08:00
commit 5775879cfd
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
glm/gtx/vector_angle.inl
View File

@ -18,10 +18,12 @@ namespace glm
{ {
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'angle' only accept floating-point inputs"); GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'angle' only accept floating-point inputs");
genType Dot = clamp(dot(x, y), genType(0), genType(1));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
return acos(dot(x, y)); return acos(Dot);
#else #else
return degrees(acos(dot(x, y))); return degrees(acos(Dot));
#endif #endif
} }
@ -34,10 +36,12 @@ namespace glm
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'angle' only accept floating-point inputs"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'angle' only accept floating-point inputs");
T Dot = clamp(dot(x, y), T(0), T(1));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
return acos(dot(x, y)); return acos(Dot);
#else #else
return degrees(acos(dot(x, y))); return degrees(acos(Dot));
#endif #endif
} }
@ -51,10 +55,12 @@ namespace glm
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs");
T Dot = clamp(dot(x, y), T(0), T(1));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
T const Angle(acos(dot(x, y))); T const Angle(acos(Dot));
#else #else
T const Angle(degrees(acos(dot(x, y)))); T const Angle(degrees(acos(Dot)));
#endif #endif
detail::tvec2<T, P> const TransformedVector(glm::rotate(x, Angle)); detail::tvec2<T, P> const TransformedVector(glm::rotate(x, Angle));
if(all(epsilonEqual(y, TransformedVector, T(0.01)))) if(all(epsilonEqual(y, TransformedVector, T(0.01))))
@ -73,10 +79,12 @@ namespace glm
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs");
T Dot = clamp(dot(x, y), T(0), T(1));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
T const Angle(acos(dot(x, y))); T const Angle(acos(Dot));
#else #else
T const Angle(degrees(acos(dot(x, y)))); T const Angle(degrees(acos(Dot)));
#endif #endif
if(dot(ref, cross(x, y)) < T(0)) if(dot(ref, cross(x, y)) < T(0))