From 749df22c85b83c86ec68ebc74829287e54498e26 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 22 Dec 2024 13:53:27 +0000
Subject: Set terrain heights when creating new network links

---
 ui/editNetwork.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'ui/editNetwork.cpp')

diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp
index ac2d93d..50d049d 100644
--- a/ui/editNetwork.cpp
+++ b/ui/editNetwork.cpp
@@ -63,6 +63,17 @@ EditNetwork::Builder::render(const SceneShader & shader) const
 	candidateLinks.apply<const Renderable>(&Renderable::render, shader);
 }
 
+void
+EditNetwork::Builder::setHeightsFor(Network * network, const Link::CCollection & links, GeoData::SetHeightsOpts opts)
+{
+	opts.surface = network->getBaseSurface();
+	const auto width = network->getBaseWidth();
+
+	for (const auto & link : links) {
+		gameState->geoData->setHeights(link->getBase(width), opts);
+	}
+}
+
 void
 EditNetwork::render(const UIShader & shader, const UIComponent::Position & parentPos) const
 {
-- 
cgit v1.2.3


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 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui/editNetwork.cpp')

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);
 	}
 }
 
-- 
cgit v1.2.3