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

Merge branch 'master' into fix-tvec-copy-cpp11

Browse Source
This commit is contained in:
Patrik Huber 2016-08-18 21:11:51 +01:00
commit 626aa4abad
2 changed files with 10 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;
} }

1
readme.md
View File

@ -104,6 +104,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Fixed strict aliasing warnings #473 - Fixed strict aliasing warnings #473
- Fixed missing vec1 overload to length2 and distance2 functions #431 - Fixed missing vec1 overload to length2 and distance2 functions #431
- Fixed GLM test '/fp:fast' and '/Za' command-line options are incompatible - Fixed GLM test '/fp:fast' and '/Za' command-line options are incompatible
- Fixed quaterion to mat3 cast function mat3_cast from GTC_quaternion #542
##### Deprecation: ##### Deprecation:
- Removed GLM_FORCE_SIZE_FUNC define - Removed GLM_FORCE_SIZE_FUNC define