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

---
 application/main.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'application/main.cpp')

diff --git a/application/main.cpp b/application/main.cpp
index db42a63..2c0d96f 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -38,12 +38,10 @@ public:
 	int
 	run()
 	{
-		geoData = std::make_shared<GeoData>(GeoData::loadFromAsciiGrid("test/fixtures/height/SD19.asc"));
-
 		windows.create<MainWindow>(DISPLAY_WIDTH, DISPLAY_HEIGHT)->setContent<GameMainWindow>();
 
-		world.create<Terrain>(geoData);
-		world.create<Water>(geoData);
+		terrain = world.create<Terrain>(GeoData::loadFromAsciiGrid("test/fixtures/height/SD19.asc"));
+		world.create<Water>(terrain);
 		assets = AssetFactory::loadAll("res");
 
 		{
@@ -89,7 +87,7 @@ public:
 				for (auto y = 491100000; y < 491130000; y += 5000) {
 					world.create<Plant>(std::dynamic_pointer_cast<Foliage>(assets.at(std::format("Tree-{:#02}-{}",
 												treeDistribution(randomdev), treeVariantDistribution(randomdev)))),
-							Location {geoData->positionAt({{x + positionOffsetDistribution(randomdev),
+							Location {terrain->positionAt({{x + positionOffsetDistribution(randomdev),
 											  y + positionOffsetDistribution(randomdev)}}),
 									{0, rotationDistribution(randomdev), 0}});
 				}
-- 
cgit v1.2.3