Browse Source

Fixed tests

Christophe Riccio 14 years ago
parent
commit
f87def17de
2 changed files with 1 additions and 15 deletions
  1. 0 14
      glm/gtc/quaternion.inl
  2. 1 1
      test/gtc/gtc_quaternion.cpp

+ 0 - 14
glm/gtc/quaternion.inl

@@ -147,20 +147,6 @@ namespace detail{
     //////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////
     // tquat<valType> external operators
     // 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>
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tquat<T> operator- 
 	GLM_FUNC_QUALIFIER detail::tquat<T> operator- 
 	(
 	(

+ 1 - 1
test/gtc/gtc_quaternion.cpp

@@ -27,7 +27,7 @@ int test_quat_slerp()
     glm::quat B(90.0f, glm::vec3(0, 0, 1));
     glm::quat B(90.0f, glm::vec3(0, 0, 1));
     glm::quat C = glm::mix(A, B, 0.5f);
     glm::quat C = glm::mix(A, B, 0.5f);
     
     
-    Error += C != glm::quat(45.f, glm::vec3(0, 0, 1)) ? 0 : 1;
+    Error += C == glm::quat(45.f, glm::vec3(0, 0, 1)) ? 0 : 1;
 
 
     return Error;
     return Error;
 }
 }