Psycho-rebased branch deform-terrain on top of main

3 files changed, 73 insertions, 6 deletions

diff --git a/lib/collections.h b/lib/collections.h
index 943b986..dd603be 100644
--- a/lib/collections.h
+++ b/lib/collections.h
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <span>
 #include <utility>
 #include <vector>
@@ -129,18 +130,25 @@ vectorOfN(std::integral auto N, T start = {}, T step = 1)
 	return v;
 }
 
+template<template<typename...> typename Rtn = std::vector, typename In>
+[[nodiscard]] auto
+materializeRange(const In begin, const In end)
+{
+	return Rtn(begin, end);
+}
+
 template<template<typename...> typename Rtn = std::vector, IterableCollection In>
 [[nodiscard]] auto
-materializeRange(In && in)
+materializeRange(const In & in)
 {
-	return Rtn(in.begin(), in.end());
+	return materializeRange<Rtn>(in.begin(), in.end());
 }
 
 template<template<typename...> typename Rtn = std::vector, typename In>
 [[nodiscard]] auto
 materializeRange(const std::pair<In, In> & in)
 {
-	return Rtn(in.first, in.second);
+	return materializeRange<Rtn>(in.first, in.second);
 }
 
 template<typename T> struct pair_range {
@@ -160,3 +168,62 @@ template<typename T> struct pair_range {
 };
 
 template<typename T> pair_range(std::pair<T, T>) -> pair_range<T>;
+
+template<typename iter> struct stripiter {
+	[[nodiscard]] constexpr bool
+	operator!=(const stripiter & other) const
+	{
+		return current != other.current;
+	}
+
+	[[nodiscard]] constexpr bool
+	operator==(const stripiter & other) const
+	{
+		return current == other.current;
+	}
+
+	constexpr stripiter &
+	operator++()
+	{
+		++current;
+		off = 1 - off;
+		return *this;
+	}
+
+	constexpr stripiter &
+	operator--()
+	{
+		--current;
+		off = 1 - off;
+		return *this;
+	}
+
+	constexpr auto
+	operator-(const stripiter & other) const
+	{
+		return current - other.current;
+	}
+
+	constexpr auto
+	operator*() const
+	{
+		return std::tie(*(current - (2 - off)), *(current - off - 1), *current);
+	}
+
+	iter current;
+	uint8_t off {};
+};
+
+template<typename T> struct std::iterator_traits<stripiter<T>> : std::iterator_traits<T> { };
+
+constexpr auto
+strip_begin(IterableCollection auto & cont)
+{
+	return stripiter {cont.begin() + 2};
+}
+
+constexpr auto
+strip_end(IterableCollection auto & cont)
+{
+	return stripiter {cont.end()};
+}
diff --git a/lib/geometricPlane.h b/lib/geometricPlane.h
index 3f95d3c..3b1a0e4 100644
--- a/lib/geometricPlane.h
+++ b/lib/geometricPlane.h
@@ -27,7 +27,7 @@ public:
 	[[nodiscard]] inline PlaneRelation
 	getRelation(PositionType point) const
 	{
-		const auto d = glm::dot(normal, point - origin);
+		const auto d = glm::dot(normal, RelativePosition3D(point - origin));
 		return d < 0.F ? PlaneRelation::Below : d > 0.F ? PlaneRelation::Above : PlaneRelation::On;
 	}
 
diff --git a/lib/ray.h b/lib/ray.h
index e1f43c3..67fdd12 100644
--- a/lib/ray.h
+++ b/lib/ray.h
@@ -47,11 +47,11 @@ public:
 			RelativeDistance & distance) const
 	{
 		if constexpr (std::is_floating_point_v<typename PositionType::value_type>) {
-			return glm::intersectRayTriangle(start, direction, t0, t1, t2, bary, distance);
+			return glm::intersectRayTriangle(start, direction, t0, t1, t2, bary, distance) && distance >= 0.F;
 		}
 		else {
 			const RelativePosition3D t0r = t0 - start, t1r = t1 - start, t2r = t2 - start;
-			return glm::intersectRayTriangle({}, direction, t0r, t1r, t2r, bary, distance);
+			return glm::intersectRayTriangle({}, direction, t0r, t1r, t2r, bary, distance) && distance >= 0.F;
 		}
 	}