diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-01-12 11:09:06 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-01-12 11:09:06 +0100 |
| commit | 548216b7ca396dea5ecd55e177e38de0f80e8396 (patch) | |
| tree | 1a96c4c7c948d673616e060728dc2021a018cedd /Eigen | |
| parent | e15cb9f4f83e67096f8f2443afadebba9efab0b4 (diff) | |
QuaternionBase::slerp was documented twice and one explanation was ambiguous.
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Geometry/Quaternion.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index a6a8df203..803001272 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -150,10 +150,6 @@ public: /** \returns the conjugated quaternion */ 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; /** \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)); } + + /** \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 OtherDerived> |