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/ext/ext_vector_common.cpp | 365 --------------------- 1 file changed, 365 deletions(-) delete mode 100644 3rdparty/glm/source/test/ext/ext_vector_common.cpp (limited to '3rdparty/glm/source/test/ext/ext_vector_common.cpp') diff --git a/3rdparty/glm/source/test/ext/ext_vector_common.cpp b/3rdparty/glm/source/test/ext/ext_vector_common.cpp deleted file mode 100644 index 211003f..0000000 --- a/3rdparty/glm/source/test/ext/ext_vector_common.cpp +++ /dev/null @@ -1,365 +0,0 @@ -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if ((GLM_LANG & GLM_LANG_CXX11_FLAG) || (GLM_COMPILER & GLM_COMPILER_VC)) -# define GLM_NAN(T) NAN -#else -# define GLM_NAN(T) (static_cast(0.0f) / static_cast(0.0f)) -#endif - -template -static int test_min() -{ - typedef typename vecType::value_type T; - - int Error = 0; - - vecType const N(static_cast(0)); - vecType const B(static_cast(1)); - - Error += glm::all(glm::equal(glm::min(N, B), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(B, N), N, glm::epsilon())) ? 0 : 1; - - vecType const C(static_cast(2)); - Error += glm::all(glm::equal(glm::min(N, B, C), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(B, N, C), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(C, N, B), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(C, B, N), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(B, C, N), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(N, C, B), N, glm::epsilon())) ? 0 : 1; - - vecType const D(static_cast(3)); - Error += glm::all(glm::equal(glm::min(D, N, B, C), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(B, D, N, C), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(C, N, D, B), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(C, B, D, N), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(B, C, N, D), N, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::min(N, C, B, D), N, glm::epsilon())) ? 0 : 1; - - return Error; -} - -template -static int test_min_nan() -{ - typedef typename vecType::value_type T; - - int Error = 0; - - vecType const B(static_cast(1)); - vecType const N(GLM_NAN(T)); - - Error += glm::all(glm::isnan(glm::min(N, B))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(B, N))) ? 0 : 1; - - vecType const C(static_cast(2)); - Error += glm::all(glm::isnan(glm::min(N, B, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(B, N, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(C, N, B))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(C, B, N))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(B, C, N))) ? 0 : 1; - Error += glm::all(glm::isnan(glm::min(N, C, B))) ? 0 : 1; - - vecType const D(static_cast(3)); - Error += !glm::all(glm::isnan(glm::min(D, N, B, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(B, D, N, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(C, N, D, B))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(C, B, D, N))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::min(B, C, N, D))) ? 0 : 1; - Error += glm::all(glm::isnan(glm::min(N, C, B, D))) ? 0 : 1; - - return Error; -} - -template -static int test_max() -{ - typedef typename vecType::value_type T; - - int Error = 0; - - vecType const N(static_cast(0)); - vecType const B(static_cast(1)); - Error += glm::all(glm::equal(glm::max(N, B), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(B, N), B, glm::epsilon())) ? 0 : 1; - - vecType const C(static_cast(2)); - Error += glm::all(glm::equal(glm::max(N, B, C), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(B, N, C), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(C, N, B), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(C, B, N), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(B, C, N), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(N, C, B), C, glm::epsilon())) ? 0 : 1; - - vecType const D(static_cast(3)); - Error += glm::all(glm::equal(glm::max(D, N, B, C), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(B, D, N, C), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(C, N, D, B), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(C, B, D, N), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(B, C, N, D), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::max(N, C, B, D), D, glm::epsilon())) ? 0 : 1; - - return Error; -} - -template -static int test_max_nan() -{ - typedef typename vecType::value_type T; - - int Error = 0; - - vecType const B(static_cast(1)); - vecType const N(GLM_NAN(T)); - - Error += glm::all(glm::isnan(glm::max(N, B))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(B, N))) ? 0 : 1; - - vecType const C(static_cast(2)); - Error += glm::all(glm::isnan(glm::max(N, B, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(B, N, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(C, N, B))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(C, B, N))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(B, C, N))) ? 0 : 1; - Error += glm::all(glm::isnan(glm::max(N, C, B))) ? 0 : 1; - - vecType const D(static_cast(3)); - Error += !glm::all(glm::isnan(glm::max(D, N, B, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(B, D, N, C))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(C, N, D, B))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(C, B, D, N))) ? 0 : 1; - Error += !glm::all(glm::isnan(glm::max(B, C, N, D))) ? 0 : 1; - Error += glm::all(glm::isnan(glm::max(N, C, B, D))) ? 0 : 1; - - return Error; -} - -template -static int test_fmin() -{ - typedef typename vecType::value_type T; - - int Error = 0; - - vecType const B(static_cast(1)); - vecType const N(GLM_NAN(T)); - - Error += glm::all(glm::equal(glm::fmin(N, B), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(B, N), B, glm::epsilon())) ? 0 : 1; - - vecType const C(static_cast(2)); - Error += glm::all(glm::equal(glm::fmin(N, B, C), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(B, N, C), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(C, N, B), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(C, B, N), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(B, C, N), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(N, C, B), B, glm::epsilon())) ? 0 : 1; - - vecType const D(static_cast(3)); - Error += glm::all(glm::equal(glm::fmin(D, N, B, C), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(B, D, N, C), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(C, N, D, B), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(C, B, D, N), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(B, C, N, D), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmin(N, C, B, D), B, glm::epsilon())) ? 0 : 1; - - return Error; -} - -template -static int test_fmax() -{ - typedef typename vecType::value_type T; - - int Error = 0; - - vecType const B(static_cast(1)); - vecType const N(GLM_NAN(T)); - - Error += glm::all(glm::equal(glm::fmax(N, B), B, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(B, N), B, glm::epsilon())) ? 0 : 1; - - vecType const C(static_cast(2)); - Error += glm::all(glm::equal(glm::fmax(N, B, C), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(B, N, C), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(C, N, B), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(C, B, N), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(B, C, N), C, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(N, C, B), C, glm::epsilon())) ? 0 : 1; - - vecType const D(static_cast(3)); - Error += glm::all(glm::equal(glm::fmax(D, N, B, C), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(B, D, N, C), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(C, N, D, B), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(C, B, D, N), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(B, C, N, D), D, glm::epsilon())) ? 0 : 1; - Error += glm::all(glm::equal(glm::fmax(N, C, B, D), D, glm::epsilon())) ? 0 : 1; - - return Error; -} - -static int test_clamp() -{ - int Error = 0; - - glm::vec2 K = glm::clamp(glm::vec2(0.5f)); - Error += glm::all(glm::equal(K, glm::vec2(0.5f), glm::vec2(0.00001f))) ? 0 : 1; - - glm::vec3 L = glm::clamp(glm::vec3(0.5f)); - Error += glm::all(glm::equal(L, glm::vec3(0.5f), glm::vec3(0.00001f))) ? 0 : 1; - - glm::vec4 M = glm::clamp(glm::vec4(0.5f)); - Error += glm::all(glm::equal(M, glm::vec4(0.5f), glm::vec4(0.00001f))) ? 0 : 1; - - glm::vec1 N = glm::clamp(glm::vec1(0.5f)); - Error += glm::all(glm::equal(N, glm::vec1(0.5f), glm::vec1(0.00001f))) ? 0 : 1; - - return Error; -} - -static int test_repeat() -{ - int Error = 0; - - glm::vec2 K = glm::repeat(glm::vec2(0.5f)); - Error += glm::all(glm::equal(K, glm::vec2(0.5f), glm::vec2(0.00001f))) ? 0 : 1; - - glm::vec3 L = glm::repeat(glm::vec3(0.5f)); - Error += glm::all(glm::equal(L, glm::vec3(0.5f), glm::vec3(0.00001f))) ? 0 : 1; - - glm::vec4 M = glm::repeat(glm::vec4(0.5f)); - Error += glm::all(glm::equal(M, glm::vec4(0.5f), glm::vec4(0.00001f))) ? 0 : 1; - - glm::vec1 N = glm::repeat(glm::vec1(0.5f)); - Error += glm::all(glm::equal(N, glm::vec1(0.5f), glm::vec1(0.00001f))) ? 0 : 1; - - return Error; -} - -static int test_mirrorClamp() -{ - int Error = 0; - - glm::vec2 K = glm::mirrorClamp(glm::vec2(0.5f)); - Error += glm::all(glm::equal(K, glm::vec2(0.5f), glm::vec2(0.00001f))) ? 0 : 1; - - glm::vec3 L = glm::mirrorClamp(glm::vec3(0.5f)); - Error += glm::all(glm::equal(L, glm::vec3(0.5f), glm::vec3(0.00001f))) ? 0 : 1; - - glm::vec4 M = glm::mirrorClamp(glm::vec4(0.5f)); - Error += glm::all(glm::equal(M, glm::vec4(0.5f), glm::vec4(0.00001f))) ? 0 : 1; - - glm::vec1 N = glm::mirrorClamp(glm::vec1(0.5f)); - Error += glm::all(glm::equal(N, glm::vec1(0.5f), glm::vec1(0.00001f))) ? 0 : 1; - - return Error; -} - -static int test_mirrorRepeat() -{ - int Error = 0; - - glm::vec2 K = glm::mirrorRepeat(glm::vec2(0.5f)); - Error += glm::all(glm::equal(K, glm::vec2(0.5f), glm::vec2(0.00001f))) ? 0 : 1; - - glm::vec3 L = glm::mirrorRepeat(glm::vec3(0.5f)); - Error += glm::all(glm::equal(L, glm::vec3(0.5f), glm::vec3(0.00001f))) ? 0 : 1; - - glm::vec4 M = glm::mirrorRepeat(glm::vec4(0.5f)); - Error += glm::all(glm::equal(M, glm::vec4(0.5f), glm::vec4(0.00001f))) ? 0 : 1; - - glm::vec1 N = glm::mirrorRepeat(glm::vec1(0.5f)); - Error += glm::all(glm::equal(N, glm::vec1(0.5f), glm::vec1(0.00001f))) ? 0 : 1; - - return Error; -} - -static int test_iround() -{ - int Error = 0; - - for(float f = 0.0f; f < 3.1f; f += 0.05f) - { - int RoundFast = static_cast(glm::iround(f)); - int RoundSTD = static_cast(glm::round(f)); - Error += RoundFast == RoundSTD ? 0 : 1; - assert(!Error); - } - - return Error; -} - -static int test_uround() -{ - int Error = 0; - - for(float f = 0.0f; f < 3.1f; f += 0.05f) - { - int RoundFast = static_cast(glm::uround(f)); - int RoundSTD = static_cast(glm::round(f)); - Error += RoundFast == RoundSTD ? 0 : 1; - assert(!Error); - } - - return Error; -} - -int main() -{ - int Error = 0; - - Error += test_min(); - Error += test_min(); - Error += test_min_nan(); - Error += test_min_nan(); - - Error += test_max(); - Error += test_max(); - Error += test_max_nan(); - Error += test_max_nan(); - - Error += test_fmin(); - Error += test_fmin(); - - Error += test_fmax(); - Error += test_fmax(); - - Error += test_clamp(); - Error += test_repeat(); - Error += test_mirrorClamp(); - Error += test_mirrorRepeat(); - - Error += test_iround(); - Error += test_uround(); - - return Error; -} -- cgit v1.2.3-70-g09d2