mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Merge pull request #145 from jsb/0.9.5
angle and orientedAngle sometimes return NaN values
This commit is contained in:
commit
5775879cfd
@ -18,10 +18,12 @@ namespace glm
|
||||
{
|
||||
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
|
||||
return acos(dot(x, y));
|
||||
return acos(Dot);
|
||||
#else
|
||||
return degrees(acos(dot(x, y)));
|
||||
return degrees(acos(Dot));
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -34,10 +36,12 @@ namespace glm
|
||||
{
|
||||
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
|
||||
return acos(dot(x, y));
|
||||
return acos(Dot);
|
||||
#else
|
||||
return degrees(acos(dot(x, y)));
|
||||
return degrees(acos(Dot));
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -51,10 +55,12 @@ namespace glm
|
||||
{
|
||||
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
|
||||
T const Angle(acos(dot(x, y)));
|
||||
T const Angle(acos(Dot));
|
||||
#else
|
||||
T const Angle(degrees(acos(dot(x, y))));
|
||||
T const Angle(degrees(acos(Dot)));
|
||||
#endif
|
||||
detail::tvec2<T, P> const TransformedVector(glm::rotate(x, Angle));
|
||||
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");
|
||||
|
||||
T Dot = clamp(dot(x, y), T(0), T(1));
|
||||
|
||||
#ifdef GLM_FORCE_RADIANS
|
||||
T const Angle(acos(dot(x, y)));
|
||||
T const Angle(acos(Dot));
|
||||
#else
|
||||
T const Angle(degrees(acos(dot(x, y))));
|
||||
T const Angle(degrees(acos(Dot)));
|
||||
#endif
|
||||
|
||||
if(dot(ref, cross(x, y)) < T(0))
|
||||
|
Loading…
Reference in New Issue
Block a user