mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 20:51:48 +00:00
Merge branch 'master' of ssh://g-truc.git.sourceforge.net/gitroot/ogl-math/ogl-math
This commit is contained in:
commit
d055b01e3c
@ -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.
|
||||||
|
@ -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));
|
||||||
|
Loading…
Reference in New Issue
Block a user