mewin/glm
1
0
Fork 0
Code Releases Activity

Added *GLM_EXT_matrix_integer* with tests

Browse Source
This commit is contained in:
Christophe
2020-11-30 18:10:55 +01:00
parent 8693d06297
commit 561fbbd94c
9 changed files with 474 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
test/core/core_func_matrix.cpp
View File

@@ -1,8 +1,15 @@
#include <glm/matrix.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/ulp.hpp>
#include <glm/gtc/epsilon.hpp>
#include <glm/gtc/constants.hpp>
#include <glm/ext/matrix_relational.hpp>
#include <glm/ext/matrix_transform.hpp>
#include <glm/ext/scalar_constants.hpp>
#include <glm/mat2x2.hpp>
#include <glm/mat2x3.hpp>
#include <glm/mat2x4.hpp>
#include <glm/mat3x2.hpp>
#include <glm/mat3x3.hpp>
#include <glm/mat3x4.hpp>
#include <glm/mat4x2.hpp>
#include <glm/mat4x3.hpp>
#include <glm/mat4x4.hpp>
#include <vector>
#include <ctime>
#include <cstdio>
@@ -17,72 +24,63 @@ int test_matrixCompMult()
mat2 m(0, 1, 2, 3);
mat2 n = matrixCompMult(m, m);
mat2 expected = mat2(0, 1, 4, 9);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat2x3 m(0, 1, 2, 3, 4, 5);
mat2x3 n = matrixCompMult(m, m);
mat2x3 expected = mat2x3(0, 1, 4, 9, 16, 25);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat2x4 m(0, 1, 2, 3, 4, 5, 6, 7);
mat2x4 n = matrixCompMult(m, m);
mat2x4 expected = mat2x4(0, 1, 4, 9, 16, 25, 36, 49);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat3 m(0, 1, 2, 3, 4, 5, 6, 7, 8);
mat3 n = matrixCompMult(m, m);
mat3 expected = mat3(0, 1, 4, 9, 16, 25, 36, 49, 64);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat3x2 m(0, 1, 2, 3, 4, 5);
mat3x2 n = matrixCompMult(m, m);
mat3x2 expected = mat3x2(0, 1, 4, 9, 16, 25);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat3x4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
mat3x4 n = matrixCompMult(m, m);
mat3x4 expected = mat3x4(0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
mat4 n = matrixCompMult(m, m);
mat4 expected = mat4(0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat4x2 m(0, 1, 2, 3, 4, 5, 6, 7);
mat4x2 n = matrixCompMult(m, m);
mat4x2 expected = mat4x2(0, 1, 4, 9, 16, 25, 36, 49);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
{
mat4x3 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
mat4x3 n = matrixCompMult(m, m);
mat4x3 expected = mat4x3(0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121);
for (length_t l = 0; l < m.length(); ++l)
Error += all(epsilonEqual(n[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(n, expected, epsilon<float>())) ? 0 : 1;
}
return Error;
@@ -114,72 +112,63 @@ int test_transpose()
mat2 const m(0, 1, 2, 3);
mat2 const t = transpose(m);
mat2 const expected = mat2(0, 2, 1, 3);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat2x3 m(0, 1, 2, 3, 4, 5);
mat3x2 t = transpose(m);
mat3x2 const expected = mat3x2(0, 3, 1, 4, 2, 5);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat2x4 m(0, 1, 2, 3, 4, 5, 6, 7);
mat4x2 t = transpose(m);
mat4x2 const expected = mat4x2(0, 4, 1, 5, 2, 6, 3, 7);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat3 m(0, 1, 2, 3, 4, 5, 6, 7, 8);
mat3 t = transpose(m);
mat3 const expected = mat3(0, 3, 6, 1, 4, 7, 2, 5, 8);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat3x2 m(0, 1, 2, 3, 4, 5);
mat2x3 t = transpose(m);
mat2x3 const expected = mat2x3(0, 2, 4, 1, 3, 5);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat3x4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
mat4x3 t = transpose(m);
mat4x3 const expected = mat4x3(0, 4, 8, 1, 5, 9, 2, 6, 10, 3, 7, 11);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
mat4 t = transpose(m);
mat4 const expected = mat4(0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat4x2 m(0, 1, 2, 3, 4, 5, 6, 7);
mat2x4 t = transpose(m);
mat2x4 const expected = mat2x4(0, 2, 4, 6, 1, 3, 5, 7);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
{
mat4x3 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
mat3x4 t = transpose(m);
mat3x4 const expected = mat3x4(0, 3, 6, 9, 1, 4, 7, 10, 2, 5, 8, 11);
for (length_t l = 0; l < expected.length(); ++l)
Error += all(epsilonEqual(t[l], expected[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(t, expected, epsilon<float>())) ? 0 : 1;
}
return Error;
@@ -205,8 +194,7 @@ int test_inverse()
glm::mat4x4 B4x4 = inverse(A4x4);
glm::mat4x4 I4x4 = A4x4 * B4x4;
glm::mat4x4 Identity(1);
for (length_t l = 0; l < Identity.length(); ++l)
Error += all(epsilonEqual(I4x4[l], Identity[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(I4x4, Identity, epsilon<float>())) ? 0 : 1;
}
{
@@ -217,8 +205,7 @@ int test_inverse()
glm::mat3x3 B3x3 = glm::inverse(A3x3);
glm::mat3x3 I3x3 = A3x3 * B3x3;
glm::mat3x3 Identity(1);
for (length_t l = 0; l < Identity.length(); ++l)
Error += all(epsilonEqual(I3x3[l], Identity[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(I3x3, Identity, epsilon<float>())) ? 0 : 1;
}
{
@@ -228,8 +215,7 @@ int test_inverse()
glm::mat2x2 B2x2 = glm::inverse(A2x2);
glm::mat2x2 I2x2 = A2x2 * B2x2;
glm::mat2x2 Identity(1);
for (length_t l = 0; l < Identity.length(); ++l)
Error += all(epsilonEqual(I2x2[l], Identity[l], epsilon<float>())) ? 0 : 1;
Error += all(equal(I2x2, Identity, epsilon<float>())) ? 0 : 1;
}
return Error;
@@ -249,10 +235,7 @@ int test_inverse_simd()
glm::mat4x4 const B4x4 = glm::inverse(A4x4);
glm::mat4x4 const I4x4 = A4x4 * B4x4;
Error += glm::all(glm::epsilonEqual(I4x4[0], Identity[0], 0.001f)) ? 0 : 1;
Error += glm::all(glm::epsilonEqual(I4x4[1], Identity[1], 0.001f)) ? 0 : 1;
Error += glm::all(glm::epsilonEqual(I4x4[2], Identity[2], 0.001f)) ? 0 : 1;
Error += glm::all(glm::epsilonEqual(I4x4[3], Identity[3], 0.001f)) ? 0 : 1;
Error += glm::all(glm::equal(I4x4, Identity, 0.001f)) ? 0 : 1;
return Error;
}

1
test/ext/CMakeLists.txt
View File

@@ -1,6 +1,7 @@
glmCreateTestGTC(ext_matrix_relational)
glmCreateTestGTC(ext_matrix_transform)
glmCreateTestGTC(ext_matrix_common)
glmCreateTestGTC(ext_matrix_integer)
glmCreateTestGTC(ext_matrix_int2x2_sized)
glmCreateTestGTC(ext_matrix_int2x3_sized)
glmCreateTestGTC(ext_matrix_int2x4_sized)

237
test/ext/ext_matrix_integer.cpp Normal file
View File

@@ -0,0 +1,237 @@
#include <glm/ext/matrix_relational.hpp>
#include <glm/ext/matrix_integer.hpp>
#include <glm/ext/matrix_int2x2.hpp>
#include <glm/ext/matrix_int2x3.hpp>
#include <glm/ext/matrix_int2x4.hpp>
#include <glm/ext/matrix_int3x2.hpp>
#include <glm/ext/matrix_int3x3.hpp>
#include <glm/ext/matrix_int3x4.hpp>
#include <glm/ext/matrix_int4x2.hpp>
#include <glm/ext/matrix_int4x3.hpp>
#include <glm/ext/matrix_int4x4.hpp>
using namespace glm;
int test_matrixCompMult()
{
int Error = 0;
{
imat2 m(0, 1, 2, 3);
imat2 n = matrixCompMult(m, m);
imat2 expected = imat2(0, 1, 4, 9);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat2x3 m(0, 1, 2, 3, 4, 5);
imat2x3 n = matrixCompMult(m, m);
imat2x3 expected = imat2x3(0, 1, 4, 9, 16, 25);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat2x4 m(0, 1, 2, 3, 4, 5, 6, 7);
imat2x4 n = matrixCompMult(m, m);
imat2x4 expected = imat2x4(0, 1, 4, 9, 16, 25, 36, 49);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat3 m(0, 1, 2, 3, 4, 5, 6, 7, 8);
imat3 n = matrixCompMult(m, m);
imat3 expected = imat3(0, 1, 4, 9, 16, 25, 36, 49, 64);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat3x2 m(0, 1, 2, 3, 4, 5);
imat3x2 n = matrixCompMult(m, m);
imat3x2 expected = imat3x2(0, 1, 4, 9, 16, 25);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat3x4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
imat3x4 n = matrixCompMult(m, m);
imat3x4 expected = imat3x4(0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
imat4 n = matrixCompMult(m, m);
imat4 expected = imat4(0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat4x2 m(0, 1, 2, 3, 4, 5, 6, 7);
imat4x2 n = matrixCompMult(m, m);
imat4x2 expected = imat4x2(0, 1, 4, 9, 16, 25, 36, 49);
Error += all(equal(n, expected)) ? 0 : 1;
}
{
imat4x3 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
imat4x3 n = matrixCompMult(m, m);
imat4x3 expected = imat4x3(0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121);
Error += all(equal(n, expected)) ? 0 : 1;
}
return Error;
}
int test_outerProduct()
{
int Error = 0;
{
glm::imat2x2 const m = glm::outerProduct(glm::ivec2(1), glm::ivec2(1));
Error += all(equal(m, glm::imat2x2(1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat2x3 const m = glm::outerProduct(glm::ivec3(1), glm::ivec2(1));
Error += all(equal(m, glm::imat2x3(1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat2x4 const m = glm::outerProduct(glm::ivec4(1), glm::ivec2(1));
Error += all(equal(m, glm::imat2x4(1, 1, 1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat3x2 const m = glm::outerProduct(glm::ivec2(1), glm::ivec3(1));
Error += all(equal(m, glm::imat3x2(1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat3x3 const m = glm::outerProduct(glm::ivec3(1), glm::ivec3(1));
Error += all(equal(m, glm::imat3x3(1, 1, 1, 1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat3x4 const m = glm::outerProduct(glm::ivec4(1), glm::ivec3(1));
Error += all(equal(m, glm::imat3x4(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat4x2 const m = glm::outerProduct(glm::ivec2(1), glm::ivec4(1));
Error += all(equal(m, glm::imat4x2(1, 1, 1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat4x3 const m = glm::outerProduct(glm::ivec3(1), glm::ivec4(1));
Error += all(equal(m, glm::imat4x3(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
{
glm::imat4x4 const m = glm::outerProduct(glm::ivec4(1), glm::ivec4(1));
Error += all(equal(m, glm::imat4x4(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1))) ? 0 : 1;
}
return Error;
}
int test_transpose()
{
int Error = 0;
{
imat2 const m(0, 1, 2, 3);
imat2 const t = transpose(m);
imat2 const expected = imat2(0, 2, 1, 3);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat2x3 m(0, 1, 2, 3, 4, 5);
imat3x2 t = transpose(m);
imat3x2 const expected = imat3x2(0, 3, 1, 4, 2, 5);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat2x4 m(0, 1, 2, 3, 4, 5, 6, 7);
imat4x2 t = transpose(m);
imat4x2 const expected = imat4x2(0, 4, 1, 5, 2, 6, 3, 7);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat3 m(0, 1, 2, 3, 4, 5, 6, 7, 8);
imat3 t = transpose(m);
imat3 const expected = imat3(0, 3, 6, 1, 4, 7, 2, 5, 8);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat3x2 m(0, 1, 2, 3, 4, 5);
imat2x3 t = transpose(m);
imat2x3 const expected = imat2x3(0, 2, 4, 1, 3, 5);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat3x4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
imat4x3 t = transpose(m);
imat4x3 const expected = imat4x3(0, 4, 8, 1, 5, 9, 2, 6, 10, 3, 7, 11);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat4 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
imat4 t = transpose(m);
imat4 const expected = imat4(0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat4x2 m(0, 1, 2, 3, 4, 5, 6, 7);
imat2x4 t = transpose(m);
imat2x4 const expected = imat2x4(0, 2, 4, 6, 1, 3, 5, 7);
Error += all(equal(t, expected)) ? 0 : 1;
}
{
imat4x3 m(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
imat3x4 t = transpose(m);
imat3x4 const expected = imat3x4(0, 3, 6, 9, 1, 4, 7, 10, 2, 5, 8, 11);
Error += all(equal(t, expected)) ? 0 : 1;
}
return Error;
}
int test_determinant()
{
int Error = 0;
{
imat2 const m(1, 1, 1, 1);
int const t = determinant(m);
Error += t == 0 ? 0 : 1;
}
{
imat3 m(1, 1, 1, 1, 1, 1, 1, 1, 1);
int t = determinant(m);
Error += t == 0 ? 0 : 1;
}
{
imat4 m(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
int t = determinant(m);
Error += t == 0 ? 0 : 1;
}
return Error;
}
int main()
{
int Error = 0;
Error += test_matrixCompMult();
Error += test_outerProduct();
Error += test_transpose();
Error += test_determinant();
return Error;
}