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

Added test gor issue #199

Browse Source
This commit is contained in:
Christophe Riccio 2014-05-04 17:34:34 +02:00
parent a4bb7e1e38
commit a2b70690c1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtx/quaternion.inl
View File

@ -87,7 +87,7 @@ namespace glm
T Vec3Len = sqrt(q.x * q.x + q.y * q.y + q.z * q.z); T Vec3Len = sqrt(q.x * q.x + q.y * q.y + q.z * q.z);
T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w); T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w);
T t = atan(Vec3Len, T(q.w)) / Vec3Len; T t = atan(Vec3Len, T(q.w)) / Vec3Len;
return detail::tquat<T, P>(t * q.x, t * q.y, t * q.z, log(QuatLen)); return detail::tquat<T, P>(log(QuatLen), t * q.x, t * q.y, t * q.z);
} }
} }

12
test/gtx/gtx_quaternion.cpp
View File

@ -87,10 +87,22 @@ int test_rotation()
return Error; return Error;
} }
int test_log()
{
int Error(0);
glm::quat q;
glm::quat p = glm::log(q);
glm::quat r = glm::exp(p);
return Error;
}
int main() int main()
{ {
int Error(0); int Error(0);
Error += test_log();
Error += test_rotation(); Error += test_rotation();
Error += test_quat_fastMix(); Error += test_quat_fastMix();
Error += test_quat_shortMix(); Error += test_quat_shortMix();