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

Fixed oriented angle functions

Browse Source
This commit is contained in:
Christophe Riccio 2010-06-20 15:54:12 +01:00
parent 39a4ee0455
commit 112f755b0b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glm/gtx/vector_angle.inl
View File

@ -33,10 +33,10 @@ inline valType orientedAngle
valType c = cos(Angle);
valType s = sin(Angle);
detail::tvec2<valType> TransformedVector = detail::tvec2<valType>(c * y.x - s * y.y, s * y.x + c * y.y);
if(all(equalEpsilonGTX(x, TransformedVector, valType(0.01))))
return -degrees(Angle);
if(all(equalEpsilon(x, TransformedVector, valType(0.01))))
return -glm::degrees(Angle);
else
return degrees(Angle);
return glm::degrees(Angle);
}
//! \todo epsilon is hard coded to 0.01
@ -48,11 +48,11 @@ inline valType orientedAngle
)
{
valType Angle = degrees(acos(dot(x, y)));
detail::tvec3<valType> TransformedVector = rotate(detail::tquat<valType>(), Angle, cross(x, y)) * y;
detail::tvec3<valType> TransformedVector = glm::gtx::rotate_vector::rotate(y, Angle, glm::core::function::geometric::cross(x, y));
if(all(equalEpsilon(x, TransformedVector, valType(0.01))))
return -degrees(Angle);
return -Angle;
else
return degrees(Angle);
return Angle;
}
//! \todo epsilon is hard coded to 0.01
@ -64,11 +64,11 @@ inline valType orientedAngle
)
{
valType Angle = degrees(acos(dot(x, y)));
detail::tvec4<valType> TransformedVector = rotate(detail::tquat<valType>(), Angle, cross(x, y)) * y;
detail::tvec4<valType> TransformedVector = glm::gtx::rotate_vector::rotate(y, Angle, glm::core::function::geometric::cross(x, y));
if(all(equalEpsilon(x, TransformedVector, valType(0.01))))
return -degrees(Angle);
return -Angle;
else
return degrees(Angle);
return Angle;
}
template <typename valType>