From 047f294de1b4d385b811ac9f5afc393d81cc4ae9 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sat, 16 Aug 2025 11:23:49 -0700 Subject: Copy changes from the no-history fork, generated back in 2023 Original commit message: > commit f138311d2d2e0cc9ba0496d523bb46f2c1c9fb73 > Author: rtk0c > Date: Wed Sep 20 23:58:58 2023 -0700 > > Copy from the PlasticSCM repo, replace vendored glm wtih conan In reality, this also introduced a few uncommitted changes in the original PlasticSCM repo. See the modified and new files in this patch. --- 3rdparty/glm/source/test/gtc/gtc_matrix_access.cpp | 383 --------------------- 1 file changed, 383 deletions(-) delete mode 100644 3rdparty/glm/source/test/gtc/gtc_matrix_access.cpp (limited to '3rdparty/glm/source/test/gtc/gtc_matrix_access.cpp') diff --git a/3rdparty/glm/source/test/gtc/gtc_matrix_access.cpp b/3rdparty/glm/source/test/gtc/gtc_matrix_access.cpp deleted file mode 100644 index 1b966e2..0000000 --- a/3rdparty/glm/source/test/gtc/gtc_matrix_access.cpp +++ /dev/null @@ -1,383 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int test_mat2x2_row_set() -{ - int Error = 0; - - glm::mat2x2 m(1); - - m = glm::row(m, 0, glm::vec2( 0, 1)); - m = glm::row(m, 1, glm::vec2( 4, 5)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec2( 0, 1), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec2( 4, 5), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat2x2_col_set() -{ - int Error = 0; - - glm::mat2x2 m(1); - - m = glm::column(m, 0, glm::vec2( 0, 1)); - m = glm::column(m, 1, glm::vec2( 4, 5)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec2( 0, 1), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec2( 4, 5), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat2x3_row_set() -{ - int Error = 0; - - glm::mat2x3 m(1); - - m = glm::row(m, 0, glm::vec2( 0, 1)); - m = glm::row(m, 1, glm::vec2( 4, 5)); - m = glm::row(m, 2, glm::vec2( 8, 9)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec2( 0, 1), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec2( 4, 5), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 2), glm::vec2( 8, 9), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat2x3_col_set() -{ - int Error = 0; - - glm::mat2x3 m(1); - - m = glm::column(m, 0, glm::vec3( 0, 1, 2)); - m = glm::column(m, 1, glm::vec3( 4, 5, 6)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec3( 0, 1, 2), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec3( 4, 5, 6), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat2x4_row_set() -{ - int Error = 0; - - glm::mat2x4 m(1); - - m = glm::row(m, 0, glm::vec2( 0, 1)); - m = glm::row(m, 1, glm::vec2( 4, 5)); - m = glm::row(m, 2, glm::vec2( 8, 9)); - m = glm::row(m, 3, glm::vec2(12, 13)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec2( 0, 1), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec2( 4, 5), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 2), glm::vec2( 8, 9), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 3), glm::vec2(12, 13), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat2x4_col_set() -{ - int Error = 0; - - glm::mat2x4 m(1); - - m = glm::column(m, 0, glm::vec4( 0, 1, 2, 3)); - m = glm::column(m, 1, glm::vec4( 4, 5, 6, 7)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec4( 0, 1, 2, 3), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec4( 4, 5, 6, 7), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat3x2_row_set() -{ - int Error = 0; - - glm::mat3x2 m(1); - - m = glm::row(m, 0, glm::vec3( 0, 1, 2)); - m = glm::row(m, 1, glm::vec3( 4, 5, 6)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec3( 0, 1, 2), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec3( 4, 5, 6), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat3x2_col_set() -{ - int Error = 0; - - glm::mat3x2 m(1); - - m = glm::column(m, 0, glm::vec2( 0, 1)); - m = glm::column(m, 1, glm::vec2( 4, 5)); - m = glm::column(m, 2, glm::vec2( 8, 9)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec2( 0, 1), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec2( 4, 5), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 2), glm::vec2( 8, 9), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat3x3_row_set() -{ - int Error = 0; - - glm::mat3x3 m(1); - - m = glm::row(m, 0, glm::vec3( 0, 1, 2)); - m = glm::row(m, 1, glm::vec3( 4, 5, 6)); - m = glm::row(m, 2, glm::vec3( 8, 9, 10)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec3( 0, 1, 2), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec3( 4, 5, 6), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 2), glm::vec3( 8, 9, 10), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat3x3_col_set() -{ - int Error = 0; - - glm::mat3x3 m(1); - - m = glm::column(m, 0, glm::vec3( 0, 1, 2)); - m = glm::column(m, 1, glm::vec3( 4, 5, 6)); - m = glm::column(m, 2, glm::vec3( 8, 9, 10)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec3( 0, 1, 2), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec3( 4, 5, 6), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 2), glm::vec3( 8, 9, 10), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat3x4_row_set() -{ - int Error = 0; - - glm::mat3x4 m(1); - - m = glm::row(m, 0, glm::vec3( 0, 1, 2)); - m = glm::row(m, 1, glm::vec3( 4, 5, 6)); - m = glm::row(m, 2, glm::vec3( 8, 9, 10)); - m = glm::row(m, 3, glm::vec3(12, 13, 14)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec3( 0, 1, 2), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec3( 4, 5, 6), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 2), glm::vec3( 8, 9, 10), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 3), glm::vec3(12, 13, 14), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat3x4_col_set() -{ - int Error = 0; - - glm::mat3x4 m(1); - - m = glm::column(m, 0, glm::vec4( 0, 1, 2, 3)); - m = glm::column(m, 1, glm::vec4( 4, 5, 6, 7)); - m = glm::column(m, 2, glm::vec4( 8, 9, 10, 11)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec4( 0, 1, 2, 3), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec4( 4, 5, 6, 7), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 2), glm::vec4( 8, 9, 10, 11), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x2_row_set() -{ - int Error = 0; - - glm::mat4x2 m(1); - - m = glm::row(m, 0, glm::vec4( 0, 1, 2, 3)); - m = glm::row(m, 1, glm::vec4( 4, 5, 6, 7)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec4( 0, 1, 2, 3), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec4( 4, 5, 6, 7), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x2_col_set() -{ - int Error = 0; - - glm::mat4x2 m(1); - - m = glm::column(m, 0, glm::vec2( 0, 1)); - m = glm::column(m, 1, glm::vec2( 4, 5)); - m = glm::column(m, 2, glm::vec2( 8, 9)); - m = glm::column(m, 3, glm::vec2(12, 13)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec2( 0, 1), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec2( 4, 5), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 2), glm::vec2( 8, 9), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 3), glm::vec2(12, 13), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x3_row_set() -{ - int Error = 0; - - glm::mat4x3 m(1); - - m = glm::row(m, 0, glm::vec4( 0, 1, 2, 3)); - m = glm::row(m, 1, glm::vec4( 4, 5, 6, 7)); - m = glm::row(m, 2, glm::vec4( 8, 9, 10, 11)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec4( 0, 1, 2, 3), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec4( 4, 5, 6, 7), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 2), glm::vec4( 8, 9, 10, 11), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x3_col_set() -{ - int Error = 0; - - glm::mat4x3 m(1); - - m = glm::column(m, 0, glm::vec3( 0, 1, 2)); - m = glm::column(m, 1, glm::vec3( 4, 5, 6)); - m = glm::column(m, 2, glm::vec3( 8, 9, 10)); - m = glm::column(m, 3, glm::vec3(12, 13, 14)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec3( 0, 1, 2), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec3( 4, 5, 6), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 2), glm::vec3( 8, 9, 10), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 3), glm::vec3(12, 13, 14), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x4_row_set() -{ - int Error = 0; - - glm::mat4 m(1); - - m = glm::row(m, 0, glm::vec4( 0, 1, 2, 3)); - m = glm::row(m, 1, glm::vec4( 4, 5, 6, 7)); - m = glm::row(m, 2, glm::vec4( 8, 9, 10, 11)); - m = glm::row(m, 3, glm::vec4(12, 13, 14, 15)); - - Error += glm::all(glm::equal(glm::row(m, 0), glm::vec4( 0, 1, 2, 3), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 1), glm::vec4( 4, 5, 6, 7), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 2), glm::vec4( 8, 9, 10, 11), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::row(m, 3), glm::vec4(12, 13, 14, 15), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x4_col_set() -{ - int Error = 0; - - glm::mat4 m(1); - - m = glm::column(m, 0, glm::vec4( 0, 1, 2, 3)); - m = glm::column(m, 1, glm::vec4( 4, 5, 6, 7)); - m = glm::column(m, 2, glm::vec4( 8, 9, 10, 11)); - m = glm::column(m, 3, glm::vec4(12, 13, 14, 15)); - - Error += glm::all(glm::equal(glm::column(m, 0), glm::vec4( 0, 1, 2, 3), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 1), glm::vec4( 4, 5, 6, 7), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 2), glm::vec4( 8, 9, 10, 11), glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::column(m, 3), glm::vec4(12, 13, 14, 15), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x4_row_get() -{ - int Error = 0; - - glm::mat4 m(1); - - glm::vec4 A = glm::row(m, 0); - Error += glm::all(glm::equal(A, glm::vec4(1, 0, 0, 0), glm::epsilon())) ? 0 : 1; - glm::vec4 B = glm::row(m, 1); - Error += glm::all(glm::equal(B, glm::vec4(0, 1, 0, 0), glm::epsilon())) ? 0 : 1; - glm::vec4 C = glm::row(m, 2); - Error += glm::all(glm::equal(C, glm::vec4(0, 0, 1, 0), glm::epsilon())) ? 0 : 1; - glm::vec4 D = glm::row(m, 3); - Error += glm::all(glm::equal(D, glm::vec4(0, 0, 0, 1), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int test_mat4x4_col_get() -{ - int Error = 0; - - glm::mat4 m(1); - - glm::vec4 A = glm::column(m, 0); - Error += glm::all(glm::equal(A, glm::vec4(1, 0, 0, 0), glm::epsilon())) ? 0 : 1; - glm::vec4 B = glm::column(m, 1); - Error += glm::all(glm::equal(B, glm::vec4(0, 1, 0, 0), glm::epsilon())) ? 0 : 1; - glm::vec4 C = glm::column(m, 2); - Error += glm::all(glm::equal(C, glm::vec4(0, 0, 1, 0), glm::epsilon())) ? 0 : 1; - glm::vec4 D = glm::column(m, 3); - Error += glm::all(glm::equal(D, glm::vec4(0, 0, 0, 1), glm::epsilon())) ? 0 : 1; - - return Error; -} - -int main() -{ - int Error = 0; - - Error += test_mat2x2_row_set(); - Error += test_mat2x2_col_set(); - Error += test_mat2x3_row_set(); - Error += test_mat2x3_col_set(); - Error += test_mat2x4_row_set(); - Error += test_mat2x4_col_set(); - Error += test_mat3x2_row_set(); - Error += test_mat3x2_col_set(); - Error += test_mat3x3_row_set(); - Error += test_mat3x3_col_set(); - Error += test_mat3x4_row_set(); - Error += test_mat3x4_col_set(); - Error += test_mat4x2_row_set(); - Error += test_mat4x2_col_set(); - Error += test_mat4x3_row_set(); - Error += test_mat4x3_col_set(); - Error += test_mat4x4_row_set(); - Error += test_mat4x4_col_set(); - - Error += test_mat4x4_row_get(); - Error += test_mat4x4_col_get(); - - return Error; -} -- cgit v1.2.3-70-g09d2