From 89068c56f3236b65e392cdc8794c5bc1977e5556 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 30 Dec 2024 17:18:26 +0000
Subject: Pass lots more information during GeoData::walk

---
 game/geoData.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'game/geoData.h')

diff --git a/game/geoData.h b/game/geoData.h
index b3ef22a..68ce9a2 100644
--- a/game/geoData.h
+++ b/game/geoData.h
@@ -64,13 +64,23 @@ public:
 	[[nodiscard]] IntersectionResult intersectRay(const Ray<GlobalPosition3D> &) const;
 	[[nodiscard]] IntersectionResult intersectRay(const Ray<GlobalPosition3D> &, FaceHandle start) const;
 
-	void walk(const PointFace & from, const GlobalPosition2D to, const std::function<void(FaceHandle)> & op) const;
-	void walkUntil(const PointFace & from, const GlobalPosition2D to, const std::function<bool(FaceHandle)> & op) const;
+	struct WalkStep {
+		FaceHandle current;
+		FaceHandle previous {};
+		HalfedgeHandle exitHalfedge {};
+		GlobalPosition2D exitPosition {};
+	};
+
+	template<typename T> using Consumer = const std::function<void(const T &)> &;
+	template<typename T> using Tester = const std::function<bool(const T &)> &;
+
+	void walk(const PointFace & from, const GlobalPosition2D to, Consumer<WalkStep> op) const;
+	void walkUntil(const PointFace & from, const GlobalPosition2D to, Tester<WalkStep> op) const;
 
-	void boundaryWalk(const std::function<void(HalfedgeHandle)> &) const;
-	void boundaryWalk(const std::function<void(HalfedgeHandle)> &, HalfedgeHandle start) const;
-	void boundaryWalkUntil(const std::function<bool(HalfedgeHandle)> &) const;
-	void boundaryWalkUntil(const std::function<bool(HalfedgeHandle)> &, HalfedgeHandle start) const;
+	void boundaryWalk(Consumer<HalfedgeHandle>) const;
+	void boundaryWalk(Consumer<HalfedgeHandle>, HalfedgeHandle start) const;
+	void boundaryWalkUntil(Tester<HalfedgeHandle>) const;
+	void boundaryWalkUntil(Tester<HalfedgeHandle>, HalfedgeHandle start) const;
 
 	[[nodiscard]] HalfedgeHandle findEntry(const GlobalPosition2D from, const GlobalPosition2D to) const;
 
-- 
cgit v1.2.3