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

---
 ui/editNetwork.cpp      | 8 ++++----
 ui/gameMainSelector.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ui')

diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp
index 50d049d..c4c0297 100644
--- a/ui/editNetwork.cpp
+++ b/ui/editNetwork.cpp
@@ -4,7 +4,7 @@
 #include "builders/straight.h"
 #include "text.h"
 #include <game/gamestate.h>
-#include <game/geoData.h>
+#include <game/terrain.h>
 #include <gfx/gl/sceneShader.h>
 #include <gfx/models/texture.h>
 
@@ -26,7 +26,7 @@ bool
 EditNetwork::click(const SDL_MouseButtonEvent & e, const Ray<GlobalPosition3D> & ray)
 {
 	if (builder && (e.button == SDL_BUTTON_LEFT || e.button == SDL_BUTTON_MIDDLE)) {
-		builder->click(network, gameState->geoData.get(), e, ray);
+		builder->click(network, gameState->terrain.get(), e, ray);
 		return true;
 	}
 	return false;
@@ -36,7 +36,7 @@ bool
 EditNetwork::move(const SDL_MouseMotionEvent & e, const Ray<GlobalPosition3D> & ray)
 {
 	if (builder) {
-		builder->move(network, gameState->geoData.get(), e, ray);
+		builder->move(network, gameState->terrain.get(), e, ray);
 	}
 	return false;
 }
@@ -70,7 +70,7 @@ EditNetwork::Builder::setHeightsFor(Network * network, const Link::CCollection &
 	const auto width = network->getBaseWidth();
 
 	for (const auto & link : links) {
-		gameState->geoData->setHeights(link->getBase(width), opts);
+		gameState->terrain->setHeights(link->getBase(width), opts);
 	}
 }
 
diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp
index 5bef48d..e9642ec 100644
--- a/ui/gameMainSelector.cpp
+++ b/ui/gameMainSelector.cpp
@@ -4,8 +4,8 @@
 #include "ui/uiComponent.h"
 #include <SDL2/SDL.h>
 #include <game/gamestate.h>
-#include <game/geoData.h>
 #include <game/selectable.h>
+#include <game/terrain.h>
 #include <game/worldobject.h> // IWYU pragma: keep
 #include <gfx/gl/camera.h>
 #include <optional>
@@ -83,7 +83,7 @@ GameMainSelector::defaultClick(const Ray<GlobalPosition3D> & ray)
 		const auto & ref = *selected.base()->get();
 		clicked = typeid(ref).name();
 	}
-	else if (const auto pos = gameState->geoData->intersectRay(ray)) {
+	else if (const auto pos = gameState->terrain->intersectRay(ray)) {
 		clicked = streamed_string(*pos);
 	}
 	else {
-- 
cgit v1.2.3