From f47aff9a43e5267e5ab42a0111df483129aed6ba Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 8 Apr 2024 23:37:17 +0100
Subject: Add GeoData face property for surface type

Arbitrary int type for now.
---
 game/geoData.h | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'game/geoData.h')

diff --git a/game/geoData.h b/game/geoData.h
index 021b4c7..e3e9bcb 100644
--- a/game/geoData.h
+++ b/game/geoData.h
@@ -20,7 +20,9 @@ struct GeoDataTraits : public OpenMesh::DefaultTraits {
 
 class GeoData : public OpenMesh::TriMesh_ArrayKernelT<GeoDataTraits> {
 private:
-	GeoData() = default;
+	GeoData();
+
+	OpenMesh::FPropHandleT<int> surface;
 
 public:
 	static GeoData loadFromAsciiGrid(const std::filesystem::path &);
@@ -61,47 +63,41 @@ public:
 			});
 		}
 
-		[[nodiscard]]
-		glm::vec<Dim, GlobalDistance>
+		[[nodiscard]] glm::vec<Dim, GlobalDistance>
 		operator*(BaryPosition bari) const
 		{
 			return p(0) + (difference(p(0), p(1)) * bari.x) + (difference(p(0), p(2)) * bari.y);
 		}
 
-		[[nodiscard]]
-		auto
+		[[nodiscard]] auto
 		area() const
 			requires(Dim == 3)
 		{
 			return glm::length(crossProduct(difference(p(0), p(1)), difference(p(0), p(2)))) / 2.F;
 		}
 
-		[[nodiscard]]
-		Normal3D
+		[[nodiscard]] Normal3D
 		normal() const
 			requires(Dim == 3)
 		{
 			return crossProduct(difference(p(0), p(1)), difference(p(0), p(2)));
 		}
 
-		[[nodiscard]]
-		Normal3D
+		[[nodiscard]] Normal3D
 		nnormal() const
 			requires(Dim == 3)
 		{
 			return glm::normalize(normal());
 		}
 
-		[[nodiscard]]
-		auto
+		[[nodiscard]] auto
 		angle(glm::length_t c) const
 		{
 			return Arc {P(c), P(c + 2), P(c + 1)}.length();
 		}
 
 		template<glm::length_t D = Dim>
-		[[nodiscard]]
-		auto
+		[[nodiscard]] auto
 		angleAt(const GlobalPosition<D> pos) const
 			requires(D <= Dim)
 		{
@@ -113,8 +109,7 @@ public:
 			return 0.F;
 		}
 
-		[[nodiscard]]
-		inline auto
+		[[nodiscard]] inline auto
 		p(const glm::length_t i) const
 		{
 			return base::operator[](i);
-- 
cgit v1.2.3


From 90b3b10170d7a7f278338b74d84ae6efceaacf77 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 10 Apr 2024 08:49:35 +0100
Subject: Introduce a basic terrain surface type asset

---
 game/geoData.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'game/geoData.h')

diff --git a/game/geoData.h b/game/geoData.h
index e3e9bcb..7a2344d 100644
--- a/game/geoData.h
+++ b/game/geoData.h
@@ -3,6 +3,7 @@
 #include "collections.h" // IWYU pragma: keep IterableCollection
 #include "config/types.h"
 #include "ray.h"
+#include "surface.h"
 #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
 #include <filesystem>
 #include <glm/vec2.hpp>
@@ -22,7 +23,7 @@ class GeoData : public OpenMesh::TriMesh_ArrayKernelT<GeoDataTraits> {
 private:
 	GeoData();
 
-	OpenMesh::FPropHandleT<int> surface;
+	OpenMesh::FPropHandleT<const Surface *> surface;
 
 public:
 	static GeoData loadFromAsciiGrid(const std::filesystem::path &);
-- 
cgit v1.2.3


From b44c2d85bb8e46c4a6c65aacd23157c07cb80eca Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 12 Apr 2024 00:03:15 +0100
Subject: Create terrain vertices per surface type

---
 game/geoData.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'game/geoData.h')

diff --git a/game/geoData.h b/game/geoData.h
index 7a2344d..5586023 100644
--- a/game/geoData.h
+++ b/game/geoData.h
@@ -150,6 +150,13 @@ public:
 		return std::tie(lowerExtent, upperExtent);
 	}
 
+	template<typename HandleT>
+	[[nodiscard]] auto
+	get_surface(const HandleT h)
+	{
+		return property(surface, h);
+	}
+
 protected:
 	template<glm::length_t Dim>
 	[[nodiscard]] Triangle<Dim>
-- 
cgit v1.2.3


From 7dc3fa64ffe64d5fa01c59f7deed87dbc3b48c45 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 26 Apr 2024 14:50:42 +0100
Subject: Don't return newly created faces from split

It's not as simple as it looks as adjacent faces may also be split, making this a
bit misleading.
---
 game/geoData.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'game/geoData.h')

diff --git a/game/geoData.h b/game/geoData.h
index 5586023..0c5cc6c 100644
--- a/game/geoData.h
+++ b/game/geoData.h
@@ -186,7 +186,7 @@ protected:
 	void update_vertex_normals_only(VertexIter start);
 
 	using OpenMesh::TriMesh_ArrayKernelT<GeoDataTraits>::split;
-	std::array<FaceHandle, 4> split(FaceHandle);
+	void split(FaceHandle);
 
 private:
 	GlobalPosition3D lowerExtent {}, upperExtent {};
-- 
cgit v1.2.3


From 0d0a9b2f56bedc0b9394b2ad9a1199ef2907f8f2 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 26 Apr 2024 16:34:19 +0100
Subject: Set the face surface type when setting height

---
 game/geoData.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'game/geoData.h')

diff --git a/game/geoData.h b/game/geoData.h
index 0c5cc6c..ed1734c 100644
--- a/game/geoData.h
+++ b/game/geoData.h
@@ -142,7 +142,7 @@ public:
 
 	[[nodiscard]] HalfedgeHandle findEntry(const GlobalPosition2D from, const GlobalPosition2D to) const;
 
-	void setHeights(const std::span<const GlobalPosition3D> triangleStrip);
+	void setHeights(const std::span<const GlobalPosition3D> triangleStrip, const Surface &);
 
 	[[nodiscard]] auto
 	getExtents() const
-- 
cgit v1.2.3