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

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2011-06-15 19:37:43 +01:00
commit 6143669ca7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glm/gtx/quaternion.hpp
View File

@ -162,19 +162,19 @@ namespace glm
valType extractRealComponent(
detail::tquat<valType> const & q);
//! Returns roll value of euler angles.
//! Returns roll value of euler angles in degrees.
//! From GLM_GTX_quaternion extension.
template <typename valType>
valType roll(
detail::tquat<valType> const & x);
//! Returns pitch value of euler angles.
//! Returns pitch value of euler angles in degrees.
//! From GLM_GTX_quaternion extension.
template <typename valType>
valType pitch(
detail::tquat<valType> const & x);
//! Returns yaw value of euler angles.
//! Returns yaw value of euler angles in degrees.
//! From GLM_GTX_quaternion extension.
template <typename valType>
valType yaw(
@ -183,7 +183,7 @@ namespace glm
//! Returns euler angles, yitch as x, yaw as y, roll as z.
//! From GLM_GTX_quaternion extension.
template <typename valType>
detail::tvec3<valType> eularAngles(
detail::tvec3<valType> eulerAngles(
detail::tquat<valType> const & x);
//! Converts a quaternion to a 3 * 3 matrix.

6
glm/gtx/quaternion.inl
View File

@ -213,7 +213,7 @@ GLM_FUNC_QUALIFIER valType roll
detail::tquat<valType> const & q
)
{
return atan2(valType(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z);
return glm::degrees(atan2(valType(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z));
}
template <typename valType>
@ -222,7 +222,7 @@ GLM_FUNC_QUALIFIER valType pitch
detail::tquat<valType> const & q
)
{
return atan2(valType(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z);
return glm::degrees(atan2(valType(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z));
}
template <typename valType>
@ -231,7 +231,7 @@ GLM_FUNC_QUALIFIER valType yaw
detail::tquat<valType> const & q
)
{
return asin(valType(-2) * (q.x * q.z - q.w * q.y));
return glm::degrees(asin(valType(-2) * (q.x * q.z - q.w * q.y)));
}
template <typename valType>