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

Merge branch 'master' of ssh://g-truc.git.sourceforge.net/gitroot/ogl-math/ogl-math

Browse Source
This commit is contained in:
Christophe Riccio 2011-04-30 23:47:02 +01:00
commit d055b01e3c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/gtx/quaternion.hpp
View File

@ -121,7 +121,7 @@ namespace glm
detail::tvec3<valType> axis( detail::tvec3<valType> axis(
detail::tquat<valType> const & x); detail::tquat<valType> const & x);
//! Build a quaternion from an angle and an axis. //! Build a quaternion from an angle and a normalized axis.
//! From GLM_GTX_quaternion extension. //! From GLM_GTX_quaternion extension.
template <typename valType> template <typename valType>
detail::tquat<valType> angleAxis( detail::tquat<valType> angleAxis(
@ -130,12 +130,12 @@ namespace glm
valType const & y, valType const & y,
valType const & z); valType const & z);
//! Build a quaternion from an angle and an axis. //! Build a quaternion from an angle and a normalized axis.
//! From GLM_GTX_quaternion extension. //! From GLM_GTX_quaternion extension.
template <typename valType> template <typename valType>
detail::tquat<valType> angleAxis( detail::tquat<valType> angleAxis(
valType const & angle, valType const & angle,
detail::tvec3<valType> const & v); detail::tvec3<valType> const & axis);
//! Extract the real component of a quaternion. //! Extract the real component of a quaternion.
//! From GLM_GTX_quaternion extension. //! From GLM_GTX_quaternion extension.

1
glm/gtx/quaternion.inl
View File

@ -185,7 +185,6 @@ namespace quaternion
) )
{ {
detail::tquat<valType> result; detail::tquat<valType> result;
detail::tvec3<valType> v_normalized = glm::normalize(v);
valType a = glm::radians(angle); valType a = glm::radians(angle);
valType s = glm::sin(a * valType(0.5)); valType s = glm::sin(a * valType(0.5));