Remove lots of stuff not required or superseded with ImGui use

24 files changed, 38 insertions, 449 deletions

diff --git a/test/test-text.cpp b/test/test-text.cpp
index b0a9503..0729ce8 100644
--- a/test/test-text.cpp
+++ b/test/test-text.cpp
@@ -7,7 +7,6 @@
 
 #include "testMainWindow.h"
 #include "testRenderOutput.h"
-#include "ui/text.h"
 #include <array>
 #include <gfx/models/texture.h>
 #include <glm/glm.hpp>
@@ -112,19 +111,6 @@ BOOST_AUTO_TEST_CASE(render_font)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(render_text)
-{
-	TestRenderOutput output;
-	glBindFramebuffer(GL_FRAMEBUFFER, output.output);
-	glViewport(0, 0, 640, 480);
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	Text t {"I Like Trains", *this, {{10, 10}, {200, 40}}, {1, 1, 1}};
-	UIShader s {640, 480};
-	t.render(s, {});
-	Texture::save(output.outImage, "/tmp/text.tga");
-}
-
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_CASE(stream_vec)
diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp
index a11fe3c..ac9aef9 100644
--- a/ui/editNetwork.cpp
+++ b/ui/editNetwork.cpp
@@ -3,16 +3,14 @@
 #include "builders/join.h"
 #include "builders/straight.h"
 #include "imgui_wrap.h"
-#include "text.h"
 #include <game/gamestate.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}, 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)
@@ -34,7 +32,7 @@ EditNetwork::move(const SDL_MouseMotionEvent & e, const Ray<GlobalPosition3D> &
 }
 
 bool
-EditNetwork::handleInput(const SDL_Event &, const UIComponent::Position &)
+EditNetwork::handleInput(const SDL_Event &)
 {
 	return false;
 }
@@ -67,7 +65,7 @@ EditNetwork::Builder::setHeightsFor(Network * network, const Link::CCollection &
 }
 
 void
-EditNetwork::render(const UIShader &, const UIComponent::Position &)
+EditNetwork::render(const UIShader &)
 {
 	ImGui::Begin("Edit Network");
 
diff --git a/ui/editNetwork.h b/ui/editNetwork.h
index 805e7ec..c25bef2 100644
--- a/ui/editNetwork.h
+++ b/ui/editNetwork.h
@@ -2,7 +2,6 @@
 
 #include "game/geoData.h"
 #include "gameMainSelector.h"
-#include "toolbar.h"
 #include "worldOverlay.h"
 #include <game/gamestate.h>
 #include <game/network/network.h>
@@ -16,9 +15,9 @@ public:
 
 	bool click(const SDL_MouseButtonEvent & e, const Ray<GlobalPosition3D> &) override;
 	bool move(const SDL_MouseMotionEvent & e, const Ray<GlobalPosition3D> &) override;
-	bool handleInput(const SDL_Event & e, const UIComponent::Position &) override;
+	bool handleInput(const SDL_Event & e) override;
 	void render(const SceneShader &, const Frustum &) const override;
-	void render(const UIShader & shader, const UIComponent::Position & pos) override;
+	void render(const UIShader & shader) override;
 
 	using NetworkClickPos = std::variant<GlobalPosition3D, Node::Ptr>;
 
@@ -42,7 +41,6 @@ private:
 	Network * network;
 	Builder::Ptr builder;
 	Texture blue;
-	const Font font;
 };
 
 template<typename T> class EditNetworkOf : public EditNetwork {
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 &)
 {
 }
 
diff --git a/ui/gameMainSelector.h b/ui/gameMainSelector.h
index df29842..9560fc6 100644
--- a/ui/gameMainSelector.h
+++ b/ui/gameMainSelector.h
@@ -2,7 +2,6 @@
 
 #include "SDL_events.h"
 #include "config/types.h"
-#include "font.h"
 #include "uiComponent.h"
 #include "worldOverlay.h"
 #include <glm/glm.hpp>
@@ -21,17 +20,17 @@ public:
 
 		virtual bool click(const SDL_MouseButtonEvent &, const Ray<GlobalPosition3D> &);
 		virtual bool move(const SDL_MouseMotionEvent &, const Ray<GlobalPosition3D> &);
-		virtual bool handleInput(const SDL_Event &, const Position & pos);
-		virtual void render(const UIShader & shader, const Position & pos);
+		virtual bool handleInput(const SDL_Event &);
+		virtual void render(const UIShader & shader);
 		virtual void render(const SceneShader &, const Frustum &) const;
 	};
 
-	GameMainSelector(const Camera * c, ScreenAbsCoord size);
+	GameMainSelector(const Camera * c);
 
-	void render(const UIShader & shader, const Position & pos) const override;
+	void render(const UIShader & shader) const override;
 	void render(const SceneShader & shader, const Frustum &) const override;
 
-	bool handleInput(const SDL_Event & e, const Position &) override;
+	bool handleInput(const SDL_Event & e) override;
 
 	void defaultClick(const Ray<GlobalPosition3D> & ray);
 
@@ -39,5 +38,4 @@ public:
 
 private:
 	const Camera * camera;
-	const Font font;
 };
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index 356d522..280d1a8 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -1,6 +1,7 @@
 #include "gameMainWindow.h"
 #include "editNetwork.h"
 #include "gameMainSelector.h"
+#include "icon.h"
 #include "imgui_extras.h"
 #include "manualCameraController.h"
 #include "queryTool.h"
@@ -21,10 +22,10 @@ public:
 	static constexpr auto TOOLBAR_HEIGHT = 54.F;
 	static constexpr ImVec2 TOOLBAR_ICON_SIZE {32, 32};
 
-	explicit GameMainToolbar(GameMainSelector * gms) : UIComponent {{{}, {}}}, gms {gms} { }
+	explicit GameMainToolbar(GameMainSelector * gms) : gms {gms} { }
 
 	void
-	render(const UIShader &, const Position &) const override
+	render(const UIShader &) const override
 	{
 		if (IltGui::BeginToolbar("bottomBar", ImGuiDir_Down, TOOLBAR_HEIGHT)) {
 			if (ImGui::ImageButton("Build rails", *buildRailsIcon, TOOLBAR_ICON_SIZE)) {
@@ -38,7 +39,7 @@ public:
 	}
 
 	bool
-	handleInput(const SDL_Event &, const Position &) override
+	handleInput(const SDL_Event &) override
 	{
 		return false;
 	}
@@ -51,7 +52,7 @@ private:
 GameMainWindow::GameMainWindow(size_t w, size_t h) : WindowContent {w, h}, SceneRenderer {{w, h}, 0}
 {
 	uiComponents.create<ManualCameraController>(glm::vec2 {310'727'624, 494'018'810});
-	auto gms = uiComponents.create<GameMainSelector>(&camera, ScreenAbsCoord {w, h});
+	auto gms = uiComponents.create<GameMainSelector>(&camera);
 	uiComponents.create<GameMainToolbar>(gms.get());
 }
 
@@ -89,7 +90,7 @@ GameMainWindow::render() const
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glDisable(GL_DEPTH_TEST);
-	uiComponents.apply(&UIComponent::render, uiShader, UIComponent::Position {});
+	uiComponents.apply(&UIComponent::render, uiShader);
 }
 
 void
diff --git a/ui/icon.cpp b/ui/icon.cpp
index 847b117..0bdc91a 100644
--- a/ui/icon.cpp
+++ b/ui/icon.cpp
@@ -22,13 +22,6 @@ Icon::Icon(const Image & tex) : size {tex.width, tex.height}
 			GL_RGBA, GL_UNSIGNED_BYTE, tex.data.data());
 }
 
-void
-Icon::Bind() const
-{
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, m_texture);
-}
-
 ImTextureID
 Icon::operator*() const
 {
diff --git a/ui/icon.h b/ui/icon.h
index 5f3a812..3d0788a 100644
--- a/ui/icon.h
+++ b/ui/icon.h
@@ -12,7 +12,6 @@ public:
 	explicit Icon(const std::filesystem::path & fileName);
 	explicit Icon(const Image & image);
 
-	void Bind() const;
 	const glm::vec2 size;
 	ImTextureID operator*() const;
 
diff --git a/ui/iconButton.cpp b/ui/iconButton.cpp
deleted file mode 100644
index fe8c817..0000000
--- a/ui/iconButton.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "iconButton.h"
-#include "glArrays.h"
-#include "ui/icon.h"
-#include "ui/uiComponent.h"
-#include <SDL2/SDL.h>
-#include <array>
-#include <filesystem>
-#include <functional>
-#include <glad/gl.h>
-#include <glm/gtc/type_ptr.hpp>
-#include <utility>
-
-IconButton::IconButton(const std::string & icon_, glm::vec2 position_, UIEvent click_) :
-	UIComponent {{position_, ICON_SIZE}}, icon {icon_}, click {std::move(click_)}
-{
-	glBindVertexArray(m_vertexArrayObject);
-
-	glBindBuffer(GL_ARRAY_BUFFER, m_vertexArrayBuffer);
-	glBufferData(GL_ARRAY_BUFFER, static_cast<GLsizeiptr>(sizeof(glm::vec4) * 4), nullptr, GL_DYNAMIC_DRAW);
-
-	glEnableVertexAttribArray(0);
-	glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(glm::vec4), nullptr);
-
-	glBindVertexArray(0);
-}
-
-void
-IconButton::render(const UIShader &, const Position & parentPos) const
-{
-	icon.Bind();
-	glBindVertexArray(m_vertexArrayObject);
-	glBindBuffer(GL_ARRAY_BUFFER, m_vertexArrayBuffer);
-	const auto abs = parentPos.origin + position.origin;
-	const auto limit = abs + ICON_SIZE;
-	std::array<glm::vec4, 4> vertices {{
-			{abs.x, abs.y, 0, 0},
-			{limit.x, abs.y, 1, 0},
-			{limit.x, limit.y, 1, 1},
-			{abs.x, limit.y, 0, 1},
-	}};
-	glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), glm::value_ptr(vertices.front()));
-	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindVertexArray(0);
-}
-
-bool
-IconButton::handleInput(const SDL_Event & e, const Position & parentPos)
-{
-	const auto absPos = position + parentPos;
-	if (absPos & e.button) {
-		if (e.button.type == SDL_MOUSEBUTTONUP && e.button.button == SDL_BUTTON_LEFT) {
-			click(e);
-		}
-	}
-	return false;
-}
diff --git a/ui/iconButton.h b/ui/iconButton.h
deleted file mode 100644
index 0afe92d..0000000
--- a/ui/iconButton.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "icon.h"
-#include "uiComponent.h"
-#include <glArrays.h>
-#include <glm/glm.hpp>
-#include <string>
-
-class UIShader;
-union SDL_Event;
-
-static const constexpr glm::vec2 ICON_SIZE {32.F, 32.F};
-
-class IconButton : public UIComponent {
-public:
-	IconButton(const std::string & icon, glm::vec2 position, UIEvent click);
-
-	void render(const UIShader &, const Position & parentPos) const override;
-
-	bool handleInput(const SDL_Event & e, const Position & parentPos) override;
-
-	Icon icon;
-	UIEvent click;
-	glVertexArray m_vertexArrayObject;
-	glBuffer m_vertexArrayBuffer;
-};
diff --git a/ui/manualCameraController.cpp b/ui/manualCameraController.cpp
index fbd0ca3..128701d 100644
--- a/ui/manualCameraController.cpp
+++ b/ui/manualCameraController.cpp
@@ -5,7 +5,7 @@
 #include <maths.h>
 
 bool
-ManualCameraController::handleInput(const SDL_Event & e, const Position &)
+ManualCameraController::handleInput(const SDL_Event & e)
 {
 	switch (e.type) {
 		case SDL_KEYDOWN:
@@ -72,7 +72,7 @@ ManualCameraController::handleInput(const SDL_Event & e, const Position &)
 }
 
 void
-ManualCameraController::render(const UIShader &, const Position &) const
+ManualCameraController::render(const UIShader &) const
 {
 }
 
diff --git a/ui/manualCameraController.h b/ui/manualCameraController.h
index 2f955e7..0cfa38c 100644
--- a/ui/manualCameraController.h
+++ b/ui/manualCameraController.h
@@ -11,10 +11,10 @@ class Camera;
 
 class ManualCameraController : public CameraController, public UIComponent {
 public:
-	explicit ManualCameraController(GlobalPosition2D f) : UIComponent {{}}, focus {f} { }
+	explicit ManualCameraController(GlobalPosition2D f) : focus {f} { }
 
-	bool handleInput(const SDL_Event & e, const Position &) override;
-	void render(const UIShader &, const Position & parentPos) const override;
+	bool handleInput(const SDL_Event & e) override;
+	void render(const UIShader &) const override;
 
 	void updateCamera(Camera * camera) const override;
 
diff --git a/ui/modeHelper.h b/ui/modeHelper.h
deleted file mode 100644
index d20f2db..0000000
--- a/ui/modeHelper.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <memory>
-union SDL_Event;
-
-enum ModeSecondClick { Unset, Reset, NoAction };
-
-template<typename Target, ModeSecondClick msc = ModeSecondClick::Unset> class Mode {
-public:
-	explicit Mode(Target & t) : target {t} { }
-
-	Target & target;
-
-	template<typename Mode, typename... Params>
-	auto
-	toggle(Params &&... params)
-	{
-		return [params..., this](const SDL_Event &) {
-			toggleSetMode<Mode>(std::forward<Params>(params)...);
-		};
-	}
-
-private:
-	template<typename Mode, typename... Params>
-	void
-	toggleSetMode(Params &&... params)
-	{
-		if (dynamic_cast<Mode *>(target.get())) {
-			if constexpr (msc == ModeSecondClick::Unset) {
-				target.reset();
-			}
-			if constexpr (msc == ModeSecondClick::Reset) {
-				target = std::make_unique<Mode>(std::forward<Params>(params)...);
-			}
-		}
-		else {
-			target = std::make_unique<Mode>(std::forward<Params>(params)...);
-		}
-	}
-};
diff --git a/ui/queryTool.cpp b/ui/queryTool.cpp
index e48bae1..e046084 100644
--- a/ui/queryTool.cpp
+++ b/ui/queryTool.cpp
@@ -31,7 +31,7 @@ QueryTool::click(const SDL_MouseButtonEvent & event, const Ray<GlobalPosition3D>
 }
 
 void
-QueryTool::render(const UIShader &, const UIComponent::Position &)
+QueryTool::render(const UIShader &)
 {
 	ImGui::Begin("Query Tool");
 	ImGui::TextUnformatted(clicked.c_str());
diff --git a/ui/queryTool.h b/ui/queryTool.h
index 8462214..cef4b75 100644
--- a/ui/queryTool.h
+++ b/ui/queryTool.h
@@ -7,7 +7,7 @@ protected:
 	using GameMainSelector::Component::render;
 
 	bool click(const SDL_MouseButtonEvent &, const Ray<GlobalPosition3D> &) override;
-	void render(const UIShader & shader, const UIComponent::Position & pos) override;
+	void render(const UIShader & shader) override;
 
 private:
 	std::string clicked;
diff --git a/ui/text.cpp b/ui/text.cpp
deleted file mode 100644
index bdaaba5..0000000
--- a/ui/text.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "text.h"
-#include "font.h"
-#include "gfx/gl/uiShader.h"
-#include "gfx/gl/vertexArrayObject.h"
-#include "uiComponent.h"
-#include <array>
-#include <collections.h>
-#include <glArrays.h>
-#include <glm/gtc/type_ptr.hpp>
-#include <maths.h>
-#include <numeric>
-#include <utility>
-
-Text::Text(std::string_view s, const Font & font, Position pos, glm::vec3 c) :
-	UIComponent {pos}, colour {c}, font {font}
-{
-	VertexArrayObject {vao}.addAttribs<Font::Quad::value_type>(quads.bufferName(), 0);
-	operator=(s);
-}
-
-Text &
-Text::operator=(const std::string_view s)
-{
-	auto tquads = font.render(s);
-	models.resize(tquads.size());
-	const auto glyphCount = std::accumulate(tquads.begin(), tquads.end(), size_t {}, [](auto && init, const auto & q) {
-		return init += q.second.size();
-	});
-	quads.resize(glyphCount);
-	GLushort current = 0;
-	auto model = models.begin();
-	auto quad = quads.begin();
-	for (const auto & [texture, fquads] : tquads) {
-		model->textureId = texture;
-		model->range.resize(fquads.size() * 6);
-		for (auto out = model->range.begin(); const auto & q [[maybe_unused]] : fquads) {
-			static constexpr std::array<GLushort, 6> quadIndices {0, 1, 2, 2, 3, 0};
-			std::transform(quadIndices.begin(), quadIndices.end(), out, [current](auto x) {
-				return current + x;
-			});
-			current += 4;
-			out += 6;
-		}
-		model++;
-		quad = std::transform(fquads.begin(), fquads.end(), quad, [this](const Font::Quad & q) {
-			return q * [this](const glm::vec4 & corner) {
-				return corner + glm::vec4 {this->position.origin, 0, 0};
-			};
-		});
-	}
-	quads.unmap();
-	return *this;
-}
-
-void
-Text::render(const UIShader & shader, const Position &) const
-{
-	shader.text.use(colour);
-	glActiveTexture(GL_TEXTURE0);
-	glBindVertexArray(vao);
-	for (const auto & m : models) {
-		glBindTexture(GL_TEXTURE_2D, m.textureId);
-		glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(m.range.size()), GL_UNSIGNED_SHORT, m.range.data());
-	}
-	glBindVertexArray(0);
-	glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-bool
-Text::handleInput(const SDL_Event &, const Position &)
-{
-	return false;
-}
diff --git a/ui/text.h b/ui/text.h
deleted file mode 100644
index a367456..0000000
--- a/ui/text.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "font.h"
-#include "glContainer.h"
-#include "uiComponent.h"
-#include <glArrays.h>
-#include <glad/gl.h>
-#include <glm/glm.hpp>
-#include <string_view>
-
-class UIShader;
-union SDL_Event;
-
-class Text : public UIComponent {
-public:
-	Text(std::string_view s, const Font &, Position, glm::vec3 colour);
-
-	void render(const UIShader &, const Position & parentPos) const override;
-	bool handleInput(const SDL_Event &, const Position & parentPos) override;
-
-	Text & operator=(const std::string_view s);
-
-private:
-	struct TextData {
-		GLuint textureId;
-		std::vector<unsigned short> range;
-	};
-
-	std::vector<TextData> models;
-	glContainer<Font::Quad> quads;
-	glVertexArray vao;
-	glm::vec3 colour;
-	const Font & font;
-};
diff --git a/ui/toolbar.cpp b/ui/toolbar.cpp
deleted file mode 100644
index 31d87dc..0000000
--- a/ui/toolbar.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "toolbar.h"
-#include "gfx/gl/uiShader.h"
-#include "ui/iconButton.h"
-#include "ui/uiComponent.h"
-#include "uiComponentPlacer.h"
-#include <SDL2/SDL.h>
-#include <glm/glm.hpp>
-
-Toolbar::Toolbar(const std::initializer_list<InitInfo> & initInfo) : UIComponent {{{}, {}}}
-{
-	UIComponentPlacer placer {{10, 10}, 5, 1};
-	for (const auto & ii : initInfo) {
-		icons.create(ii.first, placer.next(ICON_SIZE), ii.second);
-	}
-	this->position.size = placer.getLimit();
-}
-
-void
-Toolbar::render(const UIShader & uiShader, const Position & parentPos) const
-{
-	uiShader.icon.use();
-	const auto absPos = this->position + parentPos;
-	icons.apply(&UIComponent::render, uiShader, absPos);
-}
-
-bool
-Toolbar::handleInput(const SDL_Event & e, const Position & parentPos)
-{
-	const auto absPos = this->position + parentPos;
-	if (absPos & e.button) {
-		icons.applyOne(&UIComponent::handleInput, e, absPos);
-		return true;
-	}
-	return false;
-}
diff --git a/ui/toolbar.h b/ui/toolbar.h
deleted file mode 100644
index ea560f5..0000000
--- a/ui/toolbar.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "collection.h"
-#include "iconButton.h"
-#include "uiComponent.h"
-#include <initializer_list>
-#include <string>
-#include <utility>
-
-class UIShader;
-union SDL_Event;
-
-class Toolbar : public UIComponent {
-public:
-	using InitInfo = std::pair<std::string, UIEvent>;
-	explicit Toolbar(const std::initializer_list<InitInfo> & initInfo);
-
-	void render(const UIShader & uiShader, const Position & parentPos) const override;
-
-	bool handleInput(const SDL_Event & e, const Position & parentPos) override;
-
-	Collection<IconButton, false> icons;
-};
diff --git a/ui/uiComponent.cpp b/ui/uiComponent.cpp
deleted file mode 100644
index aa4838d..0000000
--- a/ui/uiComponent.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "uiComponent.h"
-#include <SDL2/SDL.h>
-
-UIComponent::UIComponent(Position position) : position {position} { }
-
-UIComponent::Position
-UIComponent::Position::operator+(const Position & parentPos) const
-{
-	return *this + parentPos.origin;
-}
-
-UIComponent::Position
-UIComponent::Position::operator+(const glm::vec2 & parentPos) const
-{
-	return {origin + parentPos, size};
-}
-
-bool
-UIComponent::Position::operator&(const glm::vec2 & pos) const
-{
-	return (pos.x >= origin.x && pos.y >= origin.y && pos.x < origin.x + size.x && pos.y < origin.y + size.y);
-}
-
-bool
-UIComponent::Position::operator&(const SDL_MouseButtonEvent & pos) const
-{
-	switch (pos.type) {
-		case SDL_MOUSEBUTTONUP:
-		case SDL_MOUSEBUTTONDOWN:
-			return *this & glm::vec2 {pos.x, pos.y};
-	}
-	return false;
-}
diff --git a/ui/uiComponent.h b/ui/uiComponent.h
index 71d2659..9178c6b 100644
--- a/ui/uiComponent.h
+++ b/ui/uiComponent.h
@@ -1,32 +1,19 @@
 #pragma once
 
-#include <functional>
 #include <glm/glm.hpp>
 #include <special_members.h>
 
 class UIShader;
 union SDL_Event;
-struct SDL_MouseButtonEvent;
-using UIEvent = std::function<void(const SDL_Event &)>;
 
 class UIComponent {
 public:
-	struct Position {
-		glm::vec2 origin, size;
-		Position operator+(const Position &) const;
-		Position operator+(const glm::vec2 &) const;
-		bool operator&(const SDL_MouseButtonEvent &) const;
-		bool operator&(const glm::vec2 &) const;
-	};
-
-	explicit UIComponent(Position);
+	UIComponent() = default;
 	virtual ~UIComponent() = default;
 
 	NO_MOVE(UIComponent);
 	NO_COPY(UIComponent);
 
-	virtual void render(const UIShader &, const Position & parentPos) const = 0;
-	virtual bool handleInput(const SDL_Event &, const Position & parentPos) = 0;
-
-	Position position;
+	virtual void render(const UIShader &) const = 0;
+	virtual bool handleInput(const SDL_Event &) = 0;
 };
diff --git a/ui/uiComponentPlacer.cpp b/ui/uiComponentPlacer.cpp
deleted file mode 100644
index 5e645d8..0000000
--- a/ui/uiComponentPlacer.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "uiComponentPlacer.h"
-#include <algorithm>
-
-UIComponentPlacer::UIComponentPlacer(glm::vec2 padding, float spacing, glm::length_t axis) :
-	padding {padding}, spacing {spacing}, axis {axis}, current {padding[axis]}
-{
-}
-
-glm::vec2
-UIComponentPlacer::next(glm::vec2 size)
-{
-	glm::vec2 n {};
-	n[axis] = current;
-	n[1 - axis] = padding[1 - axis];
-	current += spacing + size[axis];
-	max = std::max(max, size[1 - axis]);
-	return n;
-}
-
-glm::vec2
-UIComponentPlacer::getLimit() const
-{
-	glm::vec2 n {};
-	n[axis] = current + padding[axis];
-	n[1 - axis] = max + padding[1 - axis];
-	return n;
-}
diff --git a/ui/uiComponentPlacer.h b/ui/uiComponentPlacer.h
deleted file mode 100644
index 1e64f78..0000000
--- a/ui/uiComponentPlacer.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <glm/glm.hpp>
-
-class UIComponentPlacer {
-public:
-	UIComponentPlacer(glm::vec2 padding, float spacing, glm::length_t axis = 0);
-
-	glm::vec2 next(glm::vec2 size);
-	glm::vec2 getLimit() const;
-
-private:
-	const glm::vec2 padding;
-	const float spacing;
-	const glm::length_t axis;
-
-	float current {};
-	float max {};
-};
diff --git a/ui/windowContent.cpp b/ui/windowContent.cpp
index 91732a7..f55a8d5 100644
--- a/ui/windowContent.cpp
+++ b/ui/windowContent.cpp
@@ -27,6 +27,6 @@ WindowContent::handleInput(const SDL_Event & e)
 			eAdjusted.motion.y = size.y - e.motion.y;
 			break;
 	}
-	uiComponents.rapplyOne(&UIComponent::handleInput, eAdjusted, UIComponent::Position {{}, size});
+	uiComponents.rapplyOne(&UIComponent::handleInput, eAdjusted);
 	return true;
 }