1 files changed, 73 insertions, 30 deletions

diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index ccbcdba..dbbf8a7 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -1,38 +1,60 @@
 #include "gameMainWindow.h"
 #include "editNetwork.h"
 #include "gameMainSelector.h"
-#include "gfx/camera_controller.h"
+#include "imgui_extras.h"
 #include "manualCameraController.h"
-#include "modeHelper.h"
-#include "toolbar.h"
-#include "window.h"
+#include "queryTool.h"
+#include "svgIcon.h"
 #include <SDL2/SDL.h>
 #include <collection.h>
+#include <game/environment.h>
 #include <game/gamestate.h>
 #include <game/network/rail.h>
 #include <game/worldobject.h> // IWYU pragma: keep
+#include <gfx/camera_controller.h>
 #include <gfx/renderable.h>
 #include <glad/gl.h>
 #include <glm/glm.hpp>
 #include <memory>
 
-class GameMainToolbar : Mode<decltype(GameMainSelector::target)>, public Toolbar {
+class GameMainToolbar : public UIComponent {
 public:
-	explicit GameMainToolbar(GameMainSelector * gms_) :
-		Mode<decltype(GameMainSelector::target)> {gms_->target},
-		Toolbar {
-				{"ui/icon/network.png", toggle<EditNetworkOf<RailLinks>>()},
+	static constexpr auto TOOLBAR_HEIGHT = 54.F;
+	template<typename T> static constexpr T TOOLBAR_ICON_SIZE {32, 32};
+
+	explicit GameMainToolbar(GameMainSelector * gms) : gms {gms} { }
+
+	void
+	render() override
+	{
+		if (IltGui::BeginToolbar("bottomBar", ImGuiDir_Down, TOOLBAR_HEIGHT)) {
+			if (ImGui::ImageButton("Build rails", *buildRailsIcon, TOOLBAR_ICON_SIZE<ImVec2>)) {
+				gms->target = std::make_unique<EditNetworkOf<RailLinks>>();
+			}
+			if (ImGui::ImageButton("Query", *queryToolIcon, TOOLBAR_ICON_SIZE<ImVec2>)) {
+				gms->target = std::make_unique<QueryTool>();
+			}
+			IltGui::EndToolbar();
 		}
+	}
+
+	bool
+	handleInput(const SDL_Event &) override
 	{
+		return false;
 	}
+
+private:
+	SvgIcon buildRailsIcon {TOOLBAR_ICON_SIZE<ImageDimensions>, "ui/icon/rails.svg"};
+	SvgIcon queryToolIcon {TOOLBAR_ICON_SIZE<ImageDimensions>, "ui/icon/magnifier.svg"};
+	GameMainSelector * gms;
 };
 
-GameMainWindow::GameMainWindow(size_t w, size_t h) :
-	Window {w, h, "I Like Trains", SDL_WINDOW_OPENGL}, SceneRenderer {Window::size, 0}
+GameMainWindow::GameMainWindow(ScreenAbsCoord size) : SceneRenderer {size, 0}
 {
 	uiComponents.create<ManualCameraController>(glm::vec2 {310'727'624, 494'018'810});
-	auto gms = uiComponents.create<GameMainSelector>(&camera, ScreenAbsCoord {w, h});
-	uiComponents.create<GameMainToolbar>(gms.get());
+	auto gms = uiComponents.create<GameMainSelector>(&camera);
+	uiComponents.create<GameMainToolbar>(gms);
 }
 
 void
@@ -41,45 +63,66 @@ GameMainWindow::tick(TickDuration)
 	uiComponents.apply<CameraController>(&CameraController::updateCamera, &camera);
 }
 
+bool
+GameMainWindow::handleInput(const SDL_Event & event)
+{
+	switch (event.type) {
+		case SDL_WINDOWEVENT:
+			switch (event.window.event) {
+				case SDL_WINDOWEVENT_RESIZED:
+					SceneRenderer::resize({event.window.data1, event.window.data2});
+					break;
+				default:
+					break;
+			}
+		default:
+			break;
+	}
+
+	return WindowContent::handleInput(event);
+}
+
 void
-GameMainWindow::render() const
+GameMainWindow::render()
 {
 	SceneRenderer::render(*this);
-	Window::render();
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glDisable(GL_DEPTH_TEST);
+	uiComponents.apply(&UIComponent::render);
 }
 
 void
-GameMainWindow::content(const SceneShader & shader) const
+GameMainWindow::content(const SceneShader & shader, const Frustum & frustum) const
 {
-	for (const auto & [id, asset] : gameState->assets) {
-		if (const auto r = std::dynamic_pointer_cast<const Renderable>(asset)) {
-			r->render(shader);
+	for (const auto & [assetId, asset] : gameState->assets) {
+		if (const auto renderable = asset.getAs<const Renderable>()) {
+			renderable->render(shader, frustum);
 		}
 	}
-	gameState->world.apply<Renderable>(&Renderable::render, shader);
-	uiComponents.apply<WorldOverlay>(&WorldOverlay::render, shader);
+	gameState->world.apply<const Renderable>(&Renderable::render, shader, frustum);
+	uiComponents.apply<WorldOverlay>(&WorldOverlay::render, shader, frustum);
 }
 
 void
-GameMainWindow::environment(const SceneShader & s, const SceneRenderer & r) const
+GameMainWindow::environment(const SceneShader &, const SceneRenderer & r) const
 {
-	// default for now
-	SceneProvider::environment(s, r);
+	gameState->environment->render(r, *this);
 }
 
 void
 GameMainWindow::lights(const SceneShader & shader) const
 {
-	gameState->world.apply<Renderable>(&Renderable::lights, shader);
+	gameState->world.apply<const Renderable>(&Renderable::lights, shader);
 }
 
 void
-GameMainWindow::shadows(const ShadowMapper & shadowMapper) const
+GameMainWindow::shadows(const ShadowMapper & shadowMapper, const Frustum & frustum) const
 {
-	for (const auto & [id, asset] : gameState->assets) {
-		if (const auto r = std::dynamic_pointer_cast<const Renderable>(asset)) {
-			r->shadows(shadowMapper);
+	for (const auto & [assetId, asset] : gameState->assets) {
+		if (const auto renderable = asset.getAs<const Renderable>()) {
+			renderable->shadows(shadowMapper, frustum);
 		}
 	}
-	gameState->world.apply<Renderable>(&Renderable::shadows, shadowMapper);
+	gameState->world.apply<const Renderable>(&Renderable::shadows, shadowMapper, frustum);
 }