1 files changed, 3 insertions, 71 deletions

diff --git a/game/geoData.h b/game/geoData.h
index 03a2b3a..d486f22 100644
--- a/game/geoData.h
+++ b/game/geoData.h
@@ -1,28 +1,12 @@
 #pragma once
 
 #include "collections.h" // IWYU pragma: keep IterableCollection
-#include "config/types.h"
-#include "ray.h"
+#include "geoDataMesh.h"
 #include "surface.h"
-#include "triangle.h"
-#include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
 #include <filesystem>
 #include <glm/vec2.hpp>
-#include <optional>
-#include <source_location>
-#include <thirdparty/openmesh/glmcompat.h>
-#include <thirdparty/openmesh/helpers.h>
-
-struct GeoDataTraits : public OpenMesh::DefaultTraits {
-	FaceAttributes(OpenMesh::Attributes::Status);
-	EdgeAttributes(OpenMesh::Attributes::Status);
-	VertexAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status);
-	HalfedgeAttributes(OpenMesh::Attributes::Status);
-	using Point = GlobalPosition3D;
-	using Normal = Normal3D;
-};
 
-class GeoData : public OpenMesh::TriMesh_ArrayKernelT<GeoDataTraits> {
+class GeoData : public GeoDataMesh {
 private:
 	const OpenMesh::Helpers::Property<const Surface *, OpenMesh::FPropHandleT> surface {this};
 
@@ -30,35 +14,6 @@ public:
 	static GeoData loadFromAsciiGrid(const std::filesystem::path &);
 	static GeoData createFlat(GlobalPosition2D lower, GlobalPosition2D upper, GlobalDistance h);
 
-	struct PointFace {
-		// NOLINTNEXTLINE(hicpp-explicit-conversions)
-		PointFace(const GlobalPosition2D p) : point {p} { }
-
-		PointFace(const GlobalPosition2D p, FaceHandle face) : point {p}, _face {face} { }
-
-		PointFace(const GlobalPosition2D p, const GeoData *);
-		PointFace(const GlobalPosition2D p, const GeoData *, FaceHandle start);
-
-		const GlobalPosition2D point;
-		[[nodiscard]] FaceHandle face(const GeoData *) const;
-		[[nodiscard]] FaceHandle face(const GeoData *, FaceHandle start) const;
-
-		[[nodiscard]] bool
-		isLocated() const
-		{
-			return _face.is_valid();
-		}
-
-	private:
-		mutable FaceHandle _face {};
-	};
-
-	template<glm::length_t Dim> using Triangle = ::Triangle<Dim, GlobalDistance>;
-
-	[[nodiscard]] FaceHandle findPoint(GlobalPosition2D) const;
-	[[nodiscard]] FaceHandle findPoint(GlobalPosition2D, FaceHandle start) const;
-
-	[[nodiscard]] GlobalPosition3D positionAt(const PointFace &) const;
 	using IntersectionLocation = std::pair<GlobalPosition3D, FaceHandle>;
 	using IntersectionResult = std::optional<IntersectionLocation>;
 	[[nodiscard]] IntersectionResult intersectRay(const Ray<GlobalPosition3D> &) const;
@@ -89,7 +44,7 @@ public:
 	void boundaryWalkUntil(Tester<HalfedgeHandle>) const;
 	void boundaryWalkUntil(Tester<HalfedgeHandle>, HalfedgeHandle start) const;
 
-	[[nodiscard]] HalfedgeHandle findEntry(const GlobalPosition2D from, const GlobalPosition2D to) const;
+	[[nodiscard]] HalfedgeHandle findEntry(GlobalPosition2D from, GlobalPosition2D to) const;
 
 	struct SetHeightsOpts {
 		static constexpr auto DEFAULT_NEAR_NODE_TOLERANACE = 500.F;
@@ -118,30 +73,7 @@ public:
 		return property(surface, handle);
 	}
 
-	void sanityCheck(const std::source_location & = std::source_location::current()) const;
-
 protected:
-	template<glm::length_t Dim>
-	[[nodiscard]] Triangle<Dim>
-	triangle(FaceHandle face) const
-	{
-		Triangle<Dim> triangle;
-		std::ranges::transform(fv_range(face), triangle.begin(), [this](auto vertex) {
-			return point(vertex);
-		});
-		return triangle;
-	}
-
-	[[nodiscard]] static bool triangleContainsPoint(const GlobalPosition2D, const Triangle<2> &);
-	[[nodiscard]] bool triangleContainsPoint(const GlobalPosition2D, FaceHandle) const;
-	[[nodiscard]] static bool triangleOverlapsTriangle(const Triangle<2> &, const Triangle<2> &);
-	[[nodiscard]] static bool triangleContainsTriangle(const Triangle<2> &, const Triangle<2> &);
-	[[nodiscard]] HalfedgeHandle findBoundaryStart() const;
-	[[nodiscard]] RelativePosition3D difference(const HalfedgeHandle) const;
-
-	template<glm::length_t D> [[nodiscard]] RelativeDistance length(const HalfedgeHandle) const;
-	[[nodiscard]] GlobalPosition3D centre(const HalfedgeHandle) const;
-
 	void updateAllVertexNormals();
 	template<std::ranges::range R> void updateAllVertexNormals(const R &);
 	void updateVertexNormal(VertexHandle);