1 files changed, 36 insertions, 25 deletions

diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp
index ac2d93d..c900191 100644
--- a/ui/editNetwork.cpp
+++ b/ui/editNetwork.cpp
@@ -2,31 +2,21 @@
 #include "builders/freeExtend.h"
 #include "builders/join.h"
 #include "builders/straight.h"
-#include "text.h"
+#include "imgui_wrap.h"
 #include <game/gamestate.h>
-#include <game/geoData.h>
+#include <game/terrain.h>
 #include <gfx/gl/sceneShader.h>
 #include <gfx/models/texture.h>
 
-const std::filesystem::path fontpath {"/usr/share/fonts/hack/Hack-Regular.ttf"};
 constexpr const glm::u8vec4 TRANSPARENT_BLUE {30, 50, 255, 200};
 
-EditNetwork::EditNetwork(Network * n) :
-	network {n},
-	builderToolbar {
-			{"ui/icon/network.png", mode.toggle<BuilderStraight>()},
-			{"ui/icon/network.png", mode.toggle<BuilderJoin>()},
-			{"ui/icon/network.png", mode.toggle<BuilderFreeExtend>()},
-	},
-	blue {1, 1, &TRANSPARENT_BLUE}, font {fontpath, 15}
-{
-}
+EditNetwork::EditNetwork(Network * n) : network {n}, blue {1, 1, &TRANSPARENT_BLUE} { }
 
 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,38 +26,59 @@ 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;
 }
 
 bool
-EditNetwork::handleInput(const SDL_Event & e, const UIComponent::Position & parentPos)
+EditNetwork::handleInput(const SDL_Event &)
 {
-	return builderToolbar.handleInput(e, parentPos);
+	return false;
 }
 
 void
-EditNetwork::render(const SceneShader & shader) const
+EditNetwork::render(const SceneShader & shader, const Frustum & frustum) const
 {
 	if (builder) {
 		blue.bind();
 		shader.absolute.use();
-		builder->render(shader);
+		builder->render(shader, frustum);
 	}
 }
 
 void
-EditNetwork::Builder::render(const SceneShader & shader) const
+EditNetwork::Builder::render(const SceneShader & shader, const Frustum & frustum) const
 {
-	candidateLinks.apply<const Renderable>(&Renderable::render, shader);
+	candidateLinks.apply<const Renderable>(&Renderable::render, shader, frustum);
 }
 
 void
-EditNetwork::render(const UIShader & shader, const UIComponent::Position & parentPos) const
+EditNetwork::Builder::setHeightsFor(Network * network, const Link::CCollection & links, GeoData::SetHeightsOpts opts)
 {
-	if (builder) {
-		Text {builder->hint(), font, {{50, 10}, {0, 15}}, {1, 1, 0}}.render(shader, parentPos);
+	opts.surface = network->getBaseSurface();
+	const auto width = network->getBaseWidth();
+
+	for (const auto & link : links) {
+		gameState->terrain->setHeights(link->getBase(width), opts);
 	}
-	builderToolbar.render(shader, parentPos);
+}
+
+void
+EditNetwork::render(bool & open)
+{
+	ImGui::SetNextWindowSize({-1, -1});
+	ImGui::Begin("Edit Network", &open);
+
+	auto builderChoice = [this]<typename Impl>(const char * name) {
+		if (ImGui::RadioButton(name, dynamic_cast<Impl *>(builder.get()))) {
+			builder = std::make_unique<Impl>();
+		}
+	};
+	builderChoice.operator()<BuilderStraight>("Straight");
+	builderChoice.operator()<BuilderJoin>("Join");
+	builderChoice.operator()<BuilderFreeExtend>("Free Extend");
+	ImGui::TextUnformatted(builder ? builder->hint().c_str() : "Select a build mode");
+
+	ImGui::End();
 }