From ad36b36b5be49f2b2fab1333a7439f05e49dcaaa Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 22 Dec 2012 01:32:33 +0100 Subject: [PATCH] Updated mix and lerp documentation --- glm/gtc/quaternion.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 5d880321..8e36a854 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -173,12 +173,14 @@ namespace detail /// Spherical linear interpolation of two quaternions. /// The interpolation is oriented and the rotation is performed at constant speed. + /// For short path spherical linear interpolation, use the slerp function. /// /// @param x A quaternion /// @param y A quaternion /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1]. /// @tparam T Value type used to build the quaternion. Supported: half, float or double. /// @see gtc_quaternion + /// @see - slerp(detail::tquat const & x, detail::tquat const & y, T const & a) template detail::tquat mix( detail::tquat const & x, @@ -190,7 +192,7 @@ namespace detail /// /// @param x A quaternion /// @param y A quaternion - /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1]. + /// @param a Interpolation factor. The interpolation is defined in the range [0, 1]. /// @tparam T Value type used to build the quaternion. Supported: half, float or double. /// @see gtc_quaternion template