From bc0bbe935942fa6c54f2e9e71f49351c85d7e956 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 5 Jan 2025 18:15:04 +0000
Subject: Add helper for merging close elements in a vector

---
 lib/collections.h | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'lib/collections.h')

diff --git a/lib/collections.h b/lib/collections.h
index ea5d5dc..6f26eae 100644
--- a/lib/collections.h
+++ b/lib/collections.h
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <array>
 #include <cstdint>
+#include <ranges>
 #include <span>
 #include <tuple>
 #include <utility>
@@ -224,3 +225,40 @@ strip_end(IterableCollection auto & cont)
 {
 	return stripiter {cont.end()};
 }
+
+template<typename T, typename Dist, typename Merger>
+void
+mergeClose(std::vector<T> & range, const Dist & dist, const Merger & merger,
+		decltype(dist(range.front(), range.front())) tolerance)
+{
+	using DistanceType = decltype(tolerance);
+	std::vector<DistanceType> distances;
+	distances.reserve(range.size() - 1);
+	std::ranges::transform(range | std::views::pairwise, std::back_inserter(distances), [&dist](const auto & pair) {
+		return (std::apply(dist, pair));
+	});
+	while (distances.size() > 1) {
+		const auto closestPair = std::ranges::min_element(distances);
+		if (*closestPair > tolerance) {
+			return;
+		}
+		const auto offset = std::distance(distances.begin(), closestPair);
+		const auto idx = static_cast<std::size_t>(offset);
+		if (closestPair == distances.begin()) {
+			// Remove second element
+			range.erase(range.begin() + 1);
+			distances.erase(distances.begin());
+		}
+		else if (closestPair == --distances.end()) {
+			// Remove second from last element
+			range.erase(range.end() - 2);
+			distances.erase(distances.end() - 1);
+		}
+		else {
+			range[idx] = merger(range[idx], range[idx + 1]);
+			range.erase(range.begin() + offset + 1);
+			distances.erase(distances.begin() + offset);
+		}
+		distances[idx] = dist(range[idx], range[idx + 1]);
+	}
+}
-- 
cgit v1.2.3


From 62fd9391bbfde47177fb36434d9664e47f4cf656 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 9 Feb 2025 13:02:09 +0000
Subject: Initial commit setting terrain during network construction

This is all in the wrong place, it shouldn't be part of the network interface.
---
 lib/collections.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib/collections.h')

diff --git a/lib/collections.h b/lib/collections.h
index 6f26eae..fcd65d3 100644
--- a/lib/collections.h
+++ b/lib/collections.h
@@ -107,6 +107,15 @@ operator+=(std::vector<T...> & in, std::vector<T...> && src)
 	return in;
 }
 
+template<typename... T>
+constexpr auto
+operator+(std::vector<T...> in1, std::vector<T...> in2)
+{
+	in1.reserve(in1.size() + in2.size());
+	std::move(in2.begin(), in2.end(), std::back_inserter(in1));
+	return in1;
+}
+
 template<typename... T, typename Vn>
 [[nodiscard]] constexpr auto
 operator+(const std::vector<T...> & in, Vn && vn)
-- 
cgit v1.2.3


From f26559dcd25b649d37a1a30e087b70b95f530954 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Feb 2025 23:53:46 +0000
Subject: Range adaptor to make triangle strip triples

---
 lib/collections.h | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'lib/collections.h')

diff --git a/lib/collections.h b/lib/collections.h
index fcd65d3..c81bede 100644
--- a/lib/collections.h
+++ b/lib/collections.h
@@ -197,6 +197,14 @@ template<typename iter> struct stripiter {
 		return *this;
 	}
 
+	constexpr stripiter
+	operator++(int)
+	{
+		auto out {*this};
+		++*this;
+		return out;
+	}
+
 	constexpr stripiter &
 	operator--()
 	{
@@ -205,6 +213,14 @@ template<typename iter> struct stripiter {
 		return *this;
 	}
 
+	constexpr stripiter
+	operator--(int)
+	{
+		auto out {*this};
+		--*this;
+		return out;
+	}
+
 	constexpr auto
 	operator-(const stripiter & other) const
 	{
@@ -235,6 +251,16 @@ strip_end(IterableCollection auto & cont)
 	return stripiter {cont.end()};
 }
 
+struct TriangleTriplesImpl : public std::ranges::range_adaptor_closure<TriangleTriplesImpl> {
+	decltype(auto)
+	operator()(const auto & triangleStrip) const
+	{
+		return std::views::iota(strip_begin(triangleStrip), strip_end(triangleStrip));
+	}
+};
+
+constexpr TriangleTriplesImpl TriangleTriples;
+
 template<typename T, typename Dist, typename Merger>
 void
 mergeClose(std::vector<T> & range, const Dist & dist, const Merger & merger,
-- 
cgit v1.2.3


From 619983e949fde226cc7a3de0bc198fdcee3fe3b4 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 15 Feb 2025 14:46:48 +0000
Subject: Fixes and tests to new range helpers

---
 lib/collections.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib/collections.h')

diff --git a/lib/collections.h b/lib/collections.h
index c81bede..27eff0a 100644
--- a/lib/collections.h
+++ b/lib/collections.h
@@ -251,15 +251,19 @@ strip_end(IterableCollection auto & cont)
 	return stripiter {cont.end()};
 }
 
-struct TriangleTriplesImpl : public std::ranges::range_adaptor_closure<TriangleTriplesImpl> {
+inline constexpr auto dereference = std::views::transform([](const auto & iter) -> decltype(auto) {
+	return *iter;
+});
+
+struct TriangleTriples : public std::ranges::range_adaptor_closure<TriangleTriples> {
 	decltype(auto)
 	operator()(const auto & triangleStrip) const
 	{
-		return std::views::iota(strip_begin(triangleStrip), strip_end(triangleStrip));
+		return std::views::iota(strip_begin(triangleStrip), strip_end(triangleStrip)) | dereference;
 	}
 };
 
-constexpr TriangleTriplesImpl TriangleTriples;
+inline constexpr TriangleTriples triangleTriples;
 
 template<typename T, typename Dist, typename Merger>
 void
-- 
cgit v1.2.3