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_intersect.cpp | 88 -------------------------- 1 file changed, 88 deletions(-) delete mode 100644 3rdparty/glm/source/test/gtx/gtx_intersect.cpp (limited to '3rdparty/glm/source/test/gtx/gtx_intersect.cpp') diff --git a/3rdparty/glm/source/test/gtx/gtx_intersect.cpp b/3rdparty/glm/source/test/gtx/gtx_intersect.cpp deleted file mode 100644 index c4a1b2a..0000000 --- a/3rdparty/glm/source/test/gtx/gtx_intersect.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#define GLM_ENABLE_EXPERIMENTAL -#include -#include -#include - -int test_intersectRayPlane() -{ - int Error = 0; - glm::vec3 const PlaneOrigin(0, 0, 1); - glm::vec3 const PlaneNormal(0, 0, -1); - glm::vec3 const RayOrigin(0, 0, 0); - glm::vec3 const RayDir(0, 0, 1); - - // check that inversion of the plane normal has no effect - { - float Distance = 0; - bool const Result = glm::intersectRayPlane(RayOrigin, RayDir, PlaneOrigin, PlaneNormal, Distance); - Error += glm::abs(Distance - 1.f) <= std::numeric_limits::epsilon() ? 0 : 1; - Error += Result ? 0 : 1; - } - { - float Distance = 0; - bool const Result = glm::intersectRayPlane(RayOrigin, RayDir, PlaneOrigin, -1.f * PlaneNormal, Distance); - Error += glm::abs(Distance - 1.f) <= std::numeric_limits::epsilon() ? 0 : 1; - Error += Result ? 0 : 1; - } - - // check if plane is before of behind the ray origin - { - float Distance = 9.9999f; // value should not be changed - bool const Result = glm::intersectRayPlane(RayOrigin, RayDir, -1.f * PlaneOrigin, PlaneNormal, Distance); - Error += glm::abs(Distance - 9.9999f) <= std::numeric_limits::epsilon() ? 0 : 1; - Error += Result ? 1 : 0; // there is no intersection in front of the ray origin, only behind - } - - return Error; -} - -int test_intersectRayTriangle() -{ - int Error = 0; - - glm::vec3 const Orig(0, 0, 2); - glm::vec3 const Dir(0, 0, -1); - glm::vec3 const Vert0(0, 0, 0); - glm::vec3 const Vert1(-1, -1, 0); - glm::vec3 const Vert2(1, -1, 0); - glm::vec2 BaryPosition(0); - float Distance = 0; - - bool const Result = glm::intersectRayTriangle(Orig, Dir, Vert0, Vert1, Vert2, BaryPosition, Distance); - - Error += glm::all(glm::epsilonEqual(BaryPosition, glm::vec2(0), std::numeric_limits::epsilon())) ? 0 : 1; - Error += glm::abs(Distance - 2.f) <= std::numeric_limits::epsilon() ? 0 : 1; - Error += Result ? 0 : 1; - - return Error; -} - -int test_intersectLineTriangle() -{ - int Error = 0; - - glm::vec3 const Orig(0, 0, 2); - glm::vec3 const Dir(0, 0, -1); - glm::vec3 const Vert0(0, 0, 0); - glm::vec3 const Vert1(-1, -1, 0); - glm::vec3 const Vert2(1, -1, 0); - glm::vec3 Position(2.0f, 0.0f, 0.0f); - - bool const Result = glm::intersectLineTriangle(Orig, Dir, Vert0, Vert1, Vert2, Position); - - Error += glm::all(glm::epsilonEqual(Position, glm::vec3(2.0f, 0.0f, 0.0f), std::numeric_limits::epsilon())) ? 0 : 1; - Error += Result ? 0 : 1; - - return Error; -} - -int main() -{ - int Error = 0; - - Error += test_intersectRayPlane(); - Error += test_intersectRayTriangle(); - Error += test_intersectLineTriangle(); - - return Error; -} -- cgit v1.2.3-70-g09d2