Changeset 1807 for trunk/src/lol/math/vector.hTweet

Timestamp:

Aug 24, 2012, 12:51:48 PM (11 years ago)

Author:

sam

Message:

math: improve slerp implementation.

File:

• trunk/src/lol/math/vector.h (modified) (2 diffs)

trunk/src/lol/math/vector.h

@@ -935 +935 @@
     static Quat<T> rotate(T angle, T x, T y, T z);
     static Quat<T> rotate(T angle, Vec3<T> const &v);
-        static Quat<T> slerp(Quat<T> QuatA,Quat<T> QuatB, float const &Scalar);
 
     /* Convert from Euler angles. The axes in fromeuler_xyx are
@@ -1020 +1019 @@
 
 template<typename T>
-static inline Quat<T> operator /(Quat<T> x, Quat<T> const &y)
+static inline Quat<T> operator /(Quat<T> const &x, Quat<T> const &y)
 {
     return x * re(y);
 }
+
+template<typename T>
+extern Quat<T> slerp(Quat<T> const &qa, Quat<T> const &qb, T f);
 
 /*