mewin/glm
1
0
Fork 0
Code Releases Activity

Added a quation constructor taking two axis

Browse Source
This commit is contained in:
Christophe Riccio
2013-09-22 23:37:55 +02:00
parent a15201dc59
commit 1e69dfe30e
5 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
glm/gtc/quaternion.hpp
View File

@@ -70,7 +70,7 @@ namespace detail
tquat<U, Q> const & q);
GLM_FUNC_DECL explicit tquat(
T const & s,
glm::detail::tvec3<T, P> const & v);
tvec3<T, P> const & v);
GLM_FUNC_DECL explicit tquat(
T const & w,
T const & x,
@@ -79,6 +79,15 @@ namespace detail
// Convertions
/// Create a quaternion from two normalized axis
///
/// @param u A first normalized axis
/// @param v A second normalized axis
/// @see gtc_quaternion
/// @see http://lolengine.net/blog/2013/09/18/beautiful-maths-quaternion-from-vectors
GLM_FUNC_DECL explicit tquat(
detail::tvec3<T, P> const & u,
detail::tvec3<T, P> const & v);
/// Build a quaternion from euler angles (pitch, yaw, roll), in radians.
GLM_FUNC_DECL explicit tquat(
tvec3<T, P> const & eulerAngles);

12
glm/gtc/quaternion.inl
View File

@@ -104,6 +104,18 @@ namespace detail
// this->z = c.x * c.y * s.z - s.x * s.y * c.z;
//}
template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P>::tquat
(
detail::tvec3<T, P> const & u,
detail::tvec3<T, P> const & v
)
{
detail::tvec3<T, P> w = cross(u, v);
detail::tquat<T, P> q(T(1) + dot(u, v), w.x, w.y, w.z);
*this = normalize(q);
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P>::tquat
(