mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1137 from tetrisplusplus/fix_glm_gtx_matrix_query_isOrthogonal

Browse Source 
fix: isOrthogonal for a zero matrix #1137
This commit is contained in:
Christophe 2023-08-18 15:04:55 +02:00 committed by GitHub
commit db0f79de12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glm/gtx/matrix_query.inl
View File

@ -97,16 +97,22 @@ namespace glm
GLM_FUNC_QUALIFIER bool isOrthogonal(mat<C, R, T, Q> const& m, T const& epsilon) GLM_FUNC_QUALIFIER bool isOrthogonal(mat<C, R, T, Q> const& m, T const& epsilon)
{ {
bool result = true; bool result = true;
for(length_t i(0); result && i < m.length() - 1; ++i) for(length_t i(0); result && i < m.length(); ++i)
for(length_t j(i + 1); result && j < m.length(); ++j) {
result = areOrthogonal(m[i], m[j], epsilon); result = isNormalized(m[i], epsilon);
for(length_t j(i + 1); result && j < m.length(); ++j)
result = abs(dot(m[i], m[j])) <= epsilon;
}
if(result) if(result)
{ {
mat<C, R, T, Q> tmp = transpose(m); mat<C, R, T, Q> tmp = transpose(m);
for(length_t i(0); result && i < m.length() - 1 ; ++i) for(length_t i(0); result && i < m.length(); ++i)
for(length_t j(i + 1); result && j < m.length(); ++j) {
result = areOrthogonal(tmp[i], tmp[j], epsilon); result = isNormalized(tmp[i], epsilon);
for(length_t j(i + 1); result && j < m.length(); ++j)
result = abs(dot(tmp[i], tmp[j])) <= epsilon;
}
} }
return result; return result;
} }

10
test/gtx/gtx_matrix_query.cpp
View File

@ -45,8 +45,14 @@ int test_isOrthogonal()
{ {
int Error(0); int Error(0);
bool TestA = glm::isOrthogonal(glm::mat4(1), 0.00001f); {
Error += TestA ? 0 : 1; bool TestA = glm::isOrthogonal(glm::mat4(1), 0.00001f);
Error += TestA ? 0 : 1;
}
{
bool TestA = glm::isOrthogonal(glm::mat4(0), 0.00001f);
Error += TestA ? 1 : 0;
}
return Error; return Error;
} }