From 0d432961a29d509cd0d1fa80361f04009dcf9c17 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 19 Mar 2025 03:19:38 +0000
Subject: Remove lots of stuff not required or superseded with ImGui use

---
 ui/gameMainSelector.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'ui/gameMainSelector.cpp')

diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp
index 55977ed..7878eb4 100644
--- a/ui/gameMainSelector.cpp
+++ b/ui/gameMainSelector.cpp
@@ -1,5 +1,4 @@
 #include "gameMainSelector.h"
-#include "text.h"
 #include "ui/uiComponent.h"
 #include <SDL2/SDL.h>
 #include <game/gamestate.h>
@@ -9,20 +8,15 @@
 #include <gfx/camera.h>
 #include <stream_support.h>
 
-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(const UIShader & shader) const
 {
 	if (target) {
-		target->render(shader, parentPos + position + TargetPos);
+		target->render(shader);
 	}
 }
 
@@ -35,10 +29,12 @@ GameMainSelector::render(const SceneShader & shader, const Frustum & frustum) co
 }
 
 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) {
@@ -54,7 +50,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) {
@@ -84,13 +80,13 @@ 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 &)
+GameMainSelector::Component::render(const UIShader &)
 {
 }
 
-- 
cgit v1.2.3