mewin/glm
1
0
Fork 0
Code Releases Activity

Merge pull request #163 from patzy/0.9.5

Browse Source 
Fix dot product clamp range for vector angle functions. (#163)
This commit is contained in:
Christophe Riccio 2014-02-08 13:45:22 +01:00
commit 98a0d9e00e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glm/gtx/vector_angle.inl
View File

@ -18,7 +18,7 @@ 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 const Angle(acos(clamp(dot(x, y), genType(0), genType(1)))); genType const Angle(acos(clamp(dot(x, y), genType(-1), genType(1))));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
return Angle; return Angle;
@ -37,7 +37,7 @@ 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 const Angle(acos(clamp(dot(x, y), T(0), T(1)))); T const Angle(acos(clamp(dot(x, y), T(-1), T(1))));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
return Angle; return Angle;
@ -57,7 +57,7 @@ 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 const Dot = clamp(dot(x, y), T(0), T(1)); T const Dot = clamp(dot(x, y), T(-1), T(1));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
T const Angle(acos(Dot)); T const Angle(acos(Dot));
@ -82,7 +82,7 @@ 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 const Dot = clamp(dot(x, y), T(0), T(1)); T const Dot = clamp(dot(x, y), T(-1), T(1));
#ifdef GLM_FORCE_RADIANS #ifdef GLM_FORCE_RADIANS
T const Angle(acos(Dot)); T const Angle(acos(Dot));