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_spline.cpp | 100 ---------------------------- 1 file changed, 100 deletions(-) delete mode 100644 3rdparty/glm/source/test/gtx/gtx_spline.cpp (limited to '3rdparty/glm/source/test/gtx/gtx_spline.cpp') diff --git a/3rdparty/glm/source/test/gtx/gtx_spline.cpp b/3rdparty/glm/source/test/gtx/gtx_spline.cpp deleted file mode 100644 index c93ee17..0000000 --- a/3rdparty/glm/source/test/gtx/gtx_spline.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#define GLM_ENABLE_EXPERIMENTAL -#include -#include -#include -#include - -namespace catmullRom -{ - int test() - { - int Error(0); - - glm::vec2 Result2 = glm::catmullRom( - glm::vec2(0.0f, 0.0f), - glm::vec2(1.0f, 0.0f), - glm::vec2(1.0f, 1.0f), - glm::vec2(0.0f, 1.0f), 0.5f); - - glm::vec3 Result3 = glm::catmullRom( - glm::vec3(0.0f, 0.0f, 0.0f), - glm::vec3(1.0f, 0.0f, 0.0f), - glm::vec3(1.0f, 1.0f, 0.0f), - glm::vec3(0.0f, 1.0f, 0.0f), 0.5f); - - glm::vec4 Result4 = glm::catmullRom( - glm::vec4(0.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), 0.5f); - - return Error; - } -}//catmullRom - -namespace hermite -{ - int test() - { - int Error(0); - - glm::vec2 Result2 = glm::hermite( - glm::vec2(0.0f, 0.0f), - glm::vec2(1.0f, 0.0f), - glm::vec2(1.0f, 1.0f), - glm::vec2(0.0f, 1.0f), 0.5f); - - glm::vec3 Result3 = glm::hermite( - glm::vec3(0.0f, 0.0f, 0.0f), - glm::vec3(1.0f, 0.0f, 0.0f), - glm::vec3(1.0f, 1.0f, 0.0f), - glm::vec3(0.0f, 1.0f, 0.0f), 0.5f); - - glm::vec4 Result4 = glm::hermite( - glm::vec4(0.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), 0.5f); - - return Error; - } -}//catmullRom - -namespace cubic -{ - int test() - { - int Error(0); - - glm::vec2 Result2 = glm::cubic( - glm::vec2(0.0f, 0.0f), - glm::vec2(1.0f, 0.0f), - glm::vec2(1.0f, 1.0f), - glm::vec2(0.0f, 1.0f), 0.5f); - - glm::vec3 Result3 = glm::cubic( - glm::vec3(0.0f, 0.0f, 0.0f), - glm::vec3(1.0f, 0.0f, 0.0f), - glm::vec3(1.0f, 1.0f, 0.0f), - glm::vec3(0.0f, 1.0f, 0.0f), 0.5f); - - glm::vec4 Result = glm::cubic( - glm::vec4(0.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), 0.5f); - - return Error; - } -}//catmullRom - -int main() -{ - int Error(0); - - Error += catmullRom::test(); - Error += hermite::test(); - Error += cubic::test(); - - return Error; -} -- cgit v1.2.3-70-g09d2