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

Convert integers to type T in quaternion mat3_cast()

Browse Source 
This fixes issues when the type T is not explicitly convertible to T, and for example only has an operator* defined that takes two Ts but not a T and an int.

All the other functions in that file already use this syntax, so the missing ones here are most likely an oversight.
This commit is contained in:
Patrik Huber 2016-08-17 23:24:44 +01:00 committed by Christophe Riccio
parent ebafd8e82d
commit 3b4856cf58
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glm/gtc/quaternion.inl
View File

@ -603,17 +603,17 @@ namespace detail
T qwy(q.w * q.y); T qwy(q.w * q.y);
T qwz(q.w * q.z); T qwz(q.w * q.z);
Result[0][0] = 1 - 2 * (qyy + qzz); Result[0][0] = T(1) - T(2) * (qyy + qzz);
Result[0][1] = 2 * (qxy + qwz); Result[0][1] = T(2) * (qxy + qwz);
Result[0][2] = 2 * (qxz - qwy); Result[0][2] = T(2) * (qxz - qwy);
Result[1][0] = 2 * (qxy - qwz); Result[1][0] = T(2) * (qxy - qwz);
Result[1][1] = 1 - 2 * (qxx + qzz); Result[1][1] = T(1) - T(2) * (qxx + qzz);
Result[1][2] = 2 * (qyz + qwx); Result[1][2] = T(2) * (qyz + qwx);
Result[2][0] = 2 * (qxz + qwy); Result[2][0] = T(2) * (qxz + qwy);
Result[2][1] = 2 * (qyz - qwx); Result[2][1] = T(2) * (qyz - qwx);
Result[2][2] = 1 - 2 * (qxx + qyy); Result[2][2] = T(1) - T(2) * (qxx + qyy);
return Result; return Result;
} }