From 95eed94c9294f719724283e672cc7c83b2abd282 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 7 Jan 2024 01:10:26 +0000
Subject: Unified crossProduct

---
 lib/ray.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/ray.cpp')

diff --git a/lib/ray.cpp b/lib/ray.cpp
index 9fb3648..254ad14 100644
--- a/lib/ray.cpp
+++ b/lib/ray.cpp
@@ -1,4 +1,5 @@
 #include "ray.h"
+#include "maths.h"
 #include <algorithm>
 
 Ray
@@ -14,8 +15,8 @@ Ray::distanceToLine(const Position3D & p1, const Position3D & e1) const
 	const auto diff = p1 - e1;
 	const auto d1 = glm::normalize(diff);
 	const auto &p2 = start, &d2 = direction;
-	const auto n = glm::cross(d1, d2);
-	const auto n2 = glm::cross(d2, n);
+	const auto n = crossProduct(d1, d2);
+	const auto n2 = crossProduct(d2, n);
 	const auto c1 = p1 + (glm::dot((p2 - p1), n2) / glm::dot(d1, n2)) * d1;
 	const auto difflength = glm::length(diff);
 	if (glm::length(c1 - p1) > difflength || glm::length(c1 - e1) > difflength) {
-- 
cgit v1.2.3


From 6a1df3dfbae98a05e74c646cc216fbc19ffdb6d6 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 7 Jan 2024 13:04:31 +0000
Subject: Template Ray on position type

---
 lib/ray.cpp | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 lib/ray.cpp

(limited to 'lib/ray.cpp')

diff --git a/lib/ray.cpp b/lib/ray.cpp
deleted file mode 100644
index 254ad14..0000000
--- a/lib/ray.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "ray.h"
-#include "maths.h"
-#include <algorithm>
-
-Ray
-Ray::fromPoints(Position3D start, Position3D p)
-{
-	return {start, glm::normalize(p - start)};
-}
-
-float
-Ray::distanceToLine(const Position3D & p1, const Position3D & e1) const
-{
-	// https://en.wikipedia.org/wiki/Skew_lines
-	const auto diff = p1 - e1;
-	const auto d1 = glm::normalize(diff);
-	const auto &p2 = start, &d2 = direction;
-	const auto n = crossProduct(d1, d2);
-	const auto n2 = crossProduct(d2, n);
-	const auto c1 = p1 + (glm::dot((p2 - p1), n2) / glm::dot(d1, n2)) * d1;
-	const auto difflength = glm::length(diff);
-	if (glm::length(c1 - p1) > difflength || glm::length(c1 - e1) > difflength) {
-		return std::numeric_limits<float>::infinity();
-	}
-	return glm::abs(glm::dot(n, p1 - p2));
-}
-
-bool
-Ray::passesCloseToEdges(const std::span<const Position3D> positions, float distance) const
-{
-	return std::adjacent_find(positions.begin(), positions.end(),
-				   [this, distance](const Position3D & a, const Position3D & b) {
-					   return distanceToLine(a, b) <= distance;
-				   })
-			!= positions.end();
-}
-- 
cgit v1.2.3