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/cmake/CMakeLists.txt | 8 -------- 3rdparty/glm/source/test/cmake/test_find_glm.cpp | 22 ---------------------- 2 files changed, 30 deletions(-) delete mode 100644 3rdparty/glm/source/test/cmake/CMakeLists.txt delete mode 100644 3rdparty/glm/source/test/cmake/test_find_glm.cpp (limited to '3rdparty/glm/source/test/cmake') diff --git a/3rdparty/glm/source/test/cmake/CMakeLists.txt b/3rdparty/glm/source/test/cmake/CMakeLists.txt deleted file mode 100644 index 5bc11ef..0000000 --- a/3rdparty/glm/source/test/cmake/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.2 FATAL_ERROR) -project(test_find_glm) - -find_package(glm REQUIRED) - -add_executable(test_find_glm test_find_glm.cpp) -target_link_libraries(test_find_glm glm::glm) - diff --git a/3rdparty/glm/source/test/cmake/test_find_glm.cpp b/3rdparty/glm/source/test/cmake/test_find_glm.cpp deleted file mode 100644 index 361b977..0000000 --- a/3rdparty/glm/source/test/cmake/test_find_glm.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include -#include -#include - -glm::mat4 camera(float Translate, glm::vec2 const& Rotate) -{ - glm::mat4 Projection = glm::perspective(glm::pi() * 0.25f, 4.0f / 3.0f, 0.1f, 100.f); - glm::mat4 View = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, -Translate)); - View = glm::rotate(View, Rotate.y, glm::vec3(-1.0f, 0.0f, 0.0f)); - View = glm::rotate(View, Rotate.x, glm::vec3(0.0f, 1.0f, 0.0f)); - glm::mat4 Model = glm::scale(glm::mat4(1.0f), glm::vec3(0.5f)); - return Projection * View * Model; -} - -int main() -{ - const glm::mat4 m = camera(1.f, glm::vec2(1.f, 0.5f)); - std::cout << "matrix diagonal: " << m[0][0] << ", " - << m[1][1] << ", " << m[2][2] << ", " << m[3][3] << "\n"; - return 0; -} - -- cgit v1.2.3-70-g09d2