Browse Source

Fixed slerp

Christophe Riccio 14 years ago
parent
commit
d815607abb
1 changed files with 14 additions and 0 deletions
  1. 14 0
      glm/gtc/quaternion.inl

+ 14 - 0
glm/gtc/quaternion.inl

@@ -147,6 +147,20 @@ namespace detail{
     //////////////////////////////////////////////////////////////
     // tquat<valType> external operators
 
+    template <typename T> 
+    GLM_FUNC_QUALIFIER detail::tquat<T> operator*
+    ( 
+        detail::tquat<T> const & q, 
+        detail::tquat<T> const & p
+    ) 
+    { 
+        return detail::tquat<T>(
+            q.w + p.w,
+            q.x + p.x,
+            q.y + p.y,
+            q.z + p.z);
+    } 
+
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tquat<T> operator- 
 	(