From 42e16ad8ad853c6e97d7eb6718ee0f78b868be30 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 9 Feb 2025 20:14:51 +0000
Subject: Combine GeoData and Terrain class hierarchies

---
 game/terrain.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'game/terrain.h')

diff --git a/game/terrain.h b/game/terrain.h
index c9d09fe..7464bdd 100644
--- a/game/terrain.h
+++ b/game/terrain.h
@@ -4,17 +4,19 @@
 #include "collection.h"
 #include "config/types.h"
 #include "game/worldobject.h"
+#include "geoData.h"
 #include "gfx/models/mesh.h"
 #include "gfx/models/texture.h"
 #include "gfx/renderable.h"
-#include <memory>
 
 class SceneShader;
-class GeoData;
 
-class Terrain : public WorldObject, public Renderable {
+class Terrain : public GeoData, public WorldObject, public Renderable {
 public:
-	explicit Terrain(std::shared_ptr<GeoData>);
+	template<typename... P> explicit Terrain(P &&... params) : GeoData {std::forward<P>(params)...}
+	{
+		generateMeshes();
+	}
 
 	void render(const SceneShader & shader) const override;
 	void shadows(const ShadowMapper &) const override;
@@ -30,8 +32,7 @@ public:
 private:
 	void generateMeshes();
 
-	std::shared_ptr<GeoData> geoData;
 	Collection<MeshT<Vertex>, false> meshes;
-	Texture::Ptr grass;
+	Texture::Ptr grass = std::make_shared<Texture>("grass.png");
 	size_t geoGeneration {};
 };
-- 
cgit v1.2.3