mewin/glm
1
0
Fork 0
Code Releases Activity

Merge pull request #1058 from SergeyKrivohatskiy/patch-1

Browse Source 
Fix in axisAngle implementation #1058
This commit is contained in:
Christophe 2021-03-07 09:37:42 +01:00 committed by GitHub
commit fe9bb21f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glm/gtx/matrix_interpolation.inl
View File

@ -78,10 +78,18 @@ namespace glm
if (glm::abs(s) < T(0.001)) if (glm::abs(s) < T(0.001))
s = static_cast<T>(1); s = static_cast<T>(1);
T const angleCos = (m[0][0] + m[1][1] + m[2][2] - static_cast<T>(1)) * static_cast<T>(0.5); T const angleCos = (m[0][0] + m[1][1] + m[2][2] - static_cast<T>(1)) * static_cast<T>(0.5);
if(abs(angleCos - static_cast<T>(1)) < epsilon) if(angleCos >= static_cast<T>(1.0))
angle = pi<T>() * static_cast<T>(0.25); {
angle = static_cast<T>(0.0);
}
else if (angleCos <= static_cast<T>(-1.0))
{
angle = pi<T>();
}
else else
{
angle = acos(angleCos); angle = acos(angleCos);
}
axis.x = (m[1][2] - m[2][1]) / s; axis.x = (m[1][2] - m[2][1]) / s;
axis.y = (m[2][0] - m[0][2]) / s; axis.y = (m[2][0] - m[0][2]) / s;
axis.z = (m[0][1] - m[1][0]) / s; axis.z = (m[0][1] - m[1][0]) / s;