mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-13 22:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1038 from EZForever/patch-angle

Browse Source 
fix: glm::angle() discards the sign of result for angles in range (2*pi-1, 2*pi) #1038
This commit is contained in:
Christophe 2020-11-21 22:06:08 +01:00 committed by GitHub
commit f52f232f59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glm/ext/quaternion_trigonometric.inl
View File

@ -7,7 +7,10 @@ namespace glm
{ {
if (abs(x.w) > cos_one_over_two<T>()) if (abs(x.w) > cos_one_over_two<T>())
{ {
return asin(sqrt(x.x * x.x + x.y * x.y + x.z * x.z)) * static_cast<T>(2); T const a = asin(sqrt(x.x * x.x + x.y * x.y + x.z * x.z)) * static_cast<T>(2);
if(x.w < static_cast<T>(0))
return pi<T>() * static_cast<T>(2) - a;
return a;
} }
return acos(x.w) * static_cast<T>(2); return acos(x.w) * static_cast<T>(2);

6
test/ext/ext_quaternion_trigonometric.cpp
View File

@ -21,6 +21,12 @@ static int test_angle()
Error += glm::equal(A, 90.0f, Epsilon) ? 0 : 1; Error += glm::equal(A, 90.0f, Epsilon) ? 0 : 1;
} }
{
glm::quat const Q = glm::angleAxis(glm::two_pi<float>() - 1.0f, glm::vec3(1, 0, 0));
float const A = glm::angle(Q);
Error += glm::equal(A, 1.0f, Epsilon) ? 1 : 0;
}
return Error; return Error;
} }