mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Christophe Riccio 2011-05-27 00:31:58 +01:00
parent 5c70242e90
commit f87def17de
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glm/gtc/quaternion.inl
View File

@ -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-
( (

2
test/gtc/gtc_quaternion.cpp
View File

@ -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;
} }