GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 19:59:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

QuaternionBase::slerp was documented twice and one explanation was ambiguous.

Browse Source
This commit is contained in:
Gael Guennebaud 2014-01-12 11:09:06 +01:00
parent e15cb9f4f8
commit 548216b7ca
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Eigen/src/Geometry/Quaternion.h
View File

@ -150,10 +150,6 @@ public:
/** \returns the conjugated quaternion */ /** \returns the conjugated quaternion */
Quaternion<Scalar> conjugate() const; Quaternion<Scalar> conjugate() const;
/** \returns an interpolation for a constant motion between \a other and \c *this
* \a t in [0;1]
* see http://en.wikipedia.org/wiki/Slerp
*/
template<class OtherDerived> Quaternion<Scalar> slerp(const Scalar& t, const QuaternionBase<OtherDerived>& other) const; template<class OtherDerived> Quaternion<Scalar> slerp(const Scalar& t, const QuaternionBase<OtherDerived>& other) const;
/** \returns \c true if \c *this is approximately equal to \a other, within the precision /** \returns \c true if \c *this is approximately equal to \a other, within the precision
@ -677,8 +673,13 @@ QuaternionBase<Derived>::angularDistance(const QuaternionBase<OtherDerived>& oth
return static_cast<Scalar>(2 * acos(d)); return static_cast<Scalar>(2 * acos(d));
} }
/** \returns the spherical linear interpolation between the two quaternions /** \returns the spherical linear interpolation between the two quaternions
* \c *this and \a other at the parameter \a t * \c *this and \a other at the parameter \a t in [0;1].
*
* This represents an interpolation for a constant motion between \c *this and \a other,
* see also http://en.wikipedia.org/wiki/Slerp.
*/ */
template <class Derived> template <class Derived>
template <class OtherDerived> template <class OtherDerived>