1 files changed, 21 insertions, 41 deletions

diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp
index 5bef48d..0c40abc 100644
--- a/ui/gameMainSelector.cpp
+++ b/ui/gameMainSelector.cpp
@@ -1,50 +1,44 @@
 #include "gameMainSelector.h"
-#include "collection.h"
-#include "text.h"
 #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>
+#include <gfx/camera.h>
 #include <stream_support.h>
-#include <typeinfo>
 
-const std::filesystem::path fontpath {"/usr/share/fonts/hack/Hack-Regular.ttf"};
-
-GameMainSelector::GameMainSelector(const Camera * c, ScreenAbsCoord size) :
-	UIComponent {{{}, size}}, camera {c}, font {fontpath, 15}
-{
-}
+GameMainSelector::GameMainSelector(const Camera * c) : camera {c} { }
 
 constexpr ScreenAbsCoord TargetPos {5, 45};
 
 void
-GameMainSelector::render(const UIShader & shader, const Position & parentPos) const
+GameMainSelector::render()
 {
 	if (target) {
-		target->render(shader, parentPos + position + TargetPos);
-	}
-	if (!clicked.empty()) {
-		Text {clicked, font, {{50, 10}, {0, 15}}, {1, 1, 0}}.render(shader, parentPos);
+		bool open = true;
+		target->render(open);
+		if (!open) {
+			target.reset();
+		}
 	}
 }
 
 void
-GameMainSelector::render(const SceneShader & shader) const
+GameMainSelector::render(const SceneShader & shader, const Frustum & frustum) const
 {
 	if (target) {
-		target->render(shader);
+		target->render(shader, frustum);
 	}
 }
 
 bool
-GameMainSelector::handleInput(const SDL_Event & e, const Position & parentPos)
+GameMainSelector::handleInput(const SDL_Event & e)
 {
-	const auto getRay = [this](const auto & e) {
-		const auto mouse = ScreenRelCoord {e.x, e.y} / position.size;
+	const auto getRay = [this, &window = e.window](const auto & e) {
+		glm::ivec2 size {};
+		SDL_GetWindowSizeInPixels(SDL_GetWindowFromID(window.windowID), &size.x, &size.y);
+		const auto mouse = ScreenRelCoord {e.x, e.y} / ScreenRelCoord {size};
 		return camera->unProject(mouse);
 	};
 	if (target) {
@@ -60,7 +54,7 @@ GameMainSelector::handleInput(const SDL_Event & e, const Position & parentPos)
 				}
 				break;
 		}
-		return target->handleInput(e, parentPos + position + TargetPos);
+		return target->handleInput(e);
 	}
 	else {
 		switch (e.type) {
@@ -73,22 +67,8 @@ GameMainSelector::handleInput(const SDL_Event & e, const Position & parentPos)
 }
 
 void
-GameMainSelector::defaultClick(const Ray<GlobalPosition3D> & ray)
+GameMainSelector::defaultClick(const Ray<GlobalPosition3D> &)
 {
-	BaryPosition baryPos {};
-	RelativeDistance distance {};
-
-	if (const auto selected = gameState->world.applyOne<Selectable>(&Selectable::intersectRay, ray, baryPos, distance);
-			selected != gameState->world.end()) {
-		const auto & ref = *selected.base()->get();
-		clicked = typeid(ref).name();
-	}
-	else if (const auto pos = gameState->geoData->intersectRay(ray)) {
-		clicked = streamed_string(*pos);
-	}
-	else {
-		clicked.clear();
-	}
 }
 
 bool
@@ -104,17 +84,17 @@ GameMainSelector::Component::move(const SDL_MouseMotionEvent &, const Ray<Global
 }
 
 bool
-GameMainSelector::Component::handleInput(const SDL_Event &, const Position &)
+GameMainSelector::Component::handleInput(const SDL_Event &)
 {
 	return false;
 }
 
 void
-GameMainSelector::Component::render(const UIShader &, const UIComponent::Position &) const
+GameMainSelector::Component::render(bool &)
 {
 }
 
 void
-GameMainSelector::Component::render(const SceneShader &) const
+GameMainSelector::Component::render(const SceneShader &, const Frustum &) const
 {
 }