mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-09-20 08:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123 from dustin-biser/0.9.5

Browse Source 
Modified quaternion mat3_cast for faster results
This commit is contained in:
Christophe Riccio 2013-10-05 04:34:40 -07:00
commit f9d4aafb6d
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
glm/gtc/quaternion.inl
View File

@ -668,17 +668,27 @@ namespace detail
) )
{ {
detail::tmat3x3<T, P> Result(T(1)); detail::tmat3x3<T, P> Result(T(1));
Result[0][0] = 1 - 2 * q.y * q.y - 2 * q.z * q.z; T qxx(q.x * q.x);
Result[0][1] = 2 * q.x * q.y + 2 * q.w * q.z; T qyy(q.y * q.y);
Result[0][2] = 2 * q.x * q.z - 2 * q.w * q.y; T qzz(q.z * q.z);
T qxz(q.x * q.z);
T qxy(q.x * q.y);
T qyz(q.y * q.z);
T qwx(q.w * q.x);
T qwy(q.w * q.y);
T qwz(q.w * q.z);
Result[1][0] = 2 * q.x * q.y - 2 * q.w * q.z; Result[0][0] = 1 - 2 * (qyy - qzz);
Result[1][1] = 1 - 2 * q.x * q.x - 2 * q.z * q.z; Result[0][1] = 2 * (qxy + qwz);
Result[1][2] = 2 * q.y * q.z + 2 * q.w * q.x; Result[0][2] = 2 * (qxz - qwy);
Result[2][0] = 2 * q.x * q.z + 2 * q.w * q.y; Result[1][0] = 2 * (qxy - qwz);
Result[2][1] = 2 * q.y * q.z - 2 * q.w * q.x; Result[1][1] = 1 - 2 * (qxx - qzz);
Result[2][2] = 1 - 2 * q.x * q.x - 2 * q.y * q.y; Result[1][2] = 2 * (qyz + qwx);
Result[2][0] = 2 * (qxz + qwy);
Result[2][1] = 2 * (qyz - qwx);
Result[2][2] = 1 - 2 * (qxx - qyy);
return Result; return Result;
} }