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

Merge pull request #648 from Sillamacka/FixStrayParenthesis

Browse Source 
Fixed stray ')' that was breaking gtx/matrix_interpolation. #648
This commit is contained in:
Christophe 2017-07-04 17:54:16 +02:00 committed by GitHub
commit 34b5c4623b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtx/matrix_interpolation.inl
View File

@ -75,7 +75,7 @@ namespace glm
if (glm::abs(s) < T(0.001)) if (glm::abs(s) < T(0.001))
s = (T)1.0; s = (T)1.0;
T const angleCos = (mat[0][0] + mat[1][1] + mat[2][2] - (T)1.0) * (T)0.5; T const angleCos = (mat[0][0] + mat[1][1] + mat[2][2] - (T)1.0) * (T)0.5;
if (angleCos - static_cast<T>(1)) < epsilon) if (angleCos - static_cast<T>(1) < epsilon)
angle = pi<T>() * static_cast<T>(0.25); angle = pi<T>() * static_cast<T>(0.25);
else else
angle = acos(angleCos); angle = acos(angleCos);