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/gtx/gtx_io.cpp | 186 -------------------------------- 1 file changed, 186 deletions(-) delete mode 100644 3rdparty/glm/source/test/gtx/gtx_io.cpp (limited to '3rdparty/glm/source/test/gtx/gtx_io.cpp') diff --git a/3rdparty/glm/source/test/gtx/gtx_io.cpp b/3rdparty/glm/source/test/gtx/gtx_io.cpp deleted file mode 100644 index 7d90fd7..0000000 --- a/3rdparty/glm/source/test/gtx/gtx_io.cpp +++ /dev/null @@ -1,186 +0,0 @@ -#define GLM_ENABLE_EXPERIMENTAL -#include -#if GLM_LANG & GLM_LANG_CXXMS_FLAG -#include -#include -#include -#include -#include - -namespace -{ - template - std::basic_ostream& operator<<(std::basic_ostream& os, glm::qualifier const& a) - { - typename std::basic_ostream::sentry const cerberus(os); - - if (cerberus) - { - switch (a) { - case glm::highp: os << "uhi"; break; - case glm::mediump: os << "umd"; break; - case glm::lowp: os << "ulo"; break; -# if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE - case glm::aligned_highp: os << "ahi"; break; - case glm::aligned_mediump: os << "amd"; break; - case glm::aligned_lowp: os << "alo"; break; -# endif - } - } - - return os; - } - - template - std::basic_string type_name(std::basic_ostream&, T const&) - { - std::basic_ostringstream ostr; - - if (typeid(T) == typeid(glm::qua)) { ostr << "quat"; } - else if (typeid(T) == typeid(glm::vec<2, U,P>)) { ostr << "vec2"; } - else if (typeid(T) == typeid(glm::vec<3, U,P>)) { ostr << "vec3"; } - else if (typeid(T) == typeid(glm::vec<4, U,P>)) { ostr << "vec4"; } - else if (typeid(T) == typeid(glm::mat<2, 2, U,P>)) { ostr << "mat2x2"; } - else if (typeid(T) == typeid(glm::mat<2, 3, U,P>)) { ostr << "mat2x3"; } - else if (typeid(T) == typeid(glm::mat<2, 4, U,P>)) { ostr << "mat2x4"; } - else if (typeid(T) == typeid(glm::mat<3, 2, U,P>)) { ostr << "mat3x2"; } - else if (typeid(T) == typeid(glm::mat<3, 3, U,P>)) { ostr << "mat3x3"; } - else if (typeid(T) == typeid(glm::mat<3, 4, U,P>)) { ostr << "mat3x4"; } - else if (typeid(T) == typeid(glm::mat<4, 2, U,P>)) { ostr << "mat4x2"; } - else if (typeid(T) == typeid(glm::mat<4, 3, U,P>)) { ostr << "mat4x3"; } - else if (typeid(T) == typeid(glm::mat<4, 4, U,P>)) { ostr << "mat4x4"; } - else { ostr << "unknown"; } - - ostr << '<' << typeid(U).name() << ',' << P << '>'; - - return ostr.str(); - } -} // namespace { - -template -int test_io_quat(OS& os) -{ - os << '\n' << typeid(OS).name() << '\n'; - - glm::qua const q(1, 0, 0, 0); - - { - glm::io::basic_format_saver const iofs(os); - - os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) - << type_name(os, q) << ": " << q << '\n'; - } - - { - glm::io::basic_format_saver const iofs(os); - - os << glm::io::unformatted - << type_name(os, q) << ": " << q << '\n'; - } - - return 0; -} - -template -int test_io_vec(OS& os) -{ - os << '\n' << typeid(OS).name() << '\n'; - - glm::vec<2, T,P> const v2(0, 1); - glm::vec<3, T,P> const v3(2, 3, 4); - glm::vec<4, T,P> const v4(5, 6, 7, 8); - - os << type_name(os, v2) << ": " << v2 << '\n' - << type_name(os, v3) << ": " << v3 << '\n' - << type_name(os, v4) << ": " << v4 << '\n'; - - glm::io::basic_format_saver const iofs(os); - - os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) - << type_name(os, v2) << ": " << v2 << '\n' - << type_name(os, v3) << ": " << v3 << '\n' - << type_name(os, v4) << ": " << v4 << '\n'; - - return 0; -} - -template -int test_io_mat(OS& os, glm::io::order_type otype) -{ - os << '\n' << typeid(OS).name() << '\n'; - - glm::vec<2, T,P> const v2_1( 0, 1); - glm::vec<2, T,P> const v2_2( 2, 3); - glm::vec<2, T,P> const v2_3( 4, 5); - glm::vec<2, T,P> const v2_4( 6, 7); - glm::vec<3, T,P> const v3_1( 8, 9, 10); - glm::vec<3, T,P> const v3_2(11, 12, 13); - glm::vec<3, T,P> const v3_3(14, 15, 16); - glm::vec<3, T,P> const v3_4(17, 18, 19); - glm::vec<4, T,P> const v4_1(20, 21, 22, 23); - glm::vec<4, T,P> const v4_2(24, 25, 26, 27); - glm::vec<4, T,P> const v4_3(28, 29, 30, 31); - glm::vec<4, T,P> const v4_4(32, 33, 34, 35); - - glm::io::basic_format_saver const iofs(os); - - os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) - << glm::io::order(otype) - << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::mat<2, 2, T,P>(v2_1, v2_2) << '\n' - << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::mat<2, 3, T,P>(v3_1, v3_2) << '\n' - << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::mat<2, 4, T,P>(v4_1, v4_2) << '\n' - << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::mat<3, 2, T,P>(v2_1, v2_2, v2_3) << '\n' - << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::mat<3, 3, T,P>(v3_1, v3_2, v3_3) << '\n' - << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::mat<3, 4, T,P>(v4_1, v4_2, v4_3) << '\n' - << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::mat<4, 2, T,P>(v2_1, v2_2, v2_3, v2_4) << '\n' - << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::mat<4, 3, T,P>(v3_1, v3_2, v3_3, v3_4) << '\n' - << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::mat<4, 4, T,P>(v4_1, v4_2, v4_3, v4_4) << '\n'; - - os << glm::io::unformatted - << glm::io::order(otype) - << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::mat<2, 2, T,P>(v2_1, v2_2) << '\n' - << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::mat<2, 3, T,P>(v3_1, v3_2) << '\n' - << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::mat<2, 4, T,P>(v4_1, v4_2) << '\n' - << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::mat<3, 2, T,P>(v2_1, v2_2, v2_3) << '\n' - << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::mat<3, 3, T,P>(v3_1, v3_2, v3_3) << '\n' - << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::mat<3, 4, T,P>(v4_1, v4_2, v4_3) << '\n' - << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::mat<4, 2, T,P>(v2_1, v2_2, v2_3, v2_4) << '\n' - << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::mat<4, 3, T,P>(v3_1, v3_2, v3_3, v3_4) << '\n' - << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::mat<4, 4, T,P>(v4_1, v4_2, v4_3, v4_4) << '\n'; - - return 0; -} - -int main() -{ - int Error(0); - - Error += test_io_quat(std::cout); - Error += test_io_quat(std::wcout); - Error += test_io_quat(std::cout); - Error += test_io_quat(std::wcout); - Error += test_io_quat(std::cout); - Error += test_io_quat(std::wcout); - - Error += test_io_vec(std::cout); - Error += test_io_vec(std::wcout); - Error += test_io_vec(std::cout); - Error += test_io_vec(std::wcout); - Error += test_io_vec(std::cout); - Error += test_io_vec(std::wcout); - - Error += test_io_mat(std::cout, glm::io::column_major); - Error += test_io_mat(std::wcout, glm::io::column_major); - Error += test_io_mat(std::cout, glm::io::row_major); - Error += test_io_mat(std::wcout, glm::io::row_major); - - return Error; -} -#else - -int main() -{ - return 0; -} - -#endif// GLM_LANG & GLM_LANG_CXXMS_FLAG -- cgit v1.2.3-70-g09d2