From 4b175adffdf68f35589ed48c82baa15723a9af0a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 13 Feb 2025 19:57:41 +0000
Subject: Move basic setHeights lambdas into proper helper functions

---
 game/geoDataMesh.h | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'game/geoDataMesh.h')

diff --git a/game/geoDataMesh.h b/game/geoDataMesh.h
index 00db67c..5d0bade 100644
--- a/game/geoDataMesh.h
+++ b/game/geoDataMesh.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "config/types.h"
-#include "ray.h"
 #include "triangle.h"
 #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
 #include <source_location>
@@ -60,6 +59,36 @@ protected:
 	using HalfEdgePoints = std::pair<GlobalPosition3D, GlobalPosition3D>;
 	[[nodiscard]] HalfEdgePoints points(HalfEdgeVertices) const;
 
+	template<glm::length_t D>
+	[[nodiscard]] auto
+	vertexDistanceFunction(GlobalPosition<D> point) const
+	{
+		struct DistanceCalculator {
+			[[nodiscard]] std::pair<VertexHandle, float>
+			operator()(VertexHandle compVertex) const
+			{
+				return std::make_pair(
+						compVertex, ::distance<D, GlobalDistance, glm::defaultp>(point, mesh->point(compVertex)));
+			}
+
+			[[nodiscard]]
+			std::pair<HalfedgeHandle, float>
+			operator()(const HalfedgeHandle compHalfedge) const
+			{
+				const auto edgePoints = mesh->points(mesh->toVertexHandles(compHalfedge));
+				return std::make_pair(compHalfedge, Triangle<2> {edgePoints.second, edgePoints.first, point}.height());
+			};
+
+			const GeoDataMesh * mesh;
+			GlobalPosition<D> point;
+		};
+
+		return DistanceCalculator {this, point};
+	}
+
+	[[nodiscard]] bool canFlip(HalfedgeHandle edge) const;
+	[[nodiscard]] std::optional<EdgeHandle> shouldFlip(HalfedgeHandle next, GlobalPosition2D startPoint) const;
+
 	template<glm::length_t D>
 	[[nodiscard]] RelativeDistance
 	length(HalfedgeHandle heh) const
-- 
cgit v1.2.3