From f87def17de5dbd74a82057f64bbd77f0717ae90d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 27 May 2011 00:31:58 +0100 Subject: [PATCH] Fixed tests --- glm/gtc/quaternion.inl | 14 -------------- test/gtc/gtc_quaternion.cpp | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index df92920a..e262c663 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -147,20 +147,6 @@ namespace detail{ ////////////////////////////////////////////////////////////// // tquat external operators - template - GLM_FUNC_QUALIFIER detail::tquat operator* - ( - detail::tquat const & q, - detail::tquat const & p - ) - { - return detail::tquat( - q.w + p.w, - q.x + p.x, - q.y + p.y, - q.z + p.z); - } - template GLM_FUNC_QUALIFIER detail::tquat operator- ( diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp index 689cfe27..00ed0503 100644 --- a/test/gtc/gtc_quaternion.cpp +++ b/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 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; }