From 65f0acc23900a6d8796211e7c8ea21a3863935eb Mon Sep 17 00:00:00 2001
From: Karn Kaul <karnkaul@gmail.com>
Date: Thu, 13 Jun 2024 15:15:11 +0530
Subject: [PATCH 1/7] Upgrade `Scene`.

---
 .gitignore                               |  1 +
 src/spaced/spaced/scene.cpp              | 63 ++++++++++++++++++++++--
 src/spaced/spaced/scene.hpp              | 25 ++++++++--
 src/spaced/spaced/scenes/load_assets.cpp | 17 ++-----
 src/spaced/spaced/scenes/load_assets.hpp | 11 +----
 src/spaced/spaced/spaced.cpp             |  3 +-
 src/spaced/spaced/ui/view.hpp            |  1 +
 7 files changed, 91 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7a70de4..ca09e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ compile_commands.json
 imgui.ini
 bave*.log
 /spaced
+/notes.txt
diff --git a/src/spaced/spaced/scene.cpp b/src/spaced/spaced/scene.cpp
index a339c55..dd73b7c 100644
--- a/src/spaced/spaced/scene.cpp
+++ b/src/spaced/spaced/scene.cpp
@@ -4,28 +4,49 @@
 
 namespace spaced {
 using bave::App;
+using bave::FocusChange;
 using bave::KeyInput;
 using bave::PointerMove;
 using bave::PointerTap;
 using bave::Seconds;
+using bave::Shader;
 
 Scene::Scene(App& app, Services const& services, std::string name) : m_log{std::move(name)}, m_app(app), m_services(services) { m_log.info("constructed"); }
 
-void Scene::on_key_event(KeyInput const& key_input) { on_key(key_input); }
+void Scene::start_loading() {
+	auto stages = build_load_stages();
+	if (stages.empty()) {
+		on_loaded();
+		return;
+	}
+
+	m_load.emplace(std::move(stages));
+	m_loading_screen.emplace(m_services);
+}
+
+void Scene::on_key_event(KeyInput const& key_input) {
+	if (is_loading()) { return; }
+	on_key(key_input);
+}
 
-void Scene::on_focus_event(bave::FocusChange const& focus_change) { on_focus(focus_change); }
+void Scene::on_focus_event(FocusChange const& focus_change) { on_focus(focus_change); }
 
 void Scene::on_move_event(PointerMove const& pointer_move) {
+	if (is_loading()) { return; }
 	if (on_ui_event([pointer_move](ui::View& view) { view.on_move(pointer_move); })) { return; }
 	on_move(pointer_move);
 }
 
 void Scene::on_tap_event(PointerTap const& pointer_tap) {
+	if (is_loading()) { return; }
 	if (on_ui_event([pointer_tap](ui::View& view) { view.on_tap(pointer_tap); })) { return; }
 	on_tap(pointer_tap);
 }
 
-void Scene::on_scroll_event(bave::MouseScroll const& mouse_scroll) { on_scroll(mouse_scroll); }
+void Scene::on_scroll_event(bave::MouseScroll const& mouse_scroll) {
+	if (is_loading()) { return; }
+	on_scroll(mouse_scroll);
+}
 
 auto Scene::is_ui_blocking_input() const -> bool {
 	return std::any_of(m_views.begin(), m_views.end(), [](auto const& view) { return view->block_input_events; });
@@ -36,7 +57,16 @@ void Scene::push_view(std::unique_ptr<ui::View> view) {
 	m_views.push_back(std::move(view));
 }
 
+auto Scene::pop_view() -> std::unique_ptr<ui::View> {
+	if (m_views.empty()) { return {}; }
+	auto ret = std::move(m_views.back());
+	m_views.pop_back();
+	return ret;
+}
+
 void Scene::tick_frame(Seconds const dt) {
+	update_loading(dt);
+	if (is_loading()) { return; }
 	tick(dt);
 	for (auto const& view : cache_views()) { view->tick(dt); }
 	std::erase_if(m_views, [](auto const& view) { return view->is_destroyed(); });
@@ -45,6 +75,7 @@ void Scene::tick_frame(Seconds const dt) {
 void Scene::render_frame() const {
 	auto shader = get_app().load_shader("shaders/default.vert", "shaders/default.frag");
 	if (!shader) { return; }
+	if (render_loading(*shader)) { return; }
 	render(*shader);
 	for (auto const& view : m_views) { view->render(*shader); }
 }
@@ -54,6 +85,7 @@ auto Scene::on_ui_event(F per_view) -> bool {
 	auto const cached_views = cache_views();
 	for (auto it = cached_views.rbegin(); it != cached_views.rend(); ++it) {
 		auto const& view = *it;
+		if (!view->active) { continue; }
 		per_view(*view);
 		if (view->block_input_events) { return true; }
 	}
@@ -66,4 +98,29 @@ auto Scene::cache_views() -> std::span<bave::Ptr<ui::View> const> {
 	for (auto const& view : m_views) { m_cached_views.push_back(view.get()); }
 	return m_cached_views;
 }
+
+void Scene::update_loading(Seconds const dt) {
+	if (!m_loading_screen) { return; }
+
+	if (!m_load) {
+		m_loading_screen->update(dt, 1.0f);
+		return;
+	}
+
+	auto const load_status = m_load->update();
+	auto const progress = load_status.progress();
+	m_loading_screen->update(dt, progress);
+
+	if (load_status.is_complete()) {
+		on_loaded();
+		m_loading_screen.reset();
+		m_load.reset();
+	}
+}
+
+auto Scene::render_loading(Shader& shader) const -> bool {
+	if (!m_loading_screen) { return false; }
+	m_loading_screen->draw(shader);
+	return true;
+}
 } // namespace spaced
diff --git a/src/spaced/spaced/scene.hpp b/src/spaced/spaced/scene.hpp
index 77acfcd..a098abe 100644
--- a/src/spaced/spaced/scene.hpp
+++ b/src/spaced/spaced/scene.hpp
@@ -2,13 +2,15 @@
 #include <bave/app.hpp>
 #include <bave/core/polymorphic.hpp>
 #include <bave/loader.hpp>
+#include <spaced/async_exec.hpp>
 #include <spaced/services/services.hpp>
+#include <spaced/ui/loading_screen.hpp>
 #include <spaced/ui/view.hpp>
 
 namespace spaced {
 class Scene : public bave::PolyPinned {
   public:
-	explicit Scene(bave::App& app, Services const& services, std::string name = "Scene");
+	void start_loading();
 
 	void on_focus_event(bave::FocusChange const& focus_change);
 	void on_key_event(bave::KeyInput const& key_input);
@@ -22,16 +24,22 @@ class Scene : public bave::PolyPinned {
 
 	[[nodiscard]] auto get_app() const -> bave::App& { return m_app; }
 	[[nodiscard]] auto get_services() const -> Services const& { return m_services; }
+	[[nodiscard]] auto make_loader() const -> bave::Loader { return bave::Loader{&m_app.get_data_store(), &m_app.get_render_device()}; }
 
+	[[nodiscard]] auto is_loading() const -> bool { return m_loading_screen.has_value(); }
 	[[nodiscard]] auto is_ui_blocking_input() const -> bool;
 
-	[[nodiscard]] auto make_loader() const -> bave::Loader { return bave::Loader{&m_app.get_data_store(), &m_app.get_render_device()}; }
-
 	void push_view(std::unique_ptr<ui::View> view);
+	auto pop_view() -> std::unique_ptr<ui::View>;
 
 	bave::Rgba clear_colour{bave::black_v};
 
   protected:
+	explicit Scene(bave::App& app, Services const& services, std::string name);
+
+	virtual auto build_load_stages() -> std::vector<AsyncExec::Stage> { return {}; }
+	virtual void on_loaded() {}
+
 	virtual void on_focus(bave::FocusChange const& /*focus_change*/) {}
 	virtual void on_resize(bave::WindowResize const& /*window_resize*/) {}
 	virtual void on_resize(bave::FramebufferResize const& /*framebuffer_resize*/) {}
@@ -53,9 +61,20 @@ class Scene : public bave::PolyPinned {
 
 	auto cache_views() -> std::span<bave::Ptr<ui::View> const>;
 
+	void update_loading(bave::Seconds dt);
+	auto render_loading(bave::Shader& shader) const -> bool;
+
 	bave::App& m_app;
 	Services const& m_services;
 	std::vector<std::unique_ptr<ui::View>> m_views{};
 	std::vector<bave::Ptr<ui::View>> m_cached_views{};
+
+	std::optional<AsyncExec> m_load{};
+	std::optional<ui::LoadingScreen> m_loading_screen{};
+};
+
+class EmptyScene : public Scene {
+  public:
+	explicit EmptyScene(bave::App& app, Services const& services) : Scene(app, services, "EmptyScene") {}
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/scenes/load_assets.cpp b/src/spaced/spaced/scenes/load_assets.cpp
index ec6e481..276bd8c 100644
--- a/src/spaced/spaced/scenes/load_assets.cpp
+++ b/src/spaced/spaced/scenes/load_assets.cpp
@@ -9,8 +9,6 @@
 namespace spaced {
 using bave::App;
 using bave::Loader;
-using bave::Seconds;
-using bave::Shader;
 
 namespace {
 auto make_load_stages(Loader loader, Services const& services) -> std::vector<AsyncExec::Stage> {
@@ -24,18 +22,9 @@ auto make_load_stages(Loader loader, Services const& services) -> std::vector<As
 }
 } // namespace
 
-LoadAssets::LoadAssets(App& app, Services const& services)
-	: Scene(app, services, "LoadAssets"), m_loading_screen(services), m_load(make_load_stages(make_loader(), services)) {}
+LoadAssets::LoadAssets(App& app, Services const& services) : Scene(app, services, "LoadAssets") {}
 
-void LoadAssets::on_loaded() { get_services().get<ISceneSwitcher>().switch_to<MenuScene>(); }
-
-void LoadAssets::tick(Seconds const dt) {
-	auto const load_status = m_load.update();
-	auto const progress = load_status.progress();
-	m_loading_screen.update(dt, progress);
+auto LoadAssets::build_load_stages() -> std::vector<AsyncExec::Stage> { return make_load_stages(make_loader(), get_services()); }
 
-	if (load_status.is_complete()) { on_loaded(); }
-}
-
-void LoadAssets::render(Shader& shader) const { m_loading_screen.draw(shader); }
+void LoadAssets::on_loaded() { get_services().get<ISceneSwitcher>().switch_to<MenuScene>(); }
 } // namespace spaced
diff --git a/src/spaced/spaced/scenes/load_assets.hpp b/src/spaced/spaced/scenes/load_assets.hpp
index 95cc0c3..1b10cc6 100644
--- a/src/spaced/spaced/scenes/load_assets.hpp
+++ b/src/spaced/spaced/scenes/load_assets.hpp
@@ -1,7 +1,5 @@
 #pragma once
-#include <spaced/async_exec.hpp>
 #include <spaced/scene.hpp>
-#include <spaced/ui/loading_screen.hpp>
 
 namespace spaced {
 class LoadAssets : public Scene {
@@ -9,12 +7,7 @@ class LoadAssets : public Scene {
 	explicit LoadAssets(bave::App& app, Services const& services);
 
   private:
-	void on_loaded();
-
-	void tick(bave::Seconds dt) final;
-	void render(bave::Shader& shader) const final;
-
-	ui::LoadingScreen m_loading_screen;
-	AsyncExec m_load;
+	auto build_load_stages() -> std::vector<AsyncExec::Stage> final;
+	void on_loaded() final;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/spaced.cpp b/src/spaced/spaced/spaced.cpp
index 21ddd17..90a011a 100644
--- a/src/spaced/spaced/spaced.cpp
+++ b/src/spaced/spaced/spaced.cpp
@@ -139,7 +139,7 @@ struct SceneSwitcher : ISceneSwitcher {
 
 void Spaced::set_bindings([[maybe_unused]] Serializer& serializer) {}
 
-Spaced::Spaced(App& app) : Driver(app), m_scene(std::make_unique<Scene>(app, m_services)) {
+Spaced::Spaced(App& app) : Driver(app), m_scene(std::make_unique<EmptyScene>(app, m_services)) {
 	m_log.info("using MSAA: {}x", static_cast<int>(app.get_render_device().get_sample_count()));
 	load_resources();
 	set_layout();
@@ -165,6 +165,7 @@ void Spaced::tick() {
 	if (m_scene_switcher->next_scene) {
 		switch_track(m_scene->get_music_uri(), m_scene_switcher->next_scene->get_music_uri());
 		m_scene = std::move(m_scene_switcher->next_scene);
+		m_scene->start_loading();
 	}
 
 	m_scene->tick_frame(dt);
diff --git a/src/spaced/spaced/ui/view.hpp b/src/spaced/spaced/ui/view.hpp
index d5bf621..c91ac1e 100644
--- a/src/spaced/spaced/ui/view.hpp
+++ b/src/spaced/spaced/ui/view.hpp
@@ -21,6 +21,7 @@ class View : public bave::Polymorphic {
 	virtual void render(bave::Shader& shader) const;
 
 	bool block_input_events{true};
+	bool active{true};
 
   protected:
 	std::vector<std::unique_ptr<ui::IElement>> m_elements{};

From a6bf3c7845028f65f885bcd57d96589f2b2e0fd6 Mon Sep 17 00:00:00 2001
From: Karn Kaul <karnkaul@gmail.com>
Date: Thu, 13 Jun 2024 16:06:34 +0530
Subject: [PATCH 2/7] Upgrade bave to v0.5.5, use `EventSink`.

---
 CMakeLists.txt               |  2 +-
 src/spaced/spaced/scene.hpp  | 13 ++-----------
 src/spaced/spaced/spaced.cpp |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3753ed5..a7e215e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(FetchContent)
 FetchContent_Declare(
   bave
   GIT_REPOSITORY https://github.com/karnkaul/bave
-  GIT_TAG v0.5.4
+  GIT_TAG v0.5.5
   SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/bave"
 )
 
diff --git a/src/spaced/spaced/scene.hpp b/src/spaced/spaced/scene.hpp
index a098abe..7b27376 100644
--- a/src/spaced/spaced/scene.hpp
+++ b/src/spaced/spaced/scene.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <bave/app.hpp>
 #include <bave/core/polymorphic.hpp>
+#include <bave/input/event_sink.hpp>
 #include <bave/loader.hpp>
 #include <spaced/async_exec.hpp>
 #include <spaced/services/services.hpp>
@@ -8,7 +9,7 @@
 #include <spaced/ui/view.hpp>
 
 namespace spaced {
-class Scene : public bave::PolyPinned {
+class Scene : public bave::EventSink {
   public:
 	void start_loading();
 
@@ -40,16 +41,6 @@ class Scene : public bave::PolyPinned {
 	virtual auto build_load_stages() -> std::vector<AsyncExec::Stage> { return {}; }
 	virtual void on_loaded() {}
 
-	virtual void on_focus(bave::FocusChange const& /*focus_change*/) {}
-	virtual void on_resize(bave::WindowResize const& /*window_resize*/) {}
-	virtual void on_resize(bave::FramebufferResize const& /*framebuffer_resize*/) {}
-	virtual void on_key(bave::KeyInput const& /*key_input*/) {}
-	virtual void on_char(bave::CharInput const& /*char_input*/) {}
-	virtual void on_tap(bave::PointerTap const& /*pointer_tap*/) {}
-	virtual void on_move(bave::PointerMove const& /*pointer_move*/) {}
-	virtual void on_scroll(bave::MouseScroll const& /*mouse_scroll*/) {}
-	virtual void on_drop(std::span<std::string const> /*paths*/) {}
-
 	virtual void tick(bave::Seconds /*dt*/) {}
 	virtual void render(bave::Shader& /*shader*/) const {}
 
diff --git a/src/spaced/spaced/spaced.cpp b/src/spaced/spaced/spaced.cpp
index 90a011a..81a29ec 100644
--- a/src/spaced/spaced/spaced.cpp
+++ b/src/spaced/spaced/spaced.cpp
@@ -178,7 +178,7 @@ void Spaced::render() const { m_scene->render_frame(); }
 void Spaced::load_resources() {
 	auto const loader = Loader{&get_app().get_data_store(), &get_app().get_render_device()};
 	auto resources = std::make_unique<Resources>();
-	resources->main_font = loader.load_font("fonts/hesitation.regular.ttf");
+	resources->main_font = loader.load_font("fonts/CuteDino.otf");
 	resources->spinner = loader.load_texture("images/spinner.png", true);
 	m_resources = resources.get();
 	m_services.bind<Resources>(std::move(resources));

From 516baa9b7a8ab04ee812dbb6ca2fbfd1a5d831e3 Mon Sep 17 00:00:00 2001
From: Karn Kaul <karnkaul@gmail.com>
Date: Thu, 13 Jun 2024 21:39:00 +0530
Subject: [PATCH 3/7] Add `GameDriver`, separate screen layout from game
 layout.

---
 src/spaced/CMakeLists.txt                   |   2 +
 src/spaced/spaced/game/enemies/creep.cpp    |   2 +-
 src/spaced/spaced/game/enemy.cpp            |   6 +-
 src/spaced/spaced/game/enemy.hpp            |   4 +-
 src/spaced/spaced/game/hud.cpp              |   3 +-
 src/spaced/spaced/game/player.cpp           |   6 +-
 src/spaced/spaced/game/powerups/pu_base.cpp |   4 +-
 src/spaced/spaced/game/powerups/pu_base.hpp |   2 +-
 src/spaced/spaced/game/world.cpp            |   8 +-
 src/spaced/spaced/game_driver.cpp           | 146 ++++++++++++++++++++
 src/spaced/spaced/game_driver.hpp           |  43 ++++++
 src/spaced/spaced/scene.cpp                 |   3 +
 src/spaced/spaced/scene.hpp                 |   4 +
 src/spaced/spaced/scenes/game.cpp           |   8 +-
 src/spaced/spaced/scenes/load_assets.cpp    |   2 +-
 src/spaced/spaced/scenes/menu.cpp           |   2 +-
 src/spaced/spaced/services/layout.hpp       |  13 +-
 src/spaced/spaced/services/styles.cpp       | 104 +++++++++++---
 src/spaced/spaced/spaced.cpp                | 138 +++---------------
 src/spaced/spaced/spaced.hpp                |  23 +--
 20 files changed, 342 insertions(+), 181 deletions(-)
 create mode 100644 src/spaced/spaced/game_driver.cpp
 create mode 100644 src/spaced/spaced/game_driver.hpp

diff --git a/src/spaced/CMakeLists.txt b/src/spaced/CMakeLists.txt
index 3be00f3..fbdde26 100644
--- a/src/spaced/CMakeLists.txt
+++ b/src/spaced/CMakeLists.txt
@@ -19,3 +19,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 file(GLOB_RECURSE sources LIST_DIRECTORIES false CONFIGURE_DEPENDS "spaced/*.?pp")
 
 target_sources(${PROJECT_NAME} PRIVATE ${sources})
+
+target_precompile_headers(${PROJECT_NAME} REUSE_FROM bave)
diff --git a/src/spaced/spaced/game/enemies/creep.cpp b/src/spaced/spaced/game/enemies/creep.cpp
index 903ec8c..db37e37 100644
--- a/src/spaced/spaced/game/enemies/creep.cpp
+++ b/src/spaced/spaced/game/enemies/creep.cpp
@@ -8,6 +8,6 @@ void Creep::tick(Seconds const dt, bool const in_play) {
 	if (!in_play) { return; }
 
 	shape.transform.position.x -= x_speed * dt.count();
-	if (shape.transform.position.x < -0.5f * (get_layout().get_world_space().x + shape.get_shape().size.x)) { set_destroyed(); }
+	if (shape.transform.position.x < -0.5f * (get_layout().world_space.x + shape.get_shape().size.x)) { set_destroyed(); }
 }
 } // namespace spaced
diff --git a/src/spaced/spaced/game/enemy.cpp b/src/spaced/spaced/game/enemy.cpp
index e6e6a39..3bdd7af 100644
--- a/src/spaced/spaced/game/enemy.cpp
+++ b/src/spaced/spaced/game/enemy.cpp
@@ -11,9 +11,9 @@ using bave::RoundedQuad;
 using bave::Seconds;
 using bave::Shader;
 
-Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&services.get<ILayout>()), m_health_bar(services), m_type(type) {
+Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&services.get<GameLayout>()), m_health_bar(services), m_type(type) {
 	static constexpr auto init_size_v = glm::vec2{100.0f};
-	auto const play_area = m_layout->get_play_area();
+	auto const play_area = m_layout->play_area;
 	auto const y_min = play_area.rb.y + 0.5f * init_size_v.y;
 	auto const y_max = play_area.lt.y - 0.5f * init_size_v.y - 50.0f;
 	setup(init_size_v, random_in_range(y_min, y_max));
@@ -49,7 +49,7 @@ void Enemy::setup(glm::vec2 max_size, float y_position) {
 	rounded_quad.size = max_size;
 	rounded_quad.corner_radius = 0.2f * max_size.x;
 	shape.set_shape(rounded_quad);
-	shape.transform.position.x = 0.5f * (get_layout().get_world_space().x + rounded_quad.size.x);
+	shape.transform.position.x = 0.5f * (get_layout().world_space.x + rounded_quad.size.x);
 	shape.transform.position.y = y_position;
 }
 
diff --git a/src/spaced/spaced/game/enemy.hpp b/src/spaced/spaced/game/enemy.hpp
index 04ffe58..94764ae 100644
--- a/src/spaced/spaced/game/enemy.hpp
+++ b/src/spaced/spaced/game/enemy.hpp
@@ -27,7 +27,7 @@ class Enemy : public IDamageable, public bave::IDrawable {
 
 	void setup(glm::vec2 max_size, float y_position);
 
-	[[nodiscard]] auto get_layout() const -> ILayout const& { return *m_layout; }
+	[[nodiscard]] auto get_layout() const -> GameLayout const& { return *m_layout; }
 
 	void inspect() {
 		if constexpr (bave::debug_v) { do_inspect(); }
@@ -43,7 +43,7 @@ class Enemy : public IDamageable, public bave::IDrawable {
   private:
 	virtual void do_inspect();
 
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<GameLayout const*> m_layout;
 
 	ui::ProgressBar m_health_bar;
 
diff --git a/src/spaced/spaced/game/hud.cpp b/src/spaced/spaced/game/hud.cpp
index 9799892..3c73229 100644
--- a/src/spaced/spaced/game/hud.cpp
+++ b/src/spaced/spaced/game/hud.cpp
@@ -1,11 +1,12 @@
 #include <fmt/format.h>
 #include <spaced/game/hud.hpp>
+#include <spaced/services/layout.hpp>
 #include <spaced/services/styles.hpp>
 
 namespace spaced {
 using bave::TextHeight;
 
-Hud::Hud(Services const& services) : ui::View(services), m_styles(&services.get<Styles>()), m_area(m_layout->get_hud_area()) {
+Hud::Hud(Services const& services) : ui::View(services), m_styles(&services.get<Styles>()), m_area(services.get<GameLayout>().hud_area) {
 	create_background();
 	create_score(services);
 
diff --git a/src/spaced/spaced/game/player.cpp b/src/spaced/spaced/game/player.cpp
index c123d4b..7e1997e 100644
--- a/src/spaced/spaced/game/player.cpp
+++ b/src/spaced/spaced/game/player.cpp
@@ -19,10 +19,10 @@ using bave::Shader;
 
 Player::Player(Services const& services, std::unique_ptr<IController> controller)
 	: m_services(&services), m_stats(&services.get<Stats>()), m_controller(std::move(controller)) {
-	auto const& layout = services.get<ILayout>();
-	ship.transform.position.x = layout.get_player_x();
+	auto const& layout = services.get<GameLayout>();
+	ship.transform.position.x = layout.player_x;
 	auto rounded_quad = RoundedQuad{};
-	rounded_quad.size = layout.get_player_size();
+	rounded_quad.size = layout.player_size;
 	rounded_quad.corner_radius = 20.0f;
 	ship.set_shape(rounded_quad);
 
diff --git a/src/spaced/spaced/game/powerups/pu_base.cpp b/src/spaced/spaced/game/powerups/pu_base.cpp
index 22cd99f..2cc908b 100644
--- a/src/spaced/spaced/game/powerups/pu_base.cpp
+++ b/src/spaced/spaced/game/powerups/pu_base.cpp
@@ -7,7 +7,7 @@ using bave::RoundedQuad;
 using bave::Seconds;
 using bave::Shader;
 
-PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<ILayout>()), m_name(name) {
+PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<GameLayout>()), m_name(name) {
 	auto quad = RoundedQuad{};
 	quad.size = glm::vec2{40.0f};
 	quad.corner_radius = 12.5f;
@@ -21,7 +21,7 @@ PUBase::PUBase(Services const& services, std::string_view const name) : m_servic
 
 void PUBase::tick(Seconds const dt) {
 	shape.transform.position.x -= speed * dt.count();
-	if (shape.transform.position.x < m_layout->get_play_area().lt.x - 0.5f * shape.get_shape().size.x) { m_destroyed = true; }
+	if (shape.transform.position.x < m_layout->play_area.lt.x - 0.5f * shape.get_shape().size.x) { m_destroyed = true; }
 
 	emitter.set_position(shape.transform.position);
 	if (!m_emitter_ticked) {
diff --git a/src/spaced/spaced/game/powerups/pu_base.hpp b/src/spaced/spaced/game/powerups/pu_base.hpp
index baf64e7..6a6ebd4 100644
--- a/src/spaced/spaced/game/powerups/pu_base.hpp
+++ b/src/spaced/spaced/game/powerups/pu_base.hpp
@@ -27,7 +27,7 @@ class PUBase : public IPowerup {
 	virtual void do_activate(Player& player) = 0;
 
 	bave::NotNull<Services const*> m_services;
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<GameLayout const*> m_layout;
 	std::string_view m_name{};
 	bool m_emitter_ticked{};
 	bool m_destroyed{};
diff --git a/src/spaced/spaced/game/world.cpp b/src/spaced/spaced/game/world.cpp
index 9e55db6..d86721e 100644
--- a/src/spaced/spaced/game/world.cpp
+++ b/src/spaced/spaced/game/world.cpp
@@ -21,16 +21,16 @@ namespace {
 [[nodiscard]] auto make_player_controller(Services const& services) {
 	auto ret = std::make_unique<PlayerController>(services);
 	if constexpr (bave::platform_v == bave::Platform::eAndroid) { ret->set_type(PlayerController::Type::eTouch); }
-	auto const& layout = services.get<ILayout>();
-	auto const half_size = 0.5f * layout.get_player_size();
-	auto const play_area = layout.get_play_area();
+	auto const& layout = services.get<GameLayout>();
+	auto const half_size = 0.5f * layout.player_size;
+	auto const play_area = layout.play_area;
 	ret->max_y = play_area.lt.y - half_size.y;
 	ret->min_y = play_area.rb.y + half_size.y;
 	return ret;
 }
 
 [[nodiscard]] auto make_auto_controller(ITargetProvider const& target_provider, Services const& services) {
-	return std::make_unique<AutoController>(&target_provider, services.get<ILayout>().get_player_x());
+	return std::make_unique<AutoController>(&target_provider, services.get<GameLayout>().player_x);
 }
 } // namespace
 
diff --git a/src/spaced/spaced/game_driver.cpp b/src/spaced/spaced/game_driver.cpp
new file mode 100644
index 0000000..fa6d898
--- /dev/null
+++ b/src/spaced/spaced/game_driver.cpp
@@ -0,0 +1,146 @@
+#include <spaced/game_driver.hpp>
+#include <spaced/services/audio.hpp>
+#include <spaced/services/resources.hpp>
+#include <spaced/services/scene_switcher.hpp>
+
+namespace spaced {
+using bave::App;
+using bave::AudioClip;
+using bave::AudioDevice;
+using bave::AudioStreamer;
+using bave::FocusChange;
+using bave::KeyInput;
+using bave::MouseScroll;
+using bave::NotNull;
+using bave::PointerMove;
+using bave::PointerTap;
+using bave::Rect;
+using bave::RenderDevice;
+using bave::RenderView;
+using bave::Seconds;
+
+namespace {
+struct Audio : IAudio {
+	NotNull<AudioDevice*> audio_device;
+	NotNull<AudioStreamer*> audio_streamer;
+	NotNull<Resources const*> resources;
+
+	explicit Audio(NotNull<AudioDevice*> audio_device, NotNull<AudioStreamer*> audio_streamer, NotNull<Resources const*> resources)
+		: audio_device(audio_device), audio_streamer(audio_streamer), resources(resources) {}
+
+	[[nodiscard]] auto get_sfx_gain() const -> float final { return audio_device->sfx_gain; }
+	void set_sfx_gain(float const gain) final { audio_device->sfx_gain = gain; }
+
+	[[nodiscard]] auto get_music_gain() const -> float final { return audio_streamer->gain; }
+	void set_music_gain(float const gain) final { audio_streamer->gain = gain; }
+
+	void play_sfx(std::string_view const uri) final {
+		auto const clip = resources->get<AudioClip>(uri);
+		if (!clip) { return; }
+		audio_device->play_once(*clip);
+	}
+
+	void play_music(std::string_view const uri, Seconds const crossfade) final {
+		auto const clip = resources->get<AudioClip>(uri);
+		if (!clip) { return; }
+		audio_streamer->play(clip, crossfade);
+	}
+
+	void stop_music() final { audio_streamer->stop(); }
+};
+} // namespace
+
+struct GameDriver::SceneSwitcher : ISceneSwitcher {
+	App& app;				  // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
+	Services const& services; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
+	std::unique_ptr<Scene> next_scene{};
+
+	explicit SceneSwitcher(App& app, Services const& services) : app(app), services(services) {}
+
+	void switch_to_scene(std::unique_ptr<Scene> new_scene) final { next_scene = std::move(new_scene); }
+
+	[[nodiscard]] auto get_app() const -> App& final { return app; }
+	[[nodiscard]] auto get_services() const -> Services const& final { return services; }
+};
+
+struct GameDriver::Layout : ILayout {
+	NotNull<RenderDevice const*> render_device;
+	RenderView main_view{};
+	glm::vec2 framebuffer_size{};
+	Rect<> play_area{};
+	Rect<> hud_area{};
+
+	explicit Layout(NotNull<RenderDevice const*> render_device) : render_device(render_device) {}
+
+	[[nodiscard]] auto get_main_view() const -> RenderView const& final { return main_view; }
+	[[nodiscard]] auto get_framebuffer_size() const -> glm::vec2 final { return framebuffer_size; }
+	[[nodiscard]] auto get_world_space() const -> glm::vec2 final { return main_view.viewport; }
+
+	[[nodiscard]] auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 final { return render_device->project_to(get_world_space(), fb_point); }
+
+	[[nodiscard]] auto unproject(glm::vec2 const pointer) const -> glm::vec2 final {
+		if (!bave::is_positive(framebuffer_size)) { return pointer; }
+		return main_view.unproject(pointer / framebuffer_size);
+	}
+};
+
+GameDriver::GameDriver(App& app) : Driver(app), m_scene(std::make_unique<EmptyScene>(app, m_services)) {
+	auto layout = std::make_unique<Layout>(&app.get_render_device());
+	m_layout = layout.get();
+	m_layout->framebuffer_size = app.get_framebuffer_size();
+	m_layout->main_view = app.get_render_device().get_default_view();
+	m_services.bind<ILayout>(std::move(layout));
+
+	auto switcher = std::make_unique<SceneSwitcher>(app, m_services);
+	m_switcher = switcher.get();
+	m_services.bind<ISceneSwitcher>(std::move(switcher));
+
+	m_services.bind<Resources>(std::make_unique<Resources>());
+
+	auto audio = std::make_unique<Audio>(&get_app().get_audio_device(), &get_app().get_audio_streamer(), &m_services.get<Resources>());
+	m_audio = audio.get();
+	m_services.bind<IAudio>(std::move(audio));
+}
+
+void GameDriver::on_focus(FocusChange const& focus_change) { m_scene->on_focus_event(focus_change); }
+
+void GameDriver::on_resize(bave::WindowResize const& window_resize) { m_scene->on_resize(window_resize); }
+
+void GameDriver::on_resize(bave::FramebufferResize const& framebuffer_resize) { m_scene->on_resize(framebuffer_resize); }
+
+void GameDriver::on_key(KeyInput const& key_input) { m_scene->on_key_event(key_input); }
+
+void GameDriver::on_char(bave::CharInput const& char_input) { m_scene->on_char(char_input); }
+
+void GameDriver::on_tap(PointerTap const& pointer_tap) { m_scene->on_tap_event(pointer_tap); }
+
+void GameDriver::on_move(PointerMove const& pointer_move) { m_scene->on_move_event(pointer_move); }
+
+void GameDriver::on_scroll(MouseScroll const& mouse_scroll) { m_scene->on_scroll_event(mouse_scroll); }
+
+void GameDriver::on_drop(std::span<std::string const> paths) { m_scene->on_drop(paths); }
+
+void GameDriver::tick() {
+	m_layout->framebuffer_size = get_app().get_framebuffer_size();
+
+	if (m_switcher->next_scene) {
+		switch_track(m_scene->get_music_uri(), m_switcher->next_scene->get_music_uri());
+		m_scene = std::move(m_switcher->next_scene);
+		m_scene->start_loading();
+	}
+
+	m_scene->tick_frame(get_app().get_dt());
+
+	clear_colour = m_scene->clear_colour;
+}
+
+void GameDriver::render() const { m_scene->render_frame(); }
+
+void GameDriver::switch_track(std::string_view const from, std::string_view const to) const {
+	if (to.empty()) {
+		m_audio->stop_music();
+	} else if (from != to) {
+		m_audio->play_music(to);
+	}
+}
+} // namespace spaced
diff --git a/src/spaced/spaced/game_driver.hpp b/src/spaced/spaced/game_driver.hpp
new file mode 100644
index 0000000..cfc0d16
--- /dev/null
+++ b/src/spaced/spaced/game_driver.hpp
@@ -0,0 +1,43 @@
+#pragma once
+#include <bave/driver.hpp>
+#include <spaced/scene.hpp>
+#include <spaced/services/scene_switcher.hpp>
+
+namespace spaced {
+class IAudio;
+
+class GameDriver : public bave::Driver {
+  public:
+	explicit GameDriver(bave::App& app);
+
+  protected:
+	void on_focus(bave::FocusChange const& focus_change) override;
+	void on_resize(bave::WindowResize const& window_resize) override;
+	void on_resize(bave::FramebufferResize const& framebuffer_resize) override;
+	void on_key(bave::KeyInput const& key_input) override;
+	void on_char(bave::CharInput const& char_input) override;
+	void on_tap(bave::PointerTap const& pointer_tap) override;
+	void on_move(bave::PointerMove const& pointer_move) override;
+	void on_scroll(bave::MouseScroll const& mouse_scroll) override;
+	void on_drop(std::span<std::string const> paths) override;
+
+	void tick() override;
+	void render() const override;
+
+	void switch_track(std::string_view from, std::string_view to) const;
+
+	[[nodiscard]] auto get_switcher() const -> ISceneSwitcher& { return m_services.get<ISceneSwitcher>(); }
+
+	Services m_services;
+
+  private:
+	struct SceneSwitcher;
+	struct Layout;
+
+	bave::Ptr<SceneSwitcher> m_switcher{};
+	bave::Ptr<Layout> m_layout{};
+	bave::Ptr<IAudio> m_audio{};
+
+	std::unique_ptr<Scene> m_scene{};
+};
+} // namespace spaced
diff --git a/src/spaced/spaced/scene.cpp b/src/spaced/spaced/scene.cpp
index dd73b7c..c974e92 100644
--- a/src/spaced/spaced/scene.cpp
+++ b/src/spaced/spaced/scene.cpp
@@ -1,5 +1,6 @@
 #include <spaced/scene.hpp>
 #include <spaced/services/layout.hpp>
+#include <spaced/services/scene_switcher.hpp>
 #include <algorithm>
 
 namespace spaced {
@@ -64,6 +65,8 @@ auto Scene::pop_view() -> std::unique_ptr<ui::View> {
 	return ret;
 }
 
+auto Scene::get_switcher() const -> ISceneSwitcher& { return get_services().get<ISceneSwitcher>(); }
+
 void Scene::tick_frame(Seconds const dt) {
 	update_loading(dt);
 	if (is_loading()) { return; }
diff --git a/src/spaced/spaced/scene.hpp b/src/spaced/spaced/scene.hpp
index 7b27376..f3443d0 100644
--- a/src/spaced/spaced/scene.hpp
+++ b/src/spaced/spaced/scene.hpp
@@ -9,6 +9,8 @@
 #include <spaced/ui/view.hpp>
 
 namespace spaced {
+class ISceneSwitcher;
+
 class Scene : public bave::EventSink {
   public:
 	void start_loading();
@@ -33,6 +35,8 @@ class Scene : public bave::EventSink {
 	void push_view(std::unique_ptr<ui::View> view);
 	auto pop_view() -> std::unique_ptr<ui::View>;
 
+	[[nodiscard]] auto get_switcher() const -> ISceneSwitcher&;
+
 	bave::Rgba clear_colour{bave::black_v};
 
   protected:
diff --git a/src/spaced/spaced/scenes/game.cpp b/src/spaced/spaced/scenes/game.cpp
index 142d639..52138a0 100644
--- a/src/spaced/spaced/scenes/game.cpp
+++ b/src/spaced/spaced/scenes/game.cpp
@@ -54,9 +54,7 @@ GameScene::GameScene(App& app, Services const& services) : Scene(app, services,
 void GameScene::on_focus(FocusChange const& focus_change) { m_world.player.on_focus(focus_change); }
 
 void GameScene::on_key(KeyInput const& key_input) {
-	if (key_input.key == Key::eEscape && key_input.action == Action::eRelease && key_input.mods == KeyMods{}) {
-		get_services().get<ISceneSwitcher>().switch_to<MenuScene>();
-	}
+	if (key_input.key == Key::eEscape && key_input.action == Action::eRelease && key_input.mods == KeyMods{}) { get_switcher().switch_to<MenuScene>(); }
 }
 
 void GameScene::on_move(PointerMove const& pointer_move) { m_world.player.on_move(pointer_move); }
@@ -84,7 +82,7 @@ void GameScene::on_game_over() {
 	auto dci = ui::DialogCreateInfo{
 		.size = {600.0f, 200.0f},
 		.content_text = "GAME OVER",
-		.main_button = {.text = "RESTART", .callback = [this] { get_services().get<ISceneSwitcher>().switch_to<GameScene>(); }},
+		.main_button = {.text = "RESTART", .callback = [this] { get_switcher().switch_to<GameScene>(); }},
 		.second_button = {.text = "QUIT", .callback = [this] { get_app().shutdown(); }},
 	};
 
@@ -122,7 +120,7 @@ void GameScene::inspect(Seconds const dt, Seconds const frame_time) {
 			ImGui::Checkbox("fps lock", &m_debug.fps.lock);
 
 			ImGui::Separator();
-			if (ImGui::Button("reload scene")) { get_services().get<ISceneSwitcher>().switch_to<GameScene>(); }
+			if (ImGui::Button("reload scene")) { get_switcher().switch_to<GameScene>(); }
 		}
 		ImGui::End();
 
diff --git a/src/spaced/spaced/scenes/load_assets.cpp b/src/spaced/spaced/scenes/load_assets.cpp
index 276bd8c..9ea4063 100644
--- a/src/spaced/spaced/scenes/load_assets.cpp
+++ b/src/spaced/spaced/scenes/load_assets.cpp
@@ -26,5 +26,5 @@ LoadAssets::LoadAssets(App& app, Services const& services) : Scene(app, services
 
 auto LoadAssets::build_load_stages() -> std::vector<AsyncExec::Stage> { return make_load_stages(make_loader(), get_services()); }
 
-void LoadAssets::on_loaded() { get_services().get<ISceneSwitcher>().switch_to<MenuScene>(); }
+void LoadAssets::on_loaded() { get_switcher().switch_to<MenuScene>(); }
 } // namespace spaced
diff --git a/src/spaced/spaced/scenes/menu.cpp b/src/spaced/spaced/scenes/menu.cpp
index 650c229..dcdb75f 100644
--- a/src/spaced/spaced/scenes/menu.cpp
+++ b/src/spaced/spaced/scenes/menu.cpp
@@ -27,7 +27,7 @@ void MenuScene::create_ui() {
 	auto start = std::make_unique<ui::Button>(get_services());
 	start->set_text("start");
 	start->set_position({0.0f, -100.0f});
-	start->callback = [this]() { get_services().get<ISceneSwitcher>().switch_to<GameScene>(); };
+	start->callback = [this]() { get_switcher().switch_to<GameScene>(); };
 
 	auto options = std::make_unique<ui::Button>(get_services());
 	options->set_text("options");
diff --git a/src/spaced/spaced/services/layout.hpp b/src/spaced/spaced/services/layout.hpp
index c33691a..50ab99d 100644
--- a/src/spaced/spaced/services/layout.hpp
+++ b/src/spaced/spaced/services/layout.hpp
@@ -8,13 +8,16 @@ class ILayout : public IService {
 	[[nodiscard]] virtual auto get_main_view() const -> bave::RenderView const& = 0;
 	[[nodiscard]] virtual auto get_framebuffer_size() const -> glm::vec2 = 0;
 	[[nodiscard]] virtual auto get_world_space() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_play_area() const -> bave::Rect<> = 0;
-	[[nodiscard]] virtual auto get_hud_area() const -> bave::Rect<> = 0;
 	[[nodiscard]] virtual auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 = 0;
 	[[nodiscard]] virtual auto unproject(glm::vec2 pointer) const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_player_x() const -> float = 0;
-	[[nodiscard]] virtual auto get_player_size() const -> glm::vec2 = 0;
+};
+
+struct GameLayout : IService {
+	glm::vec2 world_space{};
+	bave::Rect<> play_area{};
+	bave::Rect<> hud_area{};
 
-	virtual void set_framebuffer_size(glm::vec2 size) = 0;
+	float player_x{-700.0f};
+	glm::vec2 player_size{100.0f};
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/services/styles.cpp b/src/spaced/spaced/services/styles.cpp
index f2065d9..1601e2c 100644
--- a/src/spaced/spaced/services/styles.cpp
+++ b/src/spaced/spaced/services/styles.cpp
@@ -5,19 +5,88 @@
 namespace spaced {
 namespace {
 using bave::from_json;
-using bave::to_json;
-using util::from_json;
-using util::to_json;
+using bave::Rgba;
 
-template <typename Type>
-void load_styles(StringMap<Type>& out, dj::Json const& json) {
-	for (auto const& [id, in_style] : json.object_view()) {
-		if (id.empty()) { continue; }
-		auto out_style = Type{};
-		from_json(in_style, out_style);
-		out.insert_or_assign(std::string{id}, out_style);
+class StylesLoader {
+  public:
+	StringMap<Rgba> const& rgbas; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
+
+	template <typename Type>
+	void load(StringMap<Type>& out, dj::Json const& json) const {
+		for (auto const& [id, in_style] : json.object_view()) {
+			if (id.empty()) { continue; }
+			auto out_style = Type{};
+			from(in_style, out_style);
+			out.insert_or_assign(std::string{id}, out_style);
+		}
 	}
-}
+
+	template <typename Type>
+	void from(dj::Json const& json, Type& out) const {
+		from_json(json, out);
+	}
+
+	void from(dj::Json const& json, Rgba& out) const {
+		auto const str = json.as_string();
+		if (str.starts_with('#')) {
+			from_json(json, out);
+		} else {
+			out = rgbas[str];
+		}
+	}
+
+	void from(dj::Json const& json, ui::LoadingScreenStyle& out) const {
+		from(json["background_tint"], out.background_tint);
+		auto const& spinner = json["spinner"];
+		from(spinner["size"], out.spinner.size);
+		from(spinner["spin_rate"], out.spinner.spin_rate.value);
+		auto const& progress_bar = json["progress_bar"];
+		from(progress_bar["n_width"], out.progress_bar.n_width);
+		from(progress_bar["height"], out.progress_bar.height);
+		from(progress_bar["bottom_offset"], out.progress_bar.bottom_offset);
+		from(progress_bar["padding"], out.progress_bar.padding);
+	}
+
+	void from(dj::Json const& json, ui::ButtonStyle::Tint& out) const {
+		from(json["idle"], out[ui::ButtonState::eIdle]);
+		from(json["hover"], out[ui::ButtonState::eHover]);
+		from(json["press"], out[ui::ButtonState::ePress]);
+	}
+
+	void from(dj::Json const& json, ui::ButtonStyle& out) const {
+		from(json["background"], out.background);
+		from(json["outline"], out.outline);
+		from(json["text"], out.text);
+		from(json["outline_width"], out.outline_width);
+		from(json["corner_ratio"], out.corner_ratio);
+	}
+
+	void from(dj::Json const& json, ui::ProgressBarStyle& out) const {
+		from(json["background"], out.background);
+		from(json["fill"], out.fill);
+		from(json["corner_ratio"], out.corner_ratio);
+		from(json["padding"], out.padding);
+	}
+
+	void from(dj::Json const& json, ui::DialogStyle& out) const {
+		from(json["footer_padding"], out.footer_padding);
+		from(json["corner_ratio"], out.corner_ratio);
+		from(json["background_tint"], out.background_tint);
+		from(json["outline_tint"], out.outline_tint);
+		from(json["content_text_tint"], out.content_text_tint);
+	}
+
+	void from(dj::Json const& json, ui::SliderStyle& out) const {
+		from(json["progress_bar"], out.progress_bar);
+		from(json["knob_diameter"], out.knob_diameter);
+		from(json["knob_tint"], out.knob_tint);
+	}
+};
+} // namespace
+
+namespace {
+using bave::to_json;
+using util::to_json;
 
 template <typename Type>
 void save_styles(StringMap<Type> const& styles, dj::Json& out, std::string_view const key) {
@@ -32,12 +101,13 @@ void save_styles(StringMap<Type> const& styles, dj::Json& out, std::string_view
 
 auto Styles::load(dj::Json const& json) -> Styles {
 	auto ret = Styles{};
-	load_styles(ret.rgbas, json["rgbas"]);
-	load_styles(ret.buttons, json["buttons"]);
-	load_styles(ret.progress_bars, json["progress_bars"]);
-	load_styles(ret.dialogs, json["dialogs"]);
-	load_styles(ret.sliders, json["sliders"]);
-	if (auto const& loading_screen = json["loading_screen"]) { from_json(loading_screen, ret.loading_screen); }
+	auto const loader = StylesLoader{ret.rgbas};
+	loader.load(ret.rgbas, json["rgbas"]);
+	loader.load(ret.buttons, json["buttons"]);
+	loader.load(ret.progress_bars, json["progress_bars"]);
+	loader.load(ret.dialogs, json["dialogs"]);
+	loader.load(ret.sliders, json["sliders"]);
+	if (auto const& loading_screen = json["loading_screen"]) { loader.from(loading_screen, ret.loading_screen); }
 	return ret;
 }
 
diff --git a/src/spaced/spaced/spaced.cpp b/src/spaced/spaced/spaced.cpp
index 81a29ec..16e258b 100644
--- a/src/spaced/spaced/spaced.cpp
+++ b/src/spaced/spaced/spaced.cpp
@@ -21,13 +21,9 @@ using bave::AudioClip;
 using bave::AudioDevice;
 using bave::AudioStreamer;
 using bave::Gamepad;
-using bave::KeyInput;
 using bave::Loader;
-using bave::MouseScroll;
 using bave::NotNull;
 using bave::Persistor;
-using bave::PointerMove;
-using bave::PointerTap;
 using bave::Rect;
 using bave::RenderDevice;
 using bave::RenderView;
@@ -41,34 +37,6 @@ struct GamepadProvider : IGamepadProvider {
 	[[nodiscard]] auto get_gamepad() const -> Gamepad const& final { return app.get_most_recent_gamepad(); }
 };
 
-struct Layout : ILayout {
-	NotNull<RenderDevice const*> render_device;
-	RenderView main_view{};
-	glm::vec2 framebuffer_size{};
-	Rect<> play_area{};
-	Rect<> hud_area{};
-
-	explicit Layout(NotNull<RenderDevice const*> render_device) : render_device(render_device) {}
-
-	[[nodiscard]] auto get_main_view() const -> RenderView const& final { return main_view; }
-	[[nodiscard]] auto get_framebuffer_size() const -> glm::vec2 final { return framebuffer_size; }
-	[[nodiscard]] auto get_world_space() const -> glm::vec2 final { return main_view.viewport; }
-	[[nodiscard]] auto get_play_area() const -> bave::Rect<> final { return play_area; }
-	[[nodiscard]] auto get_hud_area() const -> bave::Rect<> final { return hud_area; }
-
-	[[nodiscard]] auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 final { return render_device->project_to(get_world_space(), fb_point); }
-
-	[[nodiscard]] auto unproject(glm::vec2 const pointer) const -> glm::vec2 final {
-		if (!bave::is_positive(framebuffer_size)) { return pointer; }
-		return main_view.unproject(pointer / framebuffer_size);
-	}
-
-	[[nodiscard]] auto get_player_x() const -> float final { return -700.0f; }
-	[[nodiscard]] auto get_player_size() const -> glm::vec2 final { return glm::vec2{100.0f}; }
-
-	void set_framebuffer_size(glm::vec2 const size) final { framebuffer_size = size; }
-};
-
 struct Audio : IAudio {
 	NotNull<AudioDevice*> audio_device;
 	NotNull<AudioStreamer*> audio_streamer;
@@ -124,64 +92,22 @@ struct PersistentStats : Stats {
 };
 } // namespace
 
-struct SceneSwitcher : ISceneSwitcher {
-	App& app;				  // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
-	Services const& services; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
-	std::unique_ptr<Scene> next_scene{};
-
-	explicit SceneSwitcher(App& app, Services const& services) : app(app), services(services) {}
-
-	void switch_to_scene(std::unique_ptr<Scene> new_scene) final { next_scene = std::move(new_scene); }
-
-	[[nodiscard]] auto get_app() const -> App& final { return app; }
-	[[nodiscard]] auto get_services() const -> Services const& final { return services; }
-};
-
 void Spaced::set_bindings([[maybe_unused]] Serializer& serializer) {}
 
-Spaced::Spaced(App& app) : Driver(app), m_scene(std::make_unique<EmptyScene>(app, m_services)) {
+Spaced::Spaced(App& app) : GameDriver(app) {
 	m_log.info("using MSAA: {}x", static_cast<int>(app.get_render_device().get_sample_count()));
 	load_resources();
-	set_layout();
+	set_game_layout();
 	create_services();
 	set_prefs();
 	set_scene();
 }
 
-void Spaced::on_focus(bave::FocusChange const& focus_change) { m_scene->on_focus_event(focus_change); }
-
-void Spaced::on_key(KeyInput const& key_input) { m_scene->on_key_event(key_input); }
-
-void Spaced::on_move(PointerMove const& pointer_move) { m_scene->on_move_event(pointer_move); }
-
-void Spaced::on_tap(PointerTap const& pointer_tap) { m_scene->on_tap_event(pointer_tap); }
-
-void Spaced::on_scroll(MouseScroll const& mouse_scroll) { m_scene->on_scroll_event(mouse_scroll); }
-
-void Spaced::tick() {
-	auto const dt = get_app().get_dt();
-	m_layout->set_framebuffer_size(get_app().get_framebuffer_size());
-
-	if (m_scene_switcher->next_scene) {
-		switch_track(m_scene->get_music_uri(), m_scene_switcher->next_scene->get_music_uri());
-		m_scene = std::move(m_scene_switcher->next_scene);
-		m_scene->start_loading();
-	}
-
-	m_scene->tick_frame(dt);
-
-	clear_colour = m_scene->clear_colour;
-}
-
-void Spaced::render() const { m_scene->render_frame(); }
-
 void Spaced::load_resources() {
 	auto const loader = Loader{&get_app().get_data_store(), &get_app().get_render_device()};
-	auto resources = std::make_unique<Resources>();
-	resources->main_font = loader.load_font("fonts/CuteDino.otf");
-	resources->spinner = loader.load_texture("images/spinner.png", true);
-	m_resources = resources.get();
-	m_services.bind<Resources>(std::move(resources));
+	m_resources = &m_services.get<Resources>();
+	m_resources->main_font = loader.load_font("fonts/CuteDino.otf");
+	m_resources->spinner = loader.load_texture("images/spinner.png", true);
 
 	auto styles = std::make_unique<Styles>();
 	if (auto const json = loader.load_json("styles.json")) {
@@ -199,22 +125,6 @@ void Spaced::load_resources() {
 	m_services.bind<Styles>(std::move(styles));
 }
 
-void Spaced::set_layout() {
-	auto const& app = get_app();
-	auto layout = std::make_unique<Layout>(&app.get_render_device());
-	m_layout = layout.get();
-	layout->main_view = app.get_render_device().get_default_view();
-	layout->main_view.viewport = app.get_render_device().get_viewport_scaler().match_height({1920.0f, 1080.0f});
-	layout->framebuffer_size = app.get_framebuffer_size();
-	auto const hud_size = glm::vec2{layout->main_view.viewport.x, 100.0f};
-	auto const hud_origin = glm::vec2{0.0f, 0.5f * (layout->main_view.viewport.y - hud_size.y)};
-	layout->hud_area = Rect<>::from_size(hud_size, hud_origin);
-	auto const play_size = glm::vec2{hud_size.x, layout->main_view.viewport.y - hud_size.y};
-	auto const play_origin = glm::vec2{0.0f, -0.5f * (layout->main_view.viewport.y - play_size.y)};
-	layout->play_area = Rect<>::from_size(play_size, play_origin);
-	m_services.bind<ILayout>(std::move(layout));
-}
-
 void Spaced::create_services() {
 	auto serializer = std::make_unique<Serializer>();
 	set_bindings(*serializer);
@@ -222,33 +132,31 @@ void Spaced::create_services() {
 
 	m_services.bind<IGamepadProvider>(std::make_unique<GamepadProvider>(get_app()));
 
-	auto audio = std::make_unique<Audio>(&get_app().get_audio_device(), &get_app().get_audio_streamer(), m_resources);
-	m_audio = audio.get();
-	m_services.bind<IAudio>(std::move(audio));
-
 	auto stats = std::make_unique<PersistentStats>(&get_app());
 	++stats->run_count;
 	m_services.bind<Stats>(std::move(stats));
 }
 
-void Spaced::set_prefs() {
-	auto const prefs = Prefs::load(get_app());
-	m_audio->set_music_gain(prefs.music_gain);
-	m_audio->set_sfx_gain(prefs.sfx_gain);
+void Spaced::set_game_layout() {
+	auto game_layout = std::make_unique<GameLayout>();
+	auto const& layout = m_services.get<ILayout>();
+	game_layout->world_space = layout.get_world_space();
+	auto const viewport = layout.get_main_view().viewport;
+	auto const hud_size = glm::vec2{viewport.x, 100.0f};
+	auto const hud_origin = glm::vec2{0.0f, 0.5f * (viewport.y - hud_size.y)};
+	game_layout->hud_area = Rect<>::from_size(hud_size, hud_origin);
+	auto const play_size = glm::vec2{hud_size.x, viewport.y - hud_size.y};
+	auto const play_origin = glm::vec2{0.0f, -0.5f * (viewport.y - play_size.y)};
+	game_layout->play_area = Rect<>::from_size(play_size, play_origin);
+	m_services.bind<GameLayout>(std::move(game_layout));
 }
 
-void Spaced::set_scene() {
-	auto switcher = std::make_unique<SceneSwitcher>(get_app(), m_services);
-	m_scene_switcher = switcher.get();
-	switcher->switch_to<LoadAssets>();
-	m_services.bind<ISceneSwitcher>(std::move(switcher));
+void Spaced::set_prefs() {
+	auto const prefs = Prefs::load(get_app());
+	auto& audio = m_services.get<IAudio>();
+	audio.set_music_gain(prefs.music_gain);
+	audio.set_sfx_gain(prefs.sfx_gain);
 }
 
-void Spaced::switch_track(std::string_view const from, std::string_view const to) const {
-	if (to.empty()) {
-		m_audio->stop_music();
-	} else if (from != to) {
-		m_audio->play_music(to);
-	}
-}
+void Spaced::set_scene() { get_switcher().switch_to<LoadAssets>(); }
 } // namespace spaced
diff --git a/src/spaced/spaced/spaced.hpp b/src/spaced/spaced/spaced.hpp
index 42de8b9..c1e7629 100644
--- a/src/spaced/spaced/spaced.hpp
+++ b/src/spaced/spaced/spaced.hpp
@@ -1,44 +1,27 @@
 #pragma once
 #include <bave/driver.hpp>
-#include <spaced/scene.hpp>
+#include <spaced/game_driver.hpp>
 #include <spaced/services/services.hpp>
 
 namespace spaced {
 class Serializer;
 struct Resources;
-class IAudio;
 struct SceneSwitcher;
 
-class Spaced : public bave::Driver {
+class Spaced : public GameDriver {
   public:
 	explicit Spaced(bave::App& app);
 
   private:
 	static void set_bindings(Serializer& serializer);
 
-	void on_focus(bave::FocusChange const& focus_change) final;
-	void on_key(bave::KeyInput const& key_input) final;
-	void on_move(bave::PointerMove const& pointer_move) final;
-	void on_tap(bave::PointerTap const& pointer_tap) final;
-	void on_scroll(bave::MouseScroll const& mouse_scroll) final;
-
-	void tick() final;
-	void render() const final;
-
 	void load_resources();
 	void create_services();
-	void set_layout();
+	void set_game_layout();
 	void set_prefs();
 	void set_scene();
 
-	void switch_track(std::string_view from, std::string_view to) const;
-
 	bave::Logger m_log{"Spaced"};
-	Services m_services{};
-	bave::Ptr<ILayout> m_layout{};
-	bave::Ptr<SceneSwitcher> m_scene_switcher{};
 	bave::Ptr<Resources> m_resources{};
-	bave::Ptr<IAudio> m_audio{};
-	std::unique_ptr<Scene> m_scene{};
 };
 } // namespace spaced

From 57eb5ecb9448a635fa89a3d1efd42df85cde6649 Mon Sep 17 00:00:00 2001
From: Karn Kaul <karnkaul@gmail.com>
Date: Thu, 13 Jun 2024 23:00:27 +0530
Subject: [PATCH 4/7] Rename `ILayout` to `IDisplay`.

---
 .../game/controllers/player_controller.cpp       | 10 +++++-----
 .../game/controllers/player_controller.hpp       |  4 ++--
 src/spaced/spaced/game/enemy.cpp                 |  2 +-
 src/spaced/spaced/game/enemy.hpp                 |  4 ++--
 src/spaced/spaced/game/hud.cpp                   |  2 +-
 src/spaced/spaced/game/player.cpp                |  3 ++-
 src/spaced/spaced/game/powerups/pu_base.cpp      |  2 +-
 src/spaced/spaced/game/powerups/pu_base.hpp      |  2 +-
 src/spaced/spaced/game/weapon.cpp                |  2 +-
 src/spaced/spaced/game/weapon.hpp                |  6 +++---
 src/spaced/spaced/game/weapons/gun_beam.cpp      | 10 +++++-----
 src/spaced/spaced/game/weapons/gun_kinetic.cpp   |  2 +-
 src/spaced/spaced/game/weapons/projectile.cpp    |  4 ++--
 src/spaced/spaced/game/weapons/projectile.hpp    |  6 +++---
 src/spaced/spaced/game/world.cpp                 |  4 ++--
 src/spaced/spaced/game_driver.cpp                | 16 ++++++++--------
 src/spaced/spaced/game_driver.hpp                |  4 ++--
 src/spaced/spaced/services/display.hpp           | 14 ++++++++++++++
 src/spaced/spaced/services/layout.hpp            | 13 ++-----------
 src/spaced/spaced/spaced.cpp                     | 14 +++++++-------
 src/spaced/spaced/spaced.hpp                     |  2 +-
 src/spaced/spaced/ui/button.cpp                  |  6 +++---
 src/spaced/spaced/ui/button.hpp                  |  4 ++--
 src/spaced/spaced/ui/loading_screen.cpp          |  6 +++---
 src/spaced/spaced/ui/loading_screen.hpp          |  4 ++--
 src/spaced/spaced/ui/view.cpp                    |  4 ++--
 src/spaced/spaced/ui/view.hpp                    |  4 ++--
 27 files changed, 80 insertions(+), 74 deletions(-)
 create mode 100644 src/spaced/spaced/services/display.hpp

diff --git a/src/spaced/spaced/game/controllers/player_controller.cpp b/src/spaced/spaced/game/controllers/player_controller.cpp
index 28edd78..b31417d 100644
--- a/src/spaced/spaced/game/controllers/player_controller.cpp
+++ b/src/spaced/spaced/game/controllers/player_controller.cpp
@@ -14,13 +14,13 @@ using bave::PointerMove;
 using bave::PointerTap;
 using bave::Seconds;
 
-PlayerController::PlayerController(Services const& services) : m_layout(&services.get<ILayout>()), m_gamepad_provider(&services.get<IGamepadProvider>()) {
-	max_y = 0.5f * m_layout->get_world_space().y;
+PlayerController::PlayerController(Services const& services) : m_display(&services.get<IDisplay>()), m_gamepad_provider(&services.get<IGamepadProvider>()) {
+	max_y = 0.5f * m_display->get_world_space().y;
 	min_y = -max_y; // NOLINT(cppcoreguidelines-prefer-member-initializer)
 }
 
 void PlayerController::on_move(PointerMove const& pointer_move) {
-	auto const world_pos = m_layout->project_to_world(pointer_move.pointer.position);
+	auto const world_pos = m_display->project_to_world(pointer_move.pointer.position);
 
 	if (m_type == Type::eTouch) {
 		if (!is_in_move_area(world_pos)) {
@@ -39,7 +39,7 @@ void PlayerController::on_move(PointerMove const& pointer_move) {
 }
 
 void PlayerController::on_tap(PointerTap const& pointer_tap) {
-	auto const world_pos = m_layout->project_to_world(pointer_tap.pointer.position);
+	auto const world_pos = m_display->project_to_world(pointer_tap.pointer.position);
 	if (m_type == Type::eTouch && is_in_move_area(world_pos)) {
 		// pointer tap in move area is ingored
 		return;
@@ -66,7 +66,7 @@ void PlayerController::stop_firing() {
 }
 
 auto PlayerController::is_in_move_area(glm::vec2 const position) const -> bool {
-	auto const n_pos = position.x / m_layout->get_world_space().x;
+	auto const n_pos = position.x / m_display->get_world_space().x;
 	return n_pos <= -n_move_area;
 }
 
diff --git a/src/spaced/spaced/game/controllers/player_controller.hpp b/src/spaced/spaced/game/controllers/player_controller.hpp
index f20c325..a840b72 100644
--- a/src/spaced/spaced/game/controllers/player_controller.hpp
+++ b/src/spaced/spaced/game/controllers/player_controller.hpp
@@ -3,8 +3,8 @@
 #include <bave/input/gamepad.hpp>
 #include <spaced/game/controllers/follow_controller.hpp>
 #include <spaced/game/spring_arm.hpp>
+#include <spaced/services/display.hpp>
 #include <spaced/services/gamepad_provider.hpp>
-#include <spaced/services/layout.hpp>
 #include <spaced/services/services.hpp>
 
 namespace spaced {
@@ -45,7 +45,7 @@ class PlayerController : public FollowController {
 	auto tick_y(bave::Seconds dt) -> float final;
 	void do_inspect() final;
 
-	bave::Ptr<ILayout const> m_layout{};
+	bave::Ptr<IDisplay const> m_display{};
 	bave::Ptr<IGamepadProvider const> m_gamepad_provider{};
 
 	Type m_type{};
diff --git a/src/spaced/spaced/game/enemy.cpp b/src/spaced/spaced/game/enemy.cpp
index 3bdd7af..59acc33 100644
--- a/src/spaced/spaced/game/enemy.cpp
+++ b/src/spaced/spaced/game/enemy.cpp
@@ -11,7 +11,7 @@ using bave::RoundedQuad;
 using bave::Seconds;
 using bave::Shader;
 
-Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&services.get<GameLayout>()), m_health_bar(services), m_type(type) {
+Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&services.get<Layout>()), m_health_bar(services), m_type(type) {
 	static constexpr auto init_size_v = glm::vec2{100.0f};
 	auto const play_area = m_layout->play_area;
 	auto const y_min = play_area.rb.y + 0.5f * init_size_v.y;
diff --git a/src/spaced/spaced/game/enemy.hpp b/src/spaced/spaced/game/enemy.hpp
index 94764ae..378027e 100644
--- a/src/spaced/spaced/game/enemy.hpp
+++ b/src/spaced/spaced/game/enemy.hpp
@@ -27,7 +27,7 @@ class Enemy : public IDamageable, public bave::IDrawable {
 
 	void setup(glm::vec2 max_size, float y_position);
 
-	[[nodiscard]] auto get_layout() const -> GameLayout const& { return *m_layout; }
+	[[nodiscard]] auto get_layout() const -> Layout const& { return *m_layout; }
 
 	void inspect() {
 		if constexpr (bave::debug_v) { do_inspect(); }
@@ -43,7 +43,7 @@ class Enemy : public IDamageable, public bave::IDrawable {
   private:
 	virtual void do_inspect();
 
-	bave::NotNull<GameLayout const*> m_layout;
+	bave::NotNull<Layout const*> m_layout;
 
 	ui::ProgressBar m_health_bar;
 
diff --git a/src/spaced/spaced/game/hud.cpp b/src/spaced/spaced/game/hud.cpp
index 3c73229..be2db21 100644
--- a/src/spaced/spaced/game/hud.cpp
+++ b/src/spaced/spaced/game/hud.cpp
@@ -6,7 +6,7 @@
 namespace spaced {
 using bave::TextHeight;
 
-Hud::Hud(Services const& services) : ui::View(services), m_styles(&services.get<Styles>()), m_area(services.get<GameLayout>().hud_area) {
+Hud::Hud(Services const& services) : ui::View(services), m_styles(&services.get<Styles>()), m_area(services.get<Layout>().hud_area) {
 	create_background();
 	create_score(services);
 
diff --git a/src/spaced/spaced/game/player.cpp b/src/spaced/spaced/game/player.cpp
index 7e1997e..63ef0a1 100644
--- a/src/spaced/spaced/game/player.cpp
+++ b/src/spaced/spaced/game/player.cpp
@@ -2,6 +2,7 @@
 #include <bave/imgui/im_text.hpp>
 #include <bave/platform.hpp>
 #include <spaced/game/player.hpp>
+#include <spaced/services/layout.hpp>
 #include <spaced/services/resources.hpp>
 #include <spaced/services/stats.hpp>
 #include <spaced/services/styles.hpp>
@@ -19,7 +20,7 @@ using bave::Shader;
 
 Player::Player(Services const& services, std::unique_ptr<IController> controller)
 	: m_services(&services), m_stats(&services.get<Stats>()), m_controller(std::move(controller)) {
-	auto const& layout = services.get<GameLayout>();
+	auto const& layout = services.get<Layout>();
 	ship.transform.position.x = layout.player_x;
 	auto rounded_quad = RoundedQuad{};
 	rounded_quad.size = layout.player_size;
diff --git a/src/spaced/spaced/game/powerups/pu_base.cpp b/src/spaced/spaced/game/powerups/pu_base.cpp
index 2cc908b..f939805 100644
--- a/src/spaced/spaced/game/powerups/pu_base.cpp
+++ b/src/spaced/spaced/game/powerups/pu_base.cpp
@@ -7,7 +7,7 @@ using bave::RoundedQuad;
 using bave::Seconds;
 using bave::Shader;
 
-PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<GameLayout>()), m_name(name) {
+PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<Layout>()), m_name(name) {
 	auto quad = RoundedQuad{};
 	quad.size = glm::vec2{40.0f};
 	quad.corner_radius = 12.5f;
diff --git a/src/spaced/spaced/game/powerups/pu_base.hpp b/src/spaced/spaced/game/powerups/pu_base.hpp
index 6a6ebd4..37bff9e 100644
--- a/src/spaced/spaced/game/powerups/pu_base.hpp
+++ b/src/spaced/spaced/game/powerups/pu_base.hpp
@@ -27,7 +27,7 @@ class PUBase : public IPowerup {
 	virtual void do_activate(Player& player) = 0;
 
 	bave::NotNull<Services const*> m_services;
-	bave::NotNull<GameLayout const*> m_layout;
+	bave::NotNull<Layout const*> m_layout;
 	std::string_view m_name{};
 	bool m_emitter_ticked{};
 	bool m_destroyed{};
diff --git a/src/spaced/spaced/game/weapon.cpp b/src/spaced/spaced/game/weapon.cpp
index fe67c4f..f8bb3f2 100644
--- a/src/spaced/spaced/game/weapon.cpp
+++ b/src/spaced/spaced/game/weapon.cpp
@@ -5,7 +5,7 @@
 namespace spaced {
 using bave::im_text;
 
-Weapon::Weapon(Services const& services, std::string name) : m_log{std::move(name)}, m_layout(&services.get<ILayout>()), m_audio(&services.get<IAudio>()) {}
+Weapon::Weapon(Services const& services, std::string name) : m_log{std::move(name)}, m_display(&services.get<IDisplay>()), m_audio(&services.get<IAudio>()) {}
 
 auto Weapon::fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Round> {
 	auto ret = do_fire(muzzle_position);
diff --git a/src/spaced/spaced/game/weapon.hpp b/src/spaced/spaced/game/weapon.hpp
index a105ca6..9c14d4e 100644
--- a/src/spaced/spaced/game/weapon.hpp
+++ b/src/spaced/spaced/game/weapon.hpp
@@ -2,7 +2,7 @@
 #include <bave/logger.hpp>
 #include <bave/platform.hpp>
 #include <spaced/game/weapon_round.hpp>
-#include <spaced/services/layout.hpp>
+#include <spaced/services/display.hpp>
 #include <spaced/services/services.hpp>
 
 namespace spaced {
@@ -28,7 +28,7 @@ class Weapon : public bave::Polymorphic {
 	int rounds{-1};
 
   protected:
-	[[nodiscard]] auto get_layout() const -> ILayout const& { return *m_layout; }
+	[[nodiscard]] auto get_display() const -> IDisplay const& { return *m_display; }
 
 	virtual auto do_fire(glm::vec2 muzzle_position) -> std::unique_ptr<Round> = 0;
 	virtual void do_inspect();
@@ -37,7 +37,7 @@ class Weapon : public bave::Polymorphic {
 	std::vector<std::string> m_fire_sfx{};
 
   private:
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<IDisplay const*> m_display;
 	bave::NotNull<IAudio*> m_audio;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/game/weapons/gun_beam.cpp b/src/spaced/spaced/game/weapons/gun_beam.cpp
index 43653a5..040f5bc 100644
--- a/src/spaced/spaced/game/weapons/gun_beam.cpp
+++ b/src/spaced/spaced/game/weapons/gun_beam.cpp
@@ -18,8 +18,8 @@ class LaserCharge : public IWeaponRound {
   public:
 	using Config = GunBeam::Config;
 
-	explicit LaserCharge(NotNull<ILayout const*> layout, Config config, glm::vec2 const muzzle_position)
-		: m_layout(layout), m_config(config), m_fire_remain(config.fire_duration) {
+	explicit LaserCharge(NotNull<IDisplay const*> display, Config config, glm::vec2 const muzzle_position)
+		: m_display(display), m_config(config), m_fire_remain(config.fire_duration) {
 		m_ray.transform.position.y = muzzle_position.y;
 	}
 
@@ -30,7 +30,7 @@ class LaserCharge : public IWeaponRound {
 
 		sort_entries(state.targets, state.muzzle_position);
 
-		auto const world_space = m_layout->get_world_space();
+		auto const world_space = m_display->get_world_space();
 		auto const left_x = state.muzzle_position.x;
 		auto right_x = 0.5f * world_space.x;
 		for (auto const& entry : m_entries) {
@@ -88,7 +88,7 @@ class LaserCharge : public IWeaponRound {
 		float distance{};
 	};
 
-	NotNull<ILayout const*> m_layout;
+	NotNull<IDisplay const*> m_display;
 	Config m_config;
 
 	Sprite m_ray{};
@@ -119,7 +119,7 @@ auto GunBeam::do_fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Round>
 	if (rounds > 0) { --rounds; }
 	m_fire_remain = config.fire_duration;
 	m_reload_remain = 0s;
-	return std::make_unique<LaserCharge>(&get_layout(), config, muzzle_position);
+	return std::make_unique<LaserCharge>(&get_display(), config, muzzle_position);
 }
 
 void GunBeam::do_inspect() {
diff --git a/src/spaced/spaced/game/weapons/gun_kinetic.cpp b/src/spaced/spaced/game/weapons/gun_kinetic.cpp
index 8f33586..5587bbf 100644
--- a/src/spaced/spaced/game/weapons/gun_kinetic.cpp
+++ b/src/spaced/spaced/game/weapons/gun_kinetic.cpp
@@ -20,7 +20,7 @@ auto GunKinetic::do_fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Rou
 
 	if (rounds > 0) { --rounds; }
 	m_reload_remain = reload_delay;
-	return std::make_unique<Projectile>(&get_layout(), projectile_config, muzzle_position);
+	return std::make_unique<Projectile>(&get_display(), projectile_config, muzzle_position);
 }
 
 void GunKinetic::do_inspect() {
diff --git a/src/spaced/spaced/game/weapons/projectile.cpp b/src/spaced/spaced/game/weapons/projectile.cpp
index 6652eca..6ba8f9e 100644
--- a/src/spaced/spaced/game/weapons/projectile.cpp
+++ b/src/spaced/spaced/game/weapons/projectile.cpp
@@ -15,7 +15,7 @@ namespace {
 }
 } // namespace
 
-Projectile::Projectile(NotNull<ILayout const*> layout, Config config, glm::vec2 const muzzle_position) : m_layout(layout), m_config(std::move(config)) {
+Projectile::Projectile(NotNull<IDisplay const*> display, Config config, glm::vec2 const muzzle_position) : m_display(display), m_config(std::move(config)) {
 	auto rounded_quad = RoundedQuad{};
 	rounded_quad.size = m_config.size;
 	rounded_quad.corner_radius = m_config.corner_radius;
@@ -42,7 +42,7 @@ void Projectile::tick(State const& state, Seconds const dt) {
 		}
 	}
 
-	if (m_shape.transform.position.x > 0.5f * (m_layout->get_world_space().x + m_config.size.x)) { m_destroyed = true; }
+	if (m_shape.transform.position.x > 0.5f * (m_display->get_world_space().x + m_config.size.x)) { m_destroyed = true; }
 }
 
 void Projectile::draw(Shader& shader) const { m_shape.draw(shader); }
diff --git a/src/spaced/spaced/game/weapons/projectile.hpp b/src/spaced/spaced/game/weapons/projectile.hpp
index a3f966b..7b78c5e 100644
--- a/src/spaced/spaced/game/weapons/projectile.hpp
+++ b/src/spaced/spaced/game/weapons/projectile.hpp
@@ -2,7 +2,7 @@
 #include <bave/graphics/shape.hpp>
 #include <spaced/game/instigator.hpp>
 #include <spaced/game/weapon_round.hpp>
-#include <spaced/services/layout.hpp>
+#include <spaced/services/display.hpp>
 
 namespace spaced {
 class Projectile : public IWeaponRound {
@@ -17,14 +17,14 @@ class Projectile : public IWeaponRound {
 		Instigator instigator{Instigator::ePlayer};
 	};
 
-	explicit Projectile(bave::NotNull<ILayout const*> layout, Config config, glm::vec2 muzzle_position);
+	explicit Projectile(bave::NotNull<IDisplay const*> display, Config config, glm::vec2 muzzle_position);
 
 	void tick(State const& state, bave::Seconds dt) override;
 	[[nodiscard]] auto is_destroyed() const -> bool override { return m_destroyed; }
 	void draw(bave::Shader& shader) const override;
 
   protected:
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<IDisplay const*> m_display;
 	Config m_config{};
 
 	bave::RoundedQuadShape m_shape{};
diff --git a/src/spaced/spaced/game/world.cpp b/src/spaced/spaced/game/world.cpp
index d86721e..409ee6a 100644
--- a/src/spaced/spaced/game/world.cpp
+++ b/src/spaced/spaced/game/world.cpp
@@ -21,7 +21,7 @@ namespace {
 [[nodiscard]] auto make_player_controller(Services const& services) {
 	auto ret = std::make_unique<PlayerController>(services);
 	if constexpr (bave::platform_v == bave::Platform::eAndroid) { ret->set_type(PlayerController::Type::eTouch); }
-	auto const& layout = services.get<GameLayout>();
+	auto const& layout = services.get<Layout>();
 	auto const half_size = 0.5f * layout.player_size;
 	auto const play_area = layout.play_area;
 	ret->max_y = play_area.lt.y - half_size.y;
@@ -30,7 +30,7 @@ namespace {
 }
 
 [[nodiscard]] auto make_auto_controller(ITargetProvider const& target_provider, Services const& services) {
-	return std::make_unique<AutoController>(&target_provider, services.get<GameLayout>().player_x);
+	return std::make_unique<AutoController>(&target_provider, services.get<Layout>().player_x);
 }
 } // namespace
 
diff --git a/src/spaced/spaced/game_driver.cpp b/src/spaced/spaced/game_driver.cpp
index fa6d898..bffd520 100644
--- a/src/spaced/spaced/game_driver.cpp
+++ b/src/spaced/spaced/game_driver.cpp
@@ -63,14 +63,14 @@ struct GameDriver::SceneSwitcher : ISceneSwitcher {
 	[[nodiscard]] auto get_services() const -> Services const& final { return services; }
 };
 
-struct GameDriver::Layout : ILayout {
+struct GameDriver::Display : IDisplay {
 	NotNull<RenderDevice const*> render_device;
 	RenderView main_view{};
 	glm::vec2 framebuffer_size{};
 	Rect<> play_area{};
 	Rect<> hud_area{};
 
-	explicit Layout(NotNull<RenderDevice const*> render_device) : render_device(render_device) {}
+	explicit Display(NotNull<RenderDevice const*> render_device) : render_device(render_device) {}
 
 	[[nodiscard]] auto get_main_view() const -> RenderView const& final { return main_view; }
 	[[nodiscard]] auto get_framebuffer_size() const -> glm::vec2 final { return framebuffer_size; }
@@ -85,11 +85,11 @@ struct GameDriver::Layout : ILayout {
 };
 
 GameDriver::GameDriver(App& app) : Driver(app), m_scene(std::make_unique<EmptyScene>(app, m_services)) {
-	auto layout = std::make_unique<Layout>(&app.get_render_device());
-	m_layout = layout.get();
-	m_layout->framebuffer_size = app.get_framebuffer_size();
-	m_layout->main_view = app.get_render_device().get_default_view();
-	m_services.bind<ILayout>(std::move(layout));
+	auto display = std::make_unique<Display>(&app.get_render_device());
+	m_display = display.get();
+	m_display->framebuffer_size = app.get_framebuffer_size();
+	m_display->main_view = app.get_render_device().get_default_view();
+	m_services.bind<IDisplay>(std::move(display));
 
 	auto switcher = std::make_unique<SceneSwitcher>(app, m_services);
 	m_switcher = switcher.get();
@@ -121,7 +121,7 @@ void GameDriver::on_scroll(MouseScroll const& mouse_scroll) { m_scene->on_scroll
 void GameDriver::on_drop(std::span<std::string const> paths) { m_scene->on_drop(paths); }
 
 void GameDriver::tick() {
-	m_layout->framebuffer_size = get_app().get_framebuffer_size();
+	m_display->framebuffer_size = get_app().get_framebuffer_size();
 
 	if (m_switcher->next_scene) {
 		switch_track(m_scene->get_music_uri(), m_switcher->next_scene->get_music_uri());
diff --git a/src/spaced/spaced/game_driver.hpp b/src/spaced/spaced/game_driver.hpp
index cfc0d16..924816e 100644
--- a/src/spaced/spaced/game_driver.hpp
+++ b/src/spaced/spaced/game_driver.hpp
@@ -32,10 +32,10 @@ class GameDriver : public bave::Driver {
 
   private:
 	struct SceneSwitcher;
-	struct Layout;
+	struct Display;
 
 	bave::Ptr<SceneSwitcher> m_switcher{};
-	bave::Ptr<Layout> m_layout{};
+	bave::Ptr<Display> m_display{};
 	bave::Ptr<IAudio> m_audio{};
 
 	std::unique_ptr<Scene> m_scene{};
diff --git a/src/spaced/spaced/services/display.hpp b/src/spaced/spaced/services/display.hpp
new file mode 100644
index 0000000..ce444f1
--- /dev/null
+++ b/src/spaced/spaced/services/display.hpp
@@ -0,0 +1,14 @@
+#pragma once
+#include <bave/graphics/render_view.hpp>
+#include <spaced/services/service.hpp>
+
+namespace spaced {
+class IDisplay : public IService {
+  public:
+	[[nodiscard]] virtual auto get_main_view() const -> bave::RenderView const& = 0;
+	[[nodiscard]] virtual auto get_framebuffer_size() const -> glm::vec2 = 0;
+	[[nodiscard]] virtual auto get_world_space() const -> glm::vec2 = 0;
+	[[nodiscard]] virtual auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 = 0;
+	[[nodiscard]] virtual auto unproject(glm::vec2 pointer) const -> glm::vec2 = 0;
+};
+} // namespace spaced
diff --git a/src/spaced/spaced/services/layout.hpp b/src/spaced/spaced/services/layout.hpp
index 50ab99d..c3dfcfc 100644
--- a/src/spaced/spaced/services/layout.hpp
+++ b/src/spaced/spaced/services/layout.hpp
@@ -1,18 +1,9 @@
 #pragma once
-#include <bave/graphics/render_view.hpp>
+#include <bave/graphics/rect.hpp>
 #include <spaced/services/service.hpp>
 
 namespace spaced {
-class ILayout : public IService {
-  public:
-	[[nodiscard]] virtual auto get_main_view() const -> bave::RenderView const& = 0;
-	[[nodiscard]] virtual auto get_framebuffer_size() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_world_space() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto unproject(glm::vec2 pointer) const -> glm::vec2 = 0;
-};
-
-struct GameLayout : IService {
+struct Layout : IService {
 	glm::vec2 world_space{};
 	bave::Rect<> play_area{};
 	bave::Rect<> hud_area{};
diff --git a/src/spaced/spaced/spaced.cpp b/src/spaced/spaced/spaced.cpp
index 16e258b..ff64f98 100644
--- a/src/spaced/spaced/spaced.cpp
+++ b/src/spaced/spaced/spaced.cpp
@@ -97,7 +97,7 @@ void Spaced::set_bindings([[maybe_unused]] Serializer& serializer) {}
 Spaced::Spaced(App& app) : GameDriver(app) {
 	m_log.info("using MSAA: {}x", static_cast<int>(app.get_render_device().get_sample_count()));
 	load_resources();
-	set_game_layout();
+	set_layout();
 	create_services();
 	set_prefs();
 	set_scene();
@@ -137,18 +137,18 @@ void Spaced::create_services() {
 	m_services.bind<Stats>(std::move(stats));
 }
 
-void Spaced::set_game_layout() {
-	auto game_layout = std::make_unique<GameLayout>();
-	auto const& layout = m_services.get<ILayout>();
-	game_layout->world_space = layout.get_world_space();
-	auto const viewport = layout.get_main_view().viewport;
+void Spaced::set_layout() {
+	auto game_layout = std::make_unique<Layout>();
+	auto const& display = m_services.get<IDisplay>();
+	game_layout->world_space = display.get_world_space();
+	auto const viewport = display.get_main_view().viewport;
 	auto const hud_size = glm::vec2{viewport.x, 100.0f};
 	auto const hud_origin = glm::vec2{0.0f, 0.5f * (viewport.y - hud_size.y)};
 	game_layout->hud_area = Rect<>::from_size(hud_size, hud_origin);
 	auto const play_size = glm::vec2{hud_size.x, viewport.y - hud_size.y};
 	auto const play_origin = glm::vec2{0.0f, -0.5f * (viewport.y - play_size.y)};
 	game_layout->play_area = Rect<>::from_size(play_size, play_origin);
-	m_services.bind<GameLayout>(std::move(game_layout));
+	m_services.bind<Layout>(std::move(game_layout));
 }
 
 void Spaced::set_prefs() {
diff --git a/src/spaced/spaced/spaced.hpp b/src/spaced/spaced/spaced.hpp
index c1e7629..4d13df5 100644
--- a/src/spaced/spaced/spaced.hpp
+++ b/src/spaced/spaced/spaced.hpp
@@ -17,7 +17,7 @@ class Spaced : public GameDriver {
 
 	void load_resources();
 	void create_services();
-	void set_game_layout();
+	void set_layout();
 	void set_prefs();
 	void set_scene();
 
diff --git a/src/spaced/spaced/ui/button.cpp b/src/spaced/spaced/ui/button.cpp
index 74da866..75f4356 100644
--- a/src/spaced/spaced/ui/button.cpp
+++ b/src/spaced/spaced/ui/button.cpp
@@ -15,7 +15,7 @@ using bave::Seconds;
 using bave::Shader;
 using bave::TextHeight;
 
-Button::Button(Services const& services) : m_layout(&services.get<ILayout>()), m_styles(&services.get<Styles>()) {
+Button::Button(Services const& services) : m_display(&services.get<IDisplay>()), m_styles(&services.get<Styles>()) {
 	m_text.set_font(services.get<Resources>().main_font);
 	set_text_height(TextHeight::eDefault);
 	set_style(m_styles->buttons["default"]);
@@ -66,7 +66,7 @@ void Button::set_style(Style const& style) {
 
 void Button::on_move(PointerMove const& pointer_move) {
 	if (pointer_move.pointer.id != PointerId::ePrimary) { return; }
-	auto const position = m_layout->unproject(pointer_move.pointer.position);
+	auto const position = m_display->unproject(pointer_move.pointer.position);
 	if (m_hitbox.contains(position)) {
 		m_state = State::eHover;
 	} else {
@@ -77,7 +77,7 @@ void Button::on_move(PointerMove const& pointer_move) {
 void Button::on_tap(PointerTap const& pointer_tap) {
 	if (pointer_tap.pointer.id != PointerId::ePrimary || pointer_tap.button != MouseButton::eLeft) { return; }
 
-	auto const position = m_layout->unproject(pointer_tap.pointer.position);
+	auto const position = m_display->unproject(pointer_tap.pointer.position);
 	if (!m_hitbox.contains(position)) {
 		m_state = State::eIdle;
 		return;
diff --git a/src/spaced/spaced/ui/button.hpp b/src/spaced/spaced/ui/button.hpp
index 1eb771a..62124fc 100644
--- a/src/spaced/spaced/ui/button.hpp
+++ b/src/spaced/spaced/ui/button.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <bave/graphics/text.hpp>
-#include <spaced/services/layout.hpp>
+#include <spaced/services/display.hpp>
 #include <spaced/services/services.hpp>
 #include <spaced/services/styles.hpp>
 #include <spaced/ui/outline_quad.hpp>
@@ -47,7 +47,7 @@ class Button : public IWidget {
 	void resize_background();
 	void reposition_text();
 
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<IDisplay const*> m_display;
 	bave::NotNull<Styles const*> m_styles;
 
 	OutlineQuad m_background{};
diff --git a/src/spaced/spaced/ui/loading_screen.cpp b/src/spaced/spaced/ui/loading_screen.cpp
index 4bda201..5e88a36 100644
--- a/src/spaced/spaced/ui/loading_screen.cpp
+++ b/src/spaced/spaced/ui/loading_screen.cpp
@@ -7,8 +7,8 @@ using bave::Seconds;
 using bave::Shader;
 
 LoadingScreen::LoadingScreen(Services const& services)
-	: m_layout(&services.get<ILayout>()), m_style(services.get<Styles>().loading_screen), m_progress_bar(services) {
-	auto const world_space = m_layout->get_world_space();
+	: m_display(&services.get<IDisplay>()), m_style(services.get<Styles>().loading_screen), m_progress_bar(services) {
+	auto const world_space = m_display->get_world_space();
 
 	m_background.set_size(1.1f * world_space);
 	m_background.tint = m_style.background_tint;
@@ -32,7 +32,7 @@ void LoadingScreen::update(Seconds const dt, float const progress) {
 }
 
 void LoadingScreen::draw(Shader& shader) const {
-	shader.set_render_view(m_layout->get_main_view());
+	shader.set_render_view(m_display->get_main_view());
 	m_background.draw(shader);
 	m_spinner.draw(shader);
 	m_progress_bar.draw(shader);
diff --git a/src/spaced/spaced/ui/loading_screen.hpp b/src/spaced/spaced/ui/loading_screen.hpp
index 9a1267e..180f217 100644
--- a/src/spaced/spaced/ui/loading_screen.hpp
+++ b/src/spaced/spaced/ui/loading_screen.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <bave/core/time.hpp>
 #include <bave/graphics/sprite.hpp>
-#include <spaced/services/layout.hpp>
+#include <spaced/services/display.hpp>
 #include <spaced/services/services.hpp>
 #include <spaced/ui/progress_bar.hpp>
 
@@ -14,7 +14,7 @@ class LoadingScreen {
 	void draw(bave::Shader& shader) const;
 
   private:
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<IDisplay const*> m_display;
 	LoadingScreenStyle m_style{};
 	bave::Sprite m_background{};
 	bave::Sprite m_spinner{};
diff --git a/src/spaced/spaced/ui/view.cpp b/src/spaced/spaced/ui/view.cpp
index 02ac83c..850db92 100644
--- a/src/spaced/spaced/ui/view.cpp
+++ b/src/spaced/spaced/ui/view.cpp
@@ -6,7 +6,7 @@ using bave::PointerTap;
 using bave::Seconds;
 using bave::Shader;
 
-View::View(Services const& services) : m_layout(&services.get<ILayout>()) {}
+View::View(Services const& services) : m_display(&services.get<IDisplay>()) {}
 
 void View::push(std::unique_ptr<IElement> element) {
 	if (!element) { return; }
@@ -28,7 +28,7 @@ void View::tick(Seconds const dt) {
 
 void View::render(Shader& shader) const {
 	if (m_elements.empty()) { return; }
-	shader.set_render_view(m_layout->get_main_view());
+	shader.set_render_view(m_display->get_main_view());
 	for (auto const& element : m_elements) { element->draw(shader); }
 }
 } // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/view.hpp b/src/spaced/spaced/ui/view.hpp
index c91ac1e..354b929 100644
--- a/src/spaced/spaced/ui/view.hpp
+++ b/src/spaced/spaced/ui/view.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <spaced/services/layout.hpp>
+#include <spaced/services/display.hpp>
 #include <spaced/services/services.hpp>
 #include <spaced/ui/widget.hpp>
 #include <memory>
@@ -26,7 +26,7 @@ class View : public bave::Polymorphic {
   protected:
 	std::vector<std::unique_ptr<ui::IElement>> m_elements{};
 	std::vector<bave::Ptr<ui::IWidget>> m_widgets{};
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<IDisplay const*> m_display;
 	bool m_destroyed{};
 };
 } // namespace spaced::ui

From 2fc81adb6012c88572d9d32764a9401ba7c959ff Mon Sep 17 00:00:00 2001
From: Karn Kaul <karnkaul@gmail.com>
Date: Fri, 14 Jun 2024 00:10:44 +0530
Subject: [PATCH 5/7] Integrate bgf.

---
 CMakeLists.txt                                |  10 +-
 src/spaced/CMakeLists.txt                     |   2 +-
 src/spaced/spaced/assets/asset_list.cpp       |   5 +-
 src/spaced/spaced/assets/asset_list.hpp       |  20 +-
 src/spaced/spaced/assets/asset_loader.cpp     |   1 +
 src/spaced/spaced/assets/asset_loader.hpp     |   4 +-
 src/spaced/spaced/async_exec.cpp              |  60 ------
 src/spaced/spaced/async_exec.hpp              |  45 ----
 src/spaced/spaced/game/arsenal.cpp            |   1 +
 src/spaced/spaced/game/arsenal.hpp            |   2 +-
 .../game/controllers/auto_controller.hpp      |   2 +-
 .../game/controllers/player_controller.cpp    |   2 +
 .../game/controllers/player_controller.hpp    |   8 +-
 src/spaced/spaced/game/enemies/creep.hpp      |   2 +-
 .../spaced/game/enemies/creep_factory.cpp     |   5 +-
 src/spaced/spaced/game/enemy.cpp              |   8 +-
 src/spaced/spaced/game/enemy.hpp              |   8 +-
 src/spaced/spaced/game/enemy_factory.cpp      |   4 +-
 src/spaced/spaced/game/enemy_factory.hpp      |  11 +-
 src/spaced/spaced/game/hud.cpp                |   6 +-
 src/spaced/spaced/game/hud.hpp                |  22 +-
 src/spaced/spaced/game/player.cpp             |   7 +-
 src/spaced/spaced/game/player.hpp             |   4 +-
 src/spaced/spaced/game/powerups/pu_base.cpp   |   4 +-
 src/spaced/spaced/game/powerups/pu_base.hpp   |   6 +-
 src/spaced/spaced/game/powerups/pu_beam.cpp   |   5 +-
 src/spaced/spaced/game/powerups/pu_beam.hpp   |   2 +-
 src/spaced/spaced/game/weapon.cpp             |   5 +-
 src/spaced/spaced/game/weapon.hpp             |  16 +-
 src/spaced/spaced/game/weapons/gun_beam.cpp   |   5 +-
 src/spaced/spaced/game/weapons/gun_beam.hpp   |   2 +-
 .../spaced/game/weapons/gun_kinetic.cpp       |   5 +-
 .../spaced/game/weapons/gun_kinetic.hpp       |   6 +-
 src/spaced/spaced/game/weapons/projectile.cpp |   1 +
 src/spaced/spaced/game/weapons/projectile.hpp |   6 +-
 src/spaced/spaced/game/world.cpp              |   5 +-
 src/spaced/spaced/game/world.hpp              |  13 +-
 src/spaced/spaced/game_driver.cpp             | 146 -------------
 src/spaced/spaced/game_driver.hpp             |  43 ----
 src/spaced/spaced/prefs.cpp                   |  15 +-
 src/spaced/spaced/prefs.hpp                   |  11 +-
 src/spaced/spaced/resource_map.hpp            |  54 -----
 src/spaced/spaced/scene.cpp                   | 129 -----------
 src/spaced/spaced/scene.hpp                   |  75 -------
 src/spaced/spaced/scenes/game.cpp             |  12 +-
 src/spaced/spaced/scenes/game.hpp             |   6 +-
 src/spaced/spaced/scenes/load_assets.cpp      |   7 +-
 src/spaced/spaced/scenes/load_assets.hpp      |   8 +-
 src/spaced/spaced/scenes/menu.cpp             |  13 +-
 src/spaced/spaced/scenes/menu.hpp             |   6 +-
 src/spaced/spaced/services/audio.hpp          |  28 ---
 src/spaced/spaced/services/display.hpp        |  14 --
 .../spaced/services/gamepad_provider.hpp      |   4 +-
 src/spaced/spaced/services/layout.hpp         |   4 +-
 src/spaced/spaced/services/resources.hpp      |  13 --
 src/spaced/spaced/services/scene_switcher.hpp |  20 --
 src/spaced/spaced/services/serializer.hpp     |   4 +-
 src/spaced/spaced/services/service.hpp        |   7 -
 src/spaced/spaced/services/services.hpp       |  89 --------
 src/spaced/spaced/services/stats.hpp          |   4 +-
 src/spaced/spaced/services/styles.cpp         | 124 -----------
 src/spaced/spaced/services/styles.hpp         |  23 --
 src/spaced/spaced/spaced.cpp                  |  40 +---
 src/spaced/spaced/spaced.hpp                  |  12 +-
 src/spaced/spaced/string_map.hpp              |  26 ---
 src/spaced/spaced/ui/button.cpp               | 113 ----------
 src/spaced/spaced/ui/button.hpp               |  60 ------
 src/spaced/spaced/ui/dialog.cpp               |  48 -----
 src/spaced/spaced/ui/dialog.hpp               |  35 ---
 src/spaced/spaced/ui/element.hpp              |  11 -
 src/spaced/spaced/ui/list_box.hpp             | 201 ------------------
 src/spaced/spaced/ui/loading_screen.cpp       |  40 ----
 src/spaced/spaced/ui/loading_screen.hpp       |  23 --
 src/spaced/spaced/ui/outline_quad.cpp         |  52 -----
 src/spaced/spaced/ui/outline_quad.hpp         |  38 ----
 src/spaced/spaced/ui/progress_bar.cpp         |  43 ----
 src/spaced/spaced/ui/progress_bar.hpp         |  39 ----
 src/spaced/spaced/ui/slider.cpp               |  97 ---------
 src/spaced/spaced/ui/slider.hpp               |  46 ----
 src/spaced/spaced/ui/style.hpp                |  55 -----
 src/spaced/spaced/ui/text.cpp                 |   9 -
 src/spaced/spaced/ui/text.hpp                 |  18 --
 src/spaced/spaced/ui/view.cpp                 |  34 ---
 src/spaced/spaced/ui/view.hpp                 |  32 ---
 src/spaced/spaced/ui/widget.hpp               |  14 --
 src/spaced/spaced/util.cpp                    | 102 ---------
 src/spaced/spaced/util.hpp                    |  20 --
 87 files changed, 199 insertions(+), 2188 deletions(-)
 delete mode 100644 src/spaced/spaced/async_exec.cpp
 delete mode 100644 src/spaced/spaced/async_exec.hpp
 delete mode 100644 src/spaced/spaced/game_driver.cpp
 delete mode 100644 src/spaced/spaced/game_driver.hpp
 delete mode 100644 src/spaced/spaced/resource_map.hpp
 delete mode 100644 src/spaced/spaced/scene.cpp
 delete mode 100644 src/spaced/spaced/scene.hpp
 delete mode 100644 src/spaced/spaced/services/audio.hpp
 delete mode 100644 src/spaced/spaced/services/display.hpp
 delete mode 100644 src/spaced/spaced/services/resources.hpp
 delete mode 100644 src/spaced/spaced/services/scene_switcher.hpp
 delete mode 100644 src/spaced/spaced/services/service.hpp
 delete mode 100644 src/spaced/spaced/services/services.hpp
 delete mode 100644 src/spaced/spaced/services/styles.cpp
 delete mode 100644 src/spaced/spaced/services/styles.hpp
 delete mode 100644 src/spaced/spaced/string_map.hpp
 delete mode 100644 src/spaced/spaced/ui/button.cpp
 delete mode 100644 src/spaced/spaced/ui/button.hpp
 delete mode 100644 src/spaced/spaced/ui/dialog.cpp
 delete mode 100644 src/spaced/spaced/ui/dialog.hpp
 delete mode 100644 src/spaced/spaced/ui/element.hpp
 delete mode 100644 src/spaced/spaced/ui/list_box.hpp
 delete mode 100644 src/spaced/spaced/ui/loading_screen.cpp
 delete mode 100644 src/spaced/spaced/ui/loading_screen.hpp
 delete mode 100644 src/spaced/spaced/ui/outline_quad.cpp
 delete mode 100644 src/spaced/spaced/ui/outline_quad.hpp
 delete mode 100644 src/spaced/spaced/ui/progress_bar.cpp
 delete mode 100644 src/spaced/spaced/ui/progress_bar.hpp
 delete mode 100644 src/spaced/spaced/ui/slider.cpp
 delete mode 100644 src/spaced/spaced/ui/slider.hpp
 delete mode 100644 src/spaced/spaced/ui/style.hpp
 delete mode 100644 src/spaced/spaced/ui/text.cpp
 delete mode 100644 src/spaced/spaced/ui/text.hpp
 delete mode 100644 src/spaced/spaced/ui/view.cpp
 delete mode 100644 src/spaced/spaced/ui/view.hpp
 delete mode 100644 src/spaced/spaced/ui/widget.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7e215e..88c1028 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,12 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 include(FetchContent)
 
 FetchContent_Declare(
-  bave
-  GIT_REPOSITORY https://github.com/karnkaul/bave
-  GIT_TAG v0.5.5
-  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/bave"
+  bgf
+  GIT_REPOSITORY https://github.com/karnkaul/bgf
+  GIT_TAG v0.1.0
+  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/bgf"
 )
 
-FetchContent_MakeAvailable(bave)
+FetchContent_MakeAvailable(bgf)
 
 add_subdirectory(src)
diff --git a/src/spaced/CMakeLists.txt b/src/spaced/CMakeLists.txt
index fbdde26..c38e16e 100644
--- a/src/spaced/CMakeLists.txt
+++ b/src/spaced/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(${PROJECT_NAME})
 add_library(spaced::lib ALIAS ${PROJECT_NAME})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
-  bave::bave
+  bave::bgf
   bave::bave-compile-options
 )
 
diff --git a/src/spaced/spaced/assets/asset_list.cpp b/src/spaced/spaced/assets/asset_list.cpp
index 4d66598..c7edeb9 100644
--- a/src/spaced/spaced/assets/asset_list.cpp
+++ b/src/spaced/spaced/assets/asset_list.cpp
@@ -1,9 +1,12 @@
+#include <bave/services/resources.hpp>
 #include <spaced/assets/asset_list.hpp>
 #include <spaced/assets/asset_loader.hpp>
-#include <spaced/services/resources.hpp>
 
 namespace spaced {
+using bave::AsyncExec;
 using bave::Loader;
+using bave::Resources;
+using bave::Services;
 
 AssetList::AssetList(Loader loader, Services const& services) : m_loader(std::move(loader)), m_resources(&services.get<Resources>()) {}
 
diff --git a/src/spaced/spaced/assets/asset_list.hpp b/src/spaced/spaced/assets/asset_list.hpp
index 8545a2d..a2debc1 100644
--- a/src/spaced/spaced/assets/asset_list.hpp
+++ b/src/spaced/spaced/assets/asset_list.hpp
@@ -1,17 +1,21 @@
 #pragma once
+#include <bave/async_exec.hpp>
 #include <bave/loader.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/assets/asset_manifest.hpp>
-#include <spaced/async_exec.hpp>
-#include <spaced/services/services.hpp>
 #include <set>
 
-namespace spaced {
+namespace bave {
 struct Resources;
+}
+
+namespace spaced {
 class AssetLoader;
 
 class AssetList {
   public:
-	explicit AssetList(bave::Loader loader, Services const& services);
+	explicit AssetList(bave::Loader loader, bave::Services const& services);
 
 	auto add_texture(std::string uri, bool mip_map = false) -> AssetList&;
 	auto add_font(std::string uri) -> AssetList&;
@@ -20,7 +24,7 @@ class AssetList {
 
 	void add_manifest(AssetManifest manifest);
 
-	[[nodiscard]] auto build_task_stages() const -> std::vector<AsyncExec::Stage>;
+	[[nodiscard]] auto build_task_stages() const -> std::vector<bave::AsyncExec::Stage>;
 
   private:
 	struct Tex {
@@ -32,11 +36,11 @@ class AssetList {
 		auto operator<(Tex const& rhs) const -> bool { return uri < rhs.uri; }
 	};
 
-	auto build_stage_0(AssetLoader& asset_loader) const -> AsyncExec::Stage;
-	auto build_stage_1(AssetLoader& asset_loader) const -> AsyncExec::Stage;
+	auto build_stage_0(AssetLoader& asset_loader) const -> bave::AsyncExec::Stage;
+	auto build_stage_1(AssetLoader& asset_loader) const -> bave::AsyncExec::Stage;
 
 	bave::Loader m_loader;
-	bave::NotNull<Resources*> m_resources;
+	bave::NotNull<bave::Resources*> m_resources;
 
 	std::set<Tex> m_textures{};
 	std::set<std::string> m_fonts{};
diff --git a/src/spaced/spaced/assets/asset_loader.cpp b/src/spaced/spaced/assets/asset_loader.cpp
index f88b847..c995b61 100644
--- a/src/spaced/spaced/assets/asset_loader.cpp
+++ b/src/spaced/spaced/assets/asset_loader.cpp
@@ -9,6 +9,7 @@ using bave::Loader;
 using bave::Logger;
 using bave::NotNull;
 using bave::ParticleEmitter;
+using bave::Resources;
 using bave::Texture;
 
 struct AssetLoader::Impl {
diff --git a/src/spaced/spaced/assets/asset_loader.hpp b/src/spaced/spaced/assets/asset_loader.hpp
index 36d1a68..22c9bf4 100644
--- a/src/spaced/spaced/assets/asset_loader.hpp
+++ b/src/spaced/spaced/assets/asset_loader.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/loader.hpp>
-#include <spaced/services/resources.hpp>
+#include <bave/services/resources.hpp>
 #include <functional>
 #include <memory>
 
@@ -10,7 +10,7 @@ class AssetLoader {
   public:
 	using LoadTask = std::function<void()>;
 
-	explicit AssetLoader(bave::Loader loader, bave::NotNull<Resources*> resources);
+	explicit AssetLoader(bave::Loader loader, bave::NotNull<bave::Resources*> resources);
 
 	[[nodiscard]] auto make_load_font(std::string uri, bool reload = false) -> LoadTask;
 	[[nodiscard]] auto make_load_texture(std::string uri, bool mip_map = false, bool reload = false) -> LoadTask;
diff --git a/src/spaced/spaced/async_exec.cpp b/src/spaced/spaced/async_exec.cpp
deleted file mode 100644
index 00e50a5..0000000
--- a/src/spaced/spaced/async_exec.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <spaced/async_exec.hpp>
-#include <cassert>
-#include <iterator>
-#include <numeric>
-
-namespace spaced {
-using namespace std::chrono_literals;
-
-AsyncExec::AsyncExec(std::vector<Task> tasks) {
-	if (tasks.empty()) { return; }
-
-	m_total = static_cast<int>(tasks.size());
-	enqueue(tasks);
-}
-
-AsyncExec::AsyncExec(std::vector<Stage> stages) {
-	if (stages.empty()) { return; }
-	std::move(stages.begin(), stages.end(), std::back_inserter(m_stages));
-	m_total = std::accumulate(m_stages.begin(), m_stages.end(), 0, [](int count, auto const& tasks) { return static_cast<int>(tasks.size()) + count; });
-	start_next_stage();
-}
-
-auto AsyncExec::update() -> Status {
-	if (m_remain.empty()) {
-		if (m_stages.empty()) { return Status{.remain = 0, .total = m_total}; }
-		start_next_stage();
-	}
-	std::erase_if(m_remain, [](std::future<void> const& future) { return !future.valid() || future.wait_for(0s) == std::future_status::ready; });
-	return Status{.remain = m_total - m_completed, .total = m_total};
-}
-
-void AsyncExec::start_next_stage() {
-	if (m_stages.empty()) { return; }
-
-	auto get_next_stage = [&] {
-		auto ret = std::move(m_stages.front());
-		m_stages.pop_front();
-		return ret;
-	};
-
-	auto stage = get_next_stage();
-	while (stage.empty() && !m_stages.empty()) { stage = get_next_stage(); }
-
-	enqueue(stage);
-}
-
-void AsyncExec::enqueue(std::span<Task const> tasks) {
-	assert(m_remain.empty());
-	if (tasks.empty()) { return; }
-
-	m_remain.reserve(tasks.size());
-	for (auto const& task : tasks) {
-		auto func = [task = task, this] {
-			task();
-			++m_completed;
-		};
-		m_remain.push_back(std::async(std::move(func)));
-	}
-}
-} // namespace spaced
diff --git a/src/spaced/spaced/async_exec.hpp b/src/spaced/spaced/async_exec.hpp
deleted file mode 100644
index 66abe5e..0000000
--- a/src/spaced/spaced/async_exec.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-#include <atomic>
-#include <deque>
-#include <functional>
-#include <future>
-#include <span>
-#include <vector>
-
-namespace spaced {
-class AsyncExec {
-  public:
-	using Task = std::function<void()>;
-	using Stage = std::vector<Task>;
-
-	struct Status;
-
-	explicit AsyncExec(std::vector<Task> tasks);
-	explicit AsyncExec(std::vector<Stage> stages);
-
-	auto update() -> Status;
-
-  private:
-	void start_next_stage();
-	void enqueue(std::span<Task const> tasks);
-
-	std::vector<std::future<void>> m_remain{};
-	std::deque<Stage> m_stages{};
-	std::atomic<int> m_completed{};
-	int m_total{};
-};
-
-struct AsyncExec::Status {
-	int remain{};
-	int total{};
-
-	[[nodiscard]] constexpr auto progress() const -> float {
-		if (total == 0) { return 1.0f; }
-		return static_cast<float>(total - remain) / static_cast<float>(total);
-	}
-
-	[[nodiscard]] constexpr auto is_complete() const -> bool { return remain == 0; }
-
-	explicit constexpr operator bool() const { return is_complete(); }
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/game/arsenal.cpp b/src/spaced/spaced/game/arsenal.cpp
index 90ff556..11bb5b9 100644
--- a/src/spaced/spaced/game/arsenal.cpp
+++ b/src/spaced/spaced/game/arsenal.cpp
@@ -3,6 +3,7 @@
 
 namespace spaced {
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 
 Arsenal::Arsenal(Services const& services) : m_primary(services), m_stats(&services.get<Stats>()) {}
diff --git a/src/spaced/spaced/game/arsenal.hpp b/src/spaced/spaced/game/arsenal.hpp
index 2322a49..38827f4 100644
--- a/src/spaced/spaced/game/arsenal.hpp
+++ b/src/spaced/spaced/game/arsenal.hpp
@@ -8,7 +8,7 @@ struct Stats;
 // Weapons only switch when they are idle.
 class Arsenal {
   public:
-	explicit Arsenal(Services const& services);
+	explicit Arsenal(bave::Services const& services);
 
 	[[nodiscard]] auto get_weapon() const -> Weapon const&;
 	[[nodiscard]] auto get_weapon() -> Weapon&;
diff --git a/src/spaced/spaced/game/controllers/auto_controller.hpp b/src/spaced/spaced/game/controllers/auto_controller.hpp
index d38fb3d..bf822ad 100644
--- a/src/spaced/spaced/game/controllers/auto_controller.hpp
+++ b/src/spaced/spaced/game/controllers/auto_controller.hpp
@@ -1,12 +1,12 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/input/gamepad.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/controllers/follow_controller.hpp>
 #include <spaced/game/spring_arm.hpp>
 #include <spaced/game/target_provider.hpp>
 #include <spaced/services/gamepad_provider.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
 
 namespace spaced {
 class AutoController : public FollowController {
diff --git a/src/spaced/spaced/game/controllers/player_controller.cpp b/src/spaced/spaced/game/controllers/player_controller.cpp
index b31417d..8fcae45 100644
--- a/src/spaced/spaced/game/controllers/player_controller.cpp
+++ b/src/spaced/spaced/game/controllers/player_controller.cpp
@@ -9,10 +9,12 @@ using bave::Action;
 using bave::EnumArray;
 using bave::GamepadAxis;
 using bave::GamepadButton;
+using bave::IDisplay;
 using bave::im_text;
 using bave::PointerMove;
 using bave::PointerTap;
 using bave::Seconds;
+using bave::Services;
 
 PlayerController::PlayerController(Services const& services) : m_display(&services.get<IDisplay>()), m_gamepad_provider(&services.get<IGamepadProvider>()) {
 	max_y = 0.5f * m_display->get_world_space().y;
diff --git a/src/spaced/spaced/game/controllers/player_controller.hpp b/src/spaced/spaced/game/controllers/player_controller.hpp
index a840b72..72f0c2c 100644
--- a/src/spaced/spaced/game/controllers/player_controller.hpp
+++ b/src/spaced/spaced/game/controllers/player_controller.hpp
@@ -1,11 +1,11 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/input/gamepad.hpp>
+#include <bave/services/display.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/controllers/follow_controller.hpp>
 #include <spaced/game/spring_arm.hpp>
-#include <spaced/services/display.hpp>
 #include <spaced/services/gamepad_provider.hpp>
-#include <spaced/services/services.hpp>
 
 namespace spaced {
 class PlayerController : public FollowController {
@@ -18,7 +18,7 @@ class PlayerController : public FollowController {
 
 	[[nodiscard]] auto get_type_name() const -> std::string_view final { return type_name_v; };
 
-	explicit PlayerController(Services const& services);
+	explicit PlayerController(bave::Services const& services);
 
 	void on_move(bave::PointerMove const& pointer_move) final;
 	void on_tap(bave::PointerTap const& pointer_tap) final;
@@ -45,7 +45,7 @@ class PlayerController : public FollowController {
 	auto tick_y(bave::Seconds dt) -> float final;
 	void do_inspect() final;
 
-	bave::Ptr<IDisplay const> m_display{};
+	bave::Ptr<bave::IDisplay const> m_display{};
 	bave::Ptr<IGamepadProvider const> m_gamepad_provider{};
 
 	Type m_type{};
diff --git a/src/spaced/spaced/game/enemies/creep.hpp b/src/spaced/spaced/game/enemies/creep.hpp
index 12c1c6f..6579cc8 100644
--- a/src/spaced/spaced/game/enemies/creep.hpp
+++ b/src/spaced/spaced/game/enemies/creep.hpp
@@ -4,7 +4,7 @@
 namespace spaced {
 class Creep : public Enemy {
   public:
-	explicit Creep(Services const& services) : Enemy(services, "Creep") {}
+	explicit Creep(bave::Services const& services) : Enemy(services, "Creep") {}
 
 	void tick(bave::Seconds dt, bool in_play) override;
 
diff --git a/src/spaced/spaced/game/enemies/creep_factory.cpp b/src/spaced/spaced/game/enemies/creep_factory.cpp
index cea3595..18103ac 100644
--- a/src/spaced/spaced/game/enemies/creep_factory.cpp
+++ b/src/spaced/spaced/game/enemies/creep_factory.cpp
@@ -1,12 +1,13 @@
 #include <bave/core/random.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/enemies/creep.hpp>
 #include <spaced/game/enemies/creep_factory.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
 using bave::random_in_range;
 using bave::Seconds;
+using bave::Styles;
 
 auto CreepFactory::spawn_enemy() -> std::unique_ptr<Enemy> {
 	auto ret = std::make_unique<Creep>(get_services());
diff --git a/src/spaced/spaced/game/enemy.cpp b/src/spaced/spaced/game/enemy.cpp
index 59acc33..77cd6d3 100644
--- a/src/spaced/spaced/game/enemy.cpp
+++ b/src/spaced/spaced/game/enemy.cpp
@@ -1,15 +1,19 @@
 #include <bave/core/random.hpp>
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/services.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/enemy.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
 using bave::im_text;
 using bave::random_in_range;
 using bave::RoundedQuad;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
+using bave::Styles;
+
+namespace ui = bave::ui;
 
 Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&services.get<Layout>()), m_health_bar(services), m_type(type) {
 	static constexpr auto init_size_v = glm::vec2{100.0f};
diff --git a/src/spaced/spaced/game/enemy.hpp b/src/spaced/spaced/game/enemy.hpp
index 378027e..45685ef 100644
--- a/src/spaced/spaced/game/enemy.hpp
+++ b/src/spaced/spaced/game/enemy.hpp
@@ -2,16 +2,16 @@
 #include <bave/core/time.hpp>
 #include <bave/graphics/shape.hpp>
 #include <bave/platform.hpp>
+#include <bave/services/services.hpp>
+#include <bave/ui/progress_bar.hpp>
 #include <spaced/game/damageable.hpp>
 #include <spaced/game/health.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/progress_bar.hpp>
 
 namespace spaced {
 class Enemy : public IDamageable, public bave::IDrawable {
   public:
-	explicit Enemy(Services const& services, std::string_view type);
+	explicit Enemy(bave::Services const& services, std::string_view type);
 
 	[[nodiscard]] auto get_instigator() const -> Instigator final { return Instigator::eEnemy; }
 	[[nodiscard]] auto get_bounds() const -> bave::Rect<> override { return shape.get_bounds(); }
@@ -45,7 +45,7 @@ class Enemy : public IDamageable, public bave::IDrawable {
 
 	bave::NotNull<Layout const*> m_layout;
 
-	ui::ProgressBar m_health_bar;
+	bave::ui::ProgressBar m_health_bar;
 
 	std::string_view m_type{};
 	bool m_destroyed{};
diff --git a/src/spaced/spaced/game/enemy_factory.cpp b/src/spaced/spaced/game/enemy_factory.cpp
index 97c4c20..e31c7ce 100644
--- a/src/spaced/spaced/game/enemy_factory.cpp
+++ b/src/spaced/spaced/game/enemy_factory.cpp
@@ -1,9 +1,11 @@
+#include <bave/services/audio.hpp>
 #include <spaced/game/enemy_factory.hpp>
-#include <spaced/services/audio.hpp>
 
 namespace spaced {
+using bave::IAudio;
 using bave::NotNull;
 using bave::Seconds;
+using bave::Services;
 
 EnemyFactory::EnemyFactory(NotNull<Services const*> services) : m_services(services), m_audio(&services->get<IAudio>()) {}
 
diff --git a/src/spaced/spaced/game/enemy_factory.hpp b/src/spaced/spaced/game/enemy_factory.hpp
index c183b30..af22ddb 100644
--- a/src/spaced/spaced/game/enemy_factory.hpp
+++ b/src/spaced/spaced/game/enemy_factory.hpp
@@ -1,25 +1,24 @@
 #pragma once
 #include <bave/graphics/particle_system.hpp>
+#include <bave/services/audio.hpp>
 #include <spaced/game/enemy.hpp>
 
 namespace spaced {
-class IAudio;
-
 class EnemyFactory : public bave::Polymorphic {
   public:
-	explicit EnemyFactory(bave::NotNull<Services const*> services);
+	explicit EnemyFactory(bave::NotNull<bave::Services const*> services);
 
 	[[nodiscard]] virtual auto spawn_enemy() -> std::unique_ptr<Enemy> = 0;
 
 	auto tick(bave::Seconds dt) -> std::unique_ptr<Enemy>;
 
-	[[nodiscard]] auto get_services() const -> Services const& { return *m_services; }
+	[[nodiscard]] auto get_services() const -> bave::Services const& { return *m_services; }
 
 	bave::Seconds spawn_rate{1s};
 
   private:
-	bave::NotNull<Services const*> m_services;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::Services const*> m_services;
+	bave::NotNull<bave::IAudio*> m_audio;
 
 	bave::Seconds m_elapsed{};
 };
diff --git a/src/spaced/spaced/game/hud.cpp b/src/spaced/spaced/game/hud.cpp
index be2db21..2a6d3c5 100644
--- a/src/spaced/spaced/game/hud.cpp
+++ b/src/spaced/spaced/game/hud.cpp
@@ -1,11 +1,15 @@
 #include <fmt/format.h>
+#include <bave/services/styles.hpp>
 #include <spaced/game/hud.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
+using bave::Services;
+using bave::Styles;
 using bave::TextHeight;
 
+namespace ui = bave::ui;
+
 Hud::Hud(Services const& services) : ui::View(services), m_styles(&services.get<Styles>()), m_area(services.get<Layout>().hud_area) {
 	create_background();
 	create_score(services);
diff --git a/src/spaced/spaced/game/hud.hpp b/src/spaced/spaced/game/hud.hpp
index 0f1d0bb..bc26dc3 100644
--- a/src/spaced/spaced/game/hud.hpp
+++ b/src/spaced/spaced/game/hud.hpp
@@ -1,26 +1,26 @@
 #pragma once
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/text.hpp>
-#include <spaced/ui/view.hpp>
+#include <bave/services/styles.hpp>
+#include <bave/ui/outline_quad.hpp>
+#include <bave/ui/text.hpp>
+#include <bave/ui/view.hpp>
 
 namespace spaced {
-class Hud : public ui::View {
+class Hud : public bave::ui::View {
   public:
-	explicit Hud(Services const& services);
+	explicit Hud(bave::Services const& services);
 
 	void set_score(std::int64_t score);
 	void set_hi_score(std::int64_t score);
 
   private:
 	void create_background();
-	void create_score(Services const& services);
+	void create_score(bave::Services const& services);
 
-	bave::NotNull<Styles const*> m_styles;
+	bave::NotNull<bave::Styles const*> m_styles;
 	bave::Rect<> m_area{};
 
-	bave::Ptr<ui::OutlineQuad> m_background{};
-	bave::Ptr<ui::Text> m_score{};
-	bave::Ptr<ui::Text> m_hi_score{};
+	bave::Ptr<bave::ui::OutlineQuad> m_background{};
+	bave::Ptr<bave::ui::Text> m_score{};
+	bave::Ptr<bave::ui::Text> m_hi_score{};
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/game/player.cpp b/src/spaced/spaced/game/player.cpp
index 63ef0a1..79eb349 100644
--- a/src/spaced/spaced/game/player.cpp
+++ b/src/spaced/spaced/game/player.cpp
@@ -1,11 +1,11 @@
 #include <imgui.h>
 #include <bave/imgui/im_text.hpp>
 #include <bave/platform.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/player.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/resources.hpp>
 #include <spaced/services/stats.hpp>
-#include <spaced/services/styles.hpp>
 
 // temp for testing
 #include <spaced/game/weapons/gun_beam.hpp>
@@ -14,9 +14,12 @@ namespace spaced {
 using bave::ParticleEmitter;
 using bave::PointerMove;
 using bave::PointerTap;
+using bave::Resources;
 using bave::RoundedQuad;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
+using bave::Styles;
 
 Player::Player(Services const& services, std::unique_ptr<IController> controller)
 	: m_services(&services), m_stats(&services.get<Stats>()), m_controller(std::move(controller)) {
diff --git a/src/spaced/spaced/game/player.hpp b/src/spaced/spaced/game/player.hpp
index ebee256..015ca75 100644
--- a/src/spaced/spaced/game/player.hpp
+++ b/src/spaced/spaced/game/player.hpp
@@ -17,7 +17,7 @@ class Player : public bave::IDrawable {
 		std::span<bave::NotNull<IPowerup*> const> powerups{};
 	};
 
-	explicit Player(Services const& services, std::unique_ptr<IController> controller);
+	explicit Player(bave::Services const& services, std::unique_ptr<IController> controller);
 
 	void on_focus(bave::FocusChange const& focus_change);
 	void on_move(bave::PointerMove const& pointer_move);
@@ -50,7 +50,7 @@ class Player : public bave::IDrawable {
 	void do_inspect();
 
 	bave::Logger m_log{"Player"};
-	bave::NotNull<Services const*> m_services;
+	bave::NotNull<bave::Services const*> m_services;
 	bave::NotNull<Stats*> m_stats;
 	std::unique_ptr<IController> m_controller;
 	bave::ParticleEmitter m_exhaust{};
diff --git a/src/spaced/spaced/game/powerups/pu_base.cpp b/src/spaced/spaced/game/powerups/pu_base.cpp
index f939805..f30d6b5 100644
--- a/src/spaced/spaced/game/powerups/pu_base.cpp
+++ b/src/spaced/spaced/game/powerups/pu_base.cpp
@@ -1,10 +1,12 @@
+#include <bave/services/resources.hpp>
 #include <spaced/game/powerups/pu_base.hpp>
-#include <spaced/services/resources.hpp>
 
 namespace spaced {
 using bave::ParticleEmitter;
+using bave::Resources;
 using bave::RoundedQuad;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 
 PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<Layout>()), m_name(name) {
diff --git a/src/spaced/spaced/game/powerups/pu_base.hpp b/src/spaced/spaced/game/powerups/pu_base.hpp
index 37bff9e..4c200c4 100644
--- a/src/spaced/spaced/game/powerups/pu_base.hpp
+++ b/src/spaced/spaced/game/powerups/pu_base.hpp
@@ -2,14 +2,14 @@
 #include <bave/core/time.hpp>
 #include <bave/graphics/particle_system.hpp>
 #include <bave/graphics/shape.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/powerup.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
 
 namespace spaced {
 class PUBase : public IPowerup {
   public:
-	explicit PUBase(Services const& services, std::string_view name);
+	explicit PUBase(bave::Services const& services, std::string_view name);
 
 	void tick(bave::Seconds dt) final;
 	void draw(bave::Shader& shader) const final;
@@ -26,7 +26,7 @@ class PUBase : public IPowerup {
   protected:
 	virtual void do_activate(Player& player) = 0;
 
-	bave::NotNull<Services const*> m_services;
+	bave::NotNull<bave::Services const*> m_services;
 	bave::NotNull<Layout const*> m_layout;
 	std::string_view m_name{};
 	bool m_emitter_ticked{};
diff --git a/src/spaced/spaced/game/powerups/pu_beam.cpp b/src/spaced/spaced/game/powerups/pu_beam.cpp
index b1c50c5..49b2167 100644
--- a/src/spaced/spaced/game/powerups/pu_beam.cpp
+++ b/src/spaced/spaced/game/powerups/pu_beam.cpp
@@ -1,9 +1,12 @@
+#include <bave/services/styles.hpp>
 #include <spaced/game/player.hpp>
 #include <spaced/game/powerups/pu_beam.hpp>
 #include <spaced/game/weapons/gun_beam.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
+using bave::Services;
+using bave::Styles;
+
 PUBeam::PUBeam(Services const& services, int rounds) : PUBase(services, "Beam"), m_rounds(rounds) {
 	emitter.config.lerp.tint.lo = emitter.config.lerp.tint.hi = shape.tint = services.get<Styles>().rgbas["gun_beam"];
 	emitter.config.lerp.tint.hi.channels.w = 0;
diff --git a/src/spaced/spaced/game/powerups/pu_beam.hpp b/src/spaced/spaced/game/powerups/pu_beam.hpp
index 9e19668..abf8335 100644
--- a/src/spaced/spaced/game/powerups/pu_beam.hpp
+++ b/src/spaced/spaced/game/powerups/pu_beam.hpp
@@ -4,7 +4,7 @@
 namespace spaced {
 class PUBeam : public PUBase {
   public:
-	explicit PUBeam(Services const& services, int rounds = 2);
+	explicit PUBeam(bave::Services const& services, int rounds = 2);
 
   private:
 	void do_activate(Player& player) final;
diff --git a/src/spaced/spaced/game/weapon.cpp b/src/spaced/spaced/game/weapon.cpp
index f8bb3f2..b4da785 100644
--- a/src/spaced/spaced/game/weapon.cpp
+++ b/src/spaced/spaced/game/weapon.cpp
@@ -1,9 +1,12 @@
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/audio.hpp>
 #include <spaced/game/weapon.hpp>
-#include <spaced/services/audio.hpp>
 
 namespace spaced {
+using bave::IAudio;
+using bave::IDisplay;
 using bave::im_text;
+using bave::Services;
 
 Weapon::Weapon(Services const& services, std::string name) : m_log{std::move(name)}, m_display(&services.get<IDisplay>()), m_audio(&services.get<IAudio>()) {}
 
diff --git a/src/spaced/spaced/game/weapon.hpp b/src/spaced/spaced/game/weapon.hpp
index 9c14d4e..b114b84 100644
--- a/src/spaced/spaced/game/weapon.hpp
+++ b/src/spaced/spaced/game/weapon.hpp
@@ -1,18 +1,20 @@
 #pragma once
 #include <bave/logger.hpp>
 #include <bave/platform.hpp>
+#include <bave/services/display.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/weapon_round.hpp>
-#include <spaced/services/display.hpp>
-#include <spaced/services/services.hpp>
 
-namespace spaced {
+namespace bave {
 class IAudio;
+}
 
+namespace spaced {
 class Weapon : public bave::Polymorphic {
   public:
 	using Round = IWeaponRound;
 
-	explicit Weapon(Services const& services, std::string name);
+	explicit Weapon(bave::Services const& services, std::string name);
 
 	[[nodiscard]] auto get_rounds_remaining() const -> int { return rounds < 0 ? 1 : rounds; }
 
@@ -28,7 +30,7 @@ class Weapon : public bave::Polymorphic {
 	int rounds{-1};
 
   protected:
-	[[nodiscard]] auto get_display() const -> IDisplay const& { return *m_display; }
+	[[nodiscard]] auto get_display() const -> bave::IDisplay const& { return *m_display; }
 
 	virtual auto do_fire(glm::vec2 muzzle_position) -> std::unique_ptr<Round> = 0;
 	virtual void do_inspect();
@@ -37,7 +39,7 @@ class Weapon : public bave::Polymorphic {
 	std::vector<std::string> m_fire_sfx{};
 
   private:
-	bave::NotNull<IDisplay const*> m_display;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::IDisplay const*> m_display;
+	bave::NotNull<bave::IAudio*> m_audio;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/game/weapons/gun_beam.cpp b/src/spaced/spaced/game/weapons/gun_beam.cpp
index 040f5bc..e877096 100644
--- a/src/spaced/spaced/game/weapons/gun_beam.cpp
+++ b/src/spaced/spaced/game/weapons/gun_beam.cpp
@@ -1,17 +1,20 @@
 #include <bave/graphics/sprite.hpp>
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/weapons/gun_beam.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
+using bave::IDisplay;
 using bave::im_text;
 using bave::NotNull;
 using bave::Ptr;
 using bave::Rect;
 using bave::Rgba;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 using bave::Sprite;
+using bave::Styles;
 
 namespace {
 class LaserCharge : public IWeaponRound {
diff --git a/src/spaced/spaced/game/weapons/gun_beam.hpp b/src/spaced/spaced/game/weapons/gun_beam.hpp
index 691bd74..038288c 100644
--- a/src/spaced/spaced/game/weapons/gun_beam.hpp
+++ b/src/spaced/spaced/game/weapons/gun_beam.hpp
@@ -12,7 +12,7 @@ class GunBeam final : public Weapon {
 		float dps{10.0f};
 	};
 
-	explicit GunBeam(Services const& services);
+	explicit GunBeam(bave::Services const& services);
 
 	[[nodiscard]] auto is_idle() const -> bool final { return m_fire_remain <= 0s; }
 	void tick(bave::Seconds dt) final;
diff --git a/src/spaced/spaced/game/weapons/gun_kinetic.cpp b/src/spaced/spaced/game/weapons/gun_kinetic.cpp
index 5587bbf..981ceb1 100644
--- a/src/spaced/spaced/game/weapons/gun_kinetic.cpp
+++ b/src/spaced/spaced/game/weapons/gun_kinetic.cpp
@@ -1,11 +1,14 @@
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/weapons/gun_kinetic.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
+using bave::IAudio;
 using bave::im_text;
 using bave::Rgba;
 using bave::Seconds;
+using bave::Services;
+using bave::Styles;
 
 GunKinetic::GunKinetic(Services const& services) : Weapon(services, "GunKinetic"), m_audio(&services.get<IAudio>()) {
 	projectile_config.tint = services.get<Styles>().rgbas["black"];
diff --git a/src/spaced/spaced/game/weapons/gun_kinetic.hpp b/src/spaced/spaced/game/weapons/gun_kinetic.hpp
index d58053a..c321966 100644
--- a/src/spaced/spaced/game/weapons/gun_kinetic.hpp
+++ b/src/spaced/spaced/game/weapons/gun_kinetic.hpp
@@ -1,12 +1,12 @@
 #pragma once
+#include <bave/services/audio.hpp>
 #include <spaced/game/weapon.hpp>
 #include <spaced/game/weapons/projectile.hpp>
-#include <spaced/services/audio.hpp>
 
 namespace spaced {
 class GunKinetic final : public Weapon {
   public:
-	explicit GunKinetic(Services const& services);
+	explicit GunKinetic(bave::Services const& services);
 
 	[[nodiscard]] auto is_idle() const -> bool final { return m_reload_remain <= 0s; }
 
@@ -20,6 +20,6 @@ class GunKinetic final : public Weapon {
 	void do_inspect() final;
 
 	bave::Seconds m_reload_remain{};
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::IAudio*> m_audio;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/game/weapons/projectile.cpp b/src/spaced/spaced/game/weapons/projectile.cpp
index 6ba8f9e..11d2dbd 100644
--- a/src/spaced/spaced/game/weapons/projectile.cpp
+++ b/src/spaced/spaced/game/weapons/projectile.cpp
@@ -1,6 +1,7 @@
 #include <spaced/game/weapons/projectile.hpp>
 
 namespace spaced {
+using bave::IDisplay;
 using bave::NotNull;
 using bave::Rect;
 using bave::RoundedQuad;
diff --git a/src/spaced/spaced/game/weapons/projectile.hpp b/src/spaced/spaced/game/weapons/projectile.hpp
index 7b78c5e..ca4b129 100644
--- a/src/spaced/spaced/game/weapons/projectile.hpp
+++ b/src/spaced/spaced/game/weapons/projectile.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <bave/graphics/shape.hpp>
+#include <bave/services/display.hpp>
 #include <spaced/game/instigator.hpp>
 #include <spaced/game/weapon_round.hpp>
-#include <spaced/services/display.hpp>
 
 namespace spaced {
 class Projectile : public IWeaponRound {
@@ -17,14 +17,14 @@ class Projectile : public IWeaponRound {
 		Instigator instigator{Instigator::ePlayer};
 	};
 
-	explicit Projectile(bave::NotNull<IDisplay const*> display, Config config, glm::vec2 muzzle_position);
+	explicit Projectile(bave::NotNull<bave::IDisplay const*> display, Config config, glm::vec2 muzzle_position);
 
 	void tick(State const& state, bave::Seconds dt) override;
 	[[nodiscard]] auto is_destroyed() const -> bool override { return m_destroyed; }
 	void draw(bave::Shader& shader) const override;
 
   protected:
-	bave::NotNull<IDisplay const*> m_display;
+	bave::NotNull<bave::IDisplay const*> m_display;
 	Config m_config{};
 
 	bave::RoundedQuadShape m_shape{};
diff --git a/src/spaced/spaced/game/world.cpp b/src/spaced/spaced/game/world.cpp
index 409ee6a..4607c08 100644
--- a/src/spaced/spaced/game/world.cpp
+++ b/src/spaced/spaced/game/world.cpp
@@ -1,7 +1,7 @@
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/resources.hpp>
 #include <spaced/game/enemies/creep_factory.hpp>
 #include <spaced/game/world.hpp>
-#include <spaced/services/resources.hpp>
 #include <spaced/services/stats.hpp>
 
 #include <bave/core/random.hpp>
@@ -11,10 +11,13 @@
 
 namespace spaced {
 using bave::FixedString;
+using bave::IAudio;
 using bave::NotNull;
 using bave::ParticleEmitter;
 using bave::random_in_range;
+using bave::Resources;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 
 namespace {
diff --git a/src/spaced/spaced/game/world.hpp b/src/spaced/spaced/game/world.hpp
index 46cf622..24720c9 100644
--- a/src/spaced/spaced/game/world.hpp
+++ b/src/spaced/spaced/game/world.hpp
@@ -4,13 +4,16 @@
 #include <spaced/game/scorer.hpp>
 #include <spaced/game/target_provider.hpp>
 
-namespace spaced {
+namespace bave {
 struct Resources;
+}
+
+namespace spaced {
 struct Stats;
 
 class World : public ITargetProvider {
   public:
-	explicit World(bave::NotNull<Services const*> services, bave::NotNull<IScorer*> scorer);
+	explicit World(bave::NotNull<bave::Services const*> services, bave::NotNull<IScorer*> scorer);
 
 	[[nodiscard]] auto get_targets() const -> std::span<bave::NotNull<IDamageable*> const> final { return m_targets; }
 
@@ -32,9 +35,9 @@ class World : public ITargetProvider {
 	void debug_controller_type();
 	void debug_spawn_powerup(glm::vec2 position);
 
-	bave::NotNull<Services const*> m_services;
-	bave::NotNull<Resources const*> m_resources;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::Services const*> m_services;
+	bave::NotNull<bave::Resources const*> m_resources;
+	bave::NotNull<bave::IAudio*> m_audio;
 	bave::NotNull<Stats*> m_stats;
 	bave::NotNull<IScorer*> m_scorer;
 
diff --git a/src/spaced/spaced/game_driver.cpp b/src/spaced/spaced/game_driver.cpp
deleted file mode 100644
index bffd520..0000000
--- a/src/spaced/spaced/game_driver.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include <spaced/game_driver.hpp>
-#include <spaced/services/audio.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/scene_switcher.hpp>
-
-namespace spaced {
-using bave::App;
-using bave::AudioClip;
-using bave::AudioDevice;
-using bave::AudioStreamer;
-using bave::FocusChange;
-using bave::KeyInput;
-using bave::MouseScroll;
-using bave::NotNull;
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::Rect;
-using bave::RenderDevice;
-using bave::RenderView;
-using bave::Seconds;
-
-namespace {
-struct Audio : IAudio {
-	NotNull<AudioDevice*> audio_device;
-	NotNull<AudioStreamer*> audio_streamer;
-	NotNull<Resources const*> resources;
-
-	explicit Audio(NotNull<AudioDevice*> audio_device, NotNull<AudioStreamer*> audio_streamer, NotNull<Resources const*> resources)
-		: audio_device(audio_device), audio_streamer(audio_streamer), resources(resources) {}
-
-	[[nodiscard]] auto get_sfx_gain() const -> float final { return audio_device->sfx_gain; }
-	void set_sfx_gain(float const gain) final { audio_device->sfx_gain = gain; }
-
-	[[nodiscard]] auto get_music_gain() const -> float final { return audio_streamer->gain; }
-	void set_music_gain(float const gain) final { audio_streamer->gain = gain; }
-
-	void play_sfx(std::string_view const uri) final {
-		auto const clip = resources->get<AudioClip>(uri);
-		if (!clip) { return; }
-		audio_device->play_once(*clip);
-	}
-
-	void play_music(std::string_view const uri, Seconds const crossfade) final {
-		auto const clip = resources->get<AudioClip>(uri);
-		if (!clip) { return; }
-		audio_streamer->play(clip, crossfade);
-	}
-
-	void stop_music() final { audio_streamer->stop(); }
-};
-} // namespace
-
-struct GameDriver::SceneSwitcher : ISceneSwitcher {
-	App& app;				  // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
-	Services const& services; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
-	std::unique_ptr<Scene> next_scene{};
-
-	explicit SceneSwitcher(App& app, Services const& services) : app(app), services(services) {}
-
-	void switch_to_scene(std::unique_ptr<Scene> new_scene) final { next_scene = std::move(new_scene); }
-
-	[[nodiscard]] auto get_app() const -> App& final { return app; }
-	[[nodiscard]] auto get_services() const -> Services const& final { return services; }
-};
-
-struct GameDriver::Display : IDisplay {
-	NotNull<RenderDevice const*> render_device;
-	RenderView main_view{};
-	glm::vec2 framebuffer_size{};
-	Rect<> play_area{};
-	Rect<> hud_area{};
-
-	explicit Display(NotNull<RenderDevice const*> render_device) : render_device(render_device) {}
-
-	[[nodiscard]] auto get_main_view() const -> RenderView const& final { return main_view; }
-	[[nodiscard]] auto get_framebuffer_size() const -> glm::vec2 final { return framebuffer_size; }
-	[[nodiscard]] auto get_world_space() const -> glm::vec2 final { return main_view.viewport; }
-
-	[[nodiscard]] auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 final { return render_device->project_to(get_world_space(), fb_point); }
-
-	[[nodiscard]] auto unproject(glm::vec2 const pointer) const -> glm::vec2 final {
-		if (!bave::is_positive(framebuffer_size)) { return pointer; }
-		return main_view.unproject(pointer / framebuffer_size);
-	}
-};
-
-GameDriver::GameDriver(App& app) : Driver(app), m_scene(std::make_unique<EmptyScene>(app, m_services)) {
-	auto display = std::make_unique<Display>(&app.get_render_device());
-	m_display = display.get();
-	m_display->framebuffer_size = app.get_framebuffer_size();
-	m_display->main_view = app.get_render_device().get_default_view();
-	m_services.bind<IDisplay>(std::move(display));
-
-	auto switcher = std::make_unique<SceneSwitcher>(app, m_services);
-	m_switcher = switcher.get();
-	m_services.bind<ISceneSwitcher>(std::move(switcher));
-
-	m_services.bind<Resources>(std::make_unique<Resources>());
-
-	auto audio = std::make_unique<Audio>(&get_app().get_audio_device(), &get_app().get_audio_streamer(), &m_services.get<Resources>());
-	m_audio = audio.get();
-	m_services.bind<IAudio>(std::move(audio));
-}
-
-void GameDriver::on_focus(FocusChange const& focus_change) { m_scene->on_focus_event(focus_change); }
-
-void GameDriver::on_resize(bave::WindowResize const& window_resize) { m_scene->on_resize(window_resize); }
-
-void GameDriver::on_resize(bave::FramebufferResize const& framebuffer_resize) { m_scene->on_resize(framebuffer_resize); }
-
-void GameDriver::on_key(KeyInput const& key_input) { m_scene->on_key_event(key_input); }
-
-void GameDriver::on_char(bave::CharInput const& char_input) { m_scene->on_char(char_input); }
-
-void GameDriver::on_tap(PointerTap const& pointer_tap) { m_scene->on_tap_event(pointer_tap); }
-
-void GameDriver::on_move(PointerMove const& pointer_move) { m_scene->on_move_event(pointer_move); }
-
-void GameDriver::on_scroll(MouseScroll const& mouse_scroll) { m_scene->on_scroll_event(mouse_scroll); }
-
-void GameDriver::on_drop(std::span<std::string const> paths) { m_scene->on_drop(paths); }
-
-void GameDriver::tick() {
-	m_display->framebuffer_size = get_app().get_framebuffer_size();
-
-	if (m_switcher->next_scene) {
-		switch_track(m_scene->get_music_uri(), m_switcher->next_scene->get_music_uri());
-		m_scene = std::move(m_switcher->next_scene);
-		m_scene->start_loading();
-	}
-
-	m_scene->tick_frame(get_app().get_dt());
-
-	clear_colour = m_scene->clear_colour;
-}
-
-void GameDriver::render() const { m_scene->render_frame(); }
-
-void GameDriver::switch_track(std::string_view const from, std::string_view const to) const {
-	if (to.empty()) {
-		m_audio->stop_music();
-	} else if (from != to) {
-		m_audio->play_music(to);
-	}
-}
-} // namespace spaced
diff --git a/src/spaced/spaced/game_driver.hpp b/src/spaced/spaced/game_driver.hpp
deleted file mode 100644
index 924816e..0000000
--- a/src/spaced/spaced/game_driver.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-#include <bave/driver.hpp>
-#include <spaced/scene.hpp>
-#include <spaced/services/scene_switcher.hpp>
-
-namespace spaced {
-class IAudio;
-
-class GameDriver : public bave::Driver {
-  public:
-	explicit GameDriver(bave::App& app);
-
-  protected:
-	void on_focus(bave::FocusChange const& focus_change) override;
-	void on_resize(bave::WindowResize const& window_resize) override;
-	void on_resize(bave::FramebufferResize const& framebuffer_resize) override;
-	void on_key(bave::KeyInput const& key_input) override;
-	void on_char(bave::CharInput const& char_input) override;
-	void on_tap(bave::PointerTap const& pointer_tap) override;
-	void on_move(bave::PointerMove const& pointer_move) override;
-	void on_scroll(bave::MouseScroll const& mouse_scroll) override;
-	void on_drop(std::span<std::string const> paths) override;
-
-	void tick() override;
-	void render() const override;
-
-	void switch_track(std::string_view from, std::string_view to) const;
-
-	[[nodiscard]] auto get_switcher() const -> ISceneSwitcher& { return m_services.get<ISceneSwitcher>(); }
-
-	Services m_services;
-
-  private:
-	struct SceneSwitcher;
-	struct Display;
-
-	bave::Ptr<SceneSwitcher> m_switcher{};
-	bave::Ptr<Display> m_display{};
-	bave::Ptr<IAudio> m_audio{};
-
-	std::unique_ptr<Scene> m_scene{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/prefs.cpp b/src/spaced/spaced/prefs.cpp
index da68d6d..223346f 100644
--- a/src/spaced/spaced/prefs.cpp
+++ b/src/spaced/spaced/prefs.cpp
@@ -1,16 +1,21 @@
 #include <bave/persistor.hpp>
+#include <bave/services/audio.hpp>
+#include <bave/services/styles.hpp>
+#include <bave/ui/button.hpp>
+#include <bave/ui/slider.hpp>
+#include <bave/ui/text.hpp>
 #include <djson/json.hpp>
 #include <spaced/prefs.hpp>
-#include <spaced/services/audio.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/slider.hpp>
-#include <spaced/ui/text.hpp>
 
 namespace spaced {
 using bave::App;
+using bave::IAudio;
 using bave::NotNull;
 using bave::Persistor;
+using bave::Services;
+using bave::Styles;
+
+namespace ui = bave::ui;
 
 namespace {
 constexpr std::string_view uri_v{"spaced/prefs.json"};
diff --git a/src/spaced/spaced/prefs.hpp b/src/spaced/spaced/prefs.hpp
index be0863d..ce99338 100644
--- a/src/spaced/spaced/prefs.hpp
+++ b/src/spaced/spaced/prefs.hpp
@@ -1,10 +1,9 @@
 #pragma once
 #include <bave/app.hpp>
-#include <spaced/ui/view.hpp>
+#include <bave/services/audio.hpp>
+#include <bave/ui/view.hpp>
 
 namespace spaced {
-class IAudio;
-
 struct Prefs {
 	class View;
 
@@ -15,19 +14,19 @@ struct Prefs {
 	void save(bave::App const& app) const;
 };
 
-class Prefs::View : public ui::View {
+class Prefs::View : public bave::ui::View {
   public:
 	View(View const&) = delete;
 	View(View&&) = delete;
 	auto operator=(View const&) = delete;
 	auto operator=(View&&) = delete;
 
-	explicit View(bave::NotNull<bave::App const*> app, Services const& services);
+	explicit View(bave::NotNull<bave::App const*> app, bave::Services const& services);
 	~View() override;
 
   private:
 	bave::NotNull<bave::App const*> m_app;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::IAudio*> m_audio;
 	Prefs m_prefs;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/resource_map.hpp b/src/spaced/spaced/resource_map.hpp
deleted file mode 100644
index fb44e4b..0000000
--- a/src/spaced/spaced/resource_map.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-#include <bave/core/polymorphic.hpp>
-#include <spaced/string_map.hpp>
-#include <memory>
-#include <typeindex>
-
-namespace spaced {
-class ResourceMap {
-  public:
-	template <typename Type>
-	auto add(std::string uri, std::shared_ptr<Type> resource) {
-		if (uri.empty() || !resource) { return; }
-		m_resources.insert_or_assign(std::move(uri), std::make_unique<Model<Type>>(std::move(resource)));
-	}
-
-	[[nodiscard]] auto contains(std::string_view const uri) const -> bool { return m_resources.contains(uri); }
-
-	template <typename Type>
-	[[nodiscard]] auto contains(std::string_view const uri) const -> bool {
-		if (uri.empty()) { return false; }
-		auto const it = m_resources.find(uri);
-		if (it == m_resources.end()) { return false; }
-		return it->second->type_index == typeid(Type);
-	}
-
-	template <typename Type>
-	[[nodiscard]] auto get(std::string_view const uri, std::shared_ptr<Type> const& fallback = {}) const -> std::shared_ptr<Type> {
-		if (uri.empty()) { return fallback; }
-		auto const it = m_resources.find(uri);
-		if (it == m_resources.end()) { return fallback; }
-		auto const& resource = it->second;
-		if (resource->type_index != typeid(Type)) { return fallback; }
-		return static_cast<Model<Type> const&>(*it->second).resource;
-	}
-
-	void clear() { m_resources.clear(); }
-
-	[[nodiscard]] auto size() const -> std::size_t { return m_resources.size(); }
-
-  private:
-	struct Base : bave::Polymorphic {
-		std::type_index type_index;
-		explicit Base(std::type_index type_index) : type_index(type_index) {}
-	};
-
-	template <typename T>
-	struct Model : Base {
-		std::shared_ptr<T> resource;
-		explicit Model(std::shared_ptr<T> t) : Base(typeid(T)), resource(std::move(t)) {}
-	};
-
-	StringMap<std::unique_ptr<Base>> m_resources{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/scene.cpp b/src/spaced/spaced/scene.cpp
deleted file mode 100644
index c974e92..0000000
--- a/src/spaced/spaced/scene.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include <spaced/scene.hpp>
-#include <spaced/services/layout.hpp>
-#include <spaced/services/scene_switcher.hpp>
-#include <algorithm>
-
-namespace spaced {
-using bave::App;
-using bave::FocusChange;
-using bave::KeyInput;
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::Seconds;
-using bave::Shader;
-
-Scene::Scene(App& app, Services const& services, std::string name) : m_log{std::move(name)}, m_app(app), m_services(services) { m_log.info("constructed"); }
-
-void Scene::start_loading() {
-	auto stages = build_load_stages();
-	if (stages.empty()) {
-		on_loaded();
-		return;
-	}
-
-	m_load.emplace(std::move(stages));
-	m_loading_screen.emplace(m_services);
-}
-
-void Scene::on_key_event(KeyInput const& key_input) {
-	if (is_loading()) { return; }
-	on_key(key_input);
-}
-
-void Scene::on_focus_event(FocusChange const& focus_change) { on_focus(focus_change); }
-
-void Scene::on_move_event(PointerMove const& pointer_move) {
-	if (is_loading()) { return; }
-	if (on_ui_event([pointer_move](ui::View& view) { view.on_move(pointer_move); })) { return; }
-	on_move(pointer_move);
-}
-
-void Scene::on_tap_event(PointerTap const& pointer_tap) {
-	if (is_loading()) { return; }
-	if (on_ui_event([pointer_tap](ui::View& view) { view.on_tap(pointer_tap); })) { return; }
-	on_tap(pointer_tap);
-}
-
-void Scene::on_scroll_event(bave::MouseScroll const& mouse_scroll) {
-	if (is_loading()) { return; }
-	on_scroll(mouse_scroll);
-}
-
-auto Scene::is_ui_blocking_input() const -> bool {
-	return std::any_of(m_views.begin(), m_views.end(), [](auto const& view) { return view->block_input_events; });
-}
-
-void Scene::push_view(std::unique_ptr<ui::View> view) {
-	if (!view || view->is_destroyed()) { return; }
-	m_views.push_back(std::move(view));
-}
-
-auto Scene::pop_view() -> std::unique_ptr<ui::View> {
-	if (m_views.empty()) { return {}; }
-	auto ret = std::move(m_views.back());
-	m_views.pop_back();
-	return ret;
-}
-
-auto Scene::get_switcher() const -> ISceneSwitcher& { return get_services().get<ISceneSwitcher>(); }
-
-void Scene::tick_frame(Seconds const dt) {
-	update_loading(dt);
-	if (is_loading()) { return; }
-	tick(dt);
-	for (auto const& view : cache_views()) { view->tick(dt); }
-	std::erase_if(m_views, [](auto const& view) { return view->is_destroyed(); });
-}
-
-void Scene::render_frame() const {
-	auto shader = get_app().load_shader("shaders/default.vert", "shaders/default.frag");
-	if (!shader) { return; }
-	if (render_loading(*shader)) { return; }
-	render(*shader);
-	for (auto const& view : m_views) { view->render(*shader); }
-}
-
-template <typename F>
-auto Scene::on_ui_event(F per_view) -> bool {
-	auto const cached_views = cache_views();
-	for (auto it = cached_views.rbegin(); it != cached_views.rend(); ++it) {
-		auto const& view = *it;
-		if (!view->active) { continue; }
-		per_view(*view);
-		if (view->block_input_events) { return true; }
-	}
-	return false;
-}
-
-auto Scene::cache_views() -> std::span<bave::Ptr<ui::View> const> {
-	m_cached_views.clear();
-	m_cached_views.reserve(m_views.size());
-	for (auto const& view : m_views) { m_cached_views.push_back(view.get()); }
-	return m_cached_views;
-}
-
-void Scene::update_loading(Seconds const dt) {
-	if (!m_loading_screen) { return; }
-
-	if (!m_load) {
-		m_loading_screen->update(dt, 1.0f);
-		return;
-	}
-
-	auto const load_status = m_load->update();
-	auto const progress = load_status.progress();
-	m_loading_screen->update(dt, progress);
-
-	if (load_status.is_complete()) {
-		on_loaded();
-		m_loading_screen.reset();
-		m_load.reset();
-	}
-}
-
-auto Scene::render_loading(Shader& shader) const -> bool {
-	if (!m_loading_screen) { return false; }
-	m_loading_screen->draw(shader);
-	return true;
-}
-} // namespace spaced
diff --git a/src/spaced/spaced/scene.hpp b/src/spaced/spaced/scene.hpp
deleted file mode 100644
index f3443d0..0000000
--- a/src/spaced/spaced/scene.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#pragma once
-#include <bave/app.hpp>
-#include <bave/core/polymorphic.hpp>
-#include <bave/input/event_sink.hpp>
-#include <bave/loader.hpp>
-#include <spaced/async_exec.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/loading_screen.hpp>
-#include <spaced/ui/view.hpp>
-
-namespace spaced {
-class ISceneSwitcher;
-
-class Scene : public bave::EventSink {
-  public:
-	void start_loading();
-
-	void on_focus_event(bave::FocusChange const& focus_change);
-	void on_key_event(bave::KeyInput const& key_input);
-	void on_move_event(bave::PointerMove const& pointer_move);
-	void on_tap_event(bave::PointerTap const& pointer_tap);
-	void on_scroll_event(bave::MouseScroll const& mouse_scroll);
-	void tick_frame(bave::Seconds dt);
-	void render_frame() const;
-
-	[[nodiscard]] virtual auto get_music_uri() const -> std::string_view { return {}; }
-
-	[[nodiscard]] auto get_app() const -> bave::App& { return m_app; }
-	[[nodiscard]] auto get_services() const -> Services const& { return m_services; }
-	[[nodiscard]] auto make_loader() const -> bave::Loader { return bave::Loader{&m_app.get_data_store(), &m_app.get_render_device()}; }
-
-	[[nodiscard]] auto is_loading() const -> bool { return m_loading_screen.has_value(); }
-	[[nodiscard]] auto is_ui_blocking_input() const -> bool;
-
-	void push_view(std::unique_ptr<ui::View> view);
-	auto pop_view() -> std::unique_ptr<ui::View>;
-
-	[[nodiscard]] auto get_switcher() const -> ISceneSwitcher&;
-
-	bave::Rgba clear_colour{bave::black_v};
-
-  protected:
-	explicit Scene(bave::App& app, Services const& services, std::string name);
-
-	virtual auto build_load_stages() -> std::vector<AsyncExec::Stage> { return {}; }
-	virtual void on_loaded() {}
-
-	virtual void tick(bave::Seconds /*dt*/) {}
-	virtual void render(bave::Shader& /*shader*/) const {}
-
-	bave::Logger m_log{};
-
-  private:
-	template <typename F>
-	auto on_ui_event(F per_view) -> bool;
-
-	auto cache_views() -> std::span<bave::Ptr<ui::View> const>;
-
-	void update_loading(bave::Seconds dt);
-	auto render_loading(bave::Shader& shader) const -> bool;
-
-	bave::App& m_app;
-	Services const& m_services;
-	std::vector<std::unique_ptr<ui::View>> m_views{};
-	std::vector<bave::Ptr<ui::View>> m_cached_views{};
-
-	std::optional<AsyncExec> m_load{};
-	std::optional<ui::LoadingScreen> m_loading_screen{};
-};
-
-class EmptyScene : public Scene {
-  public:
-	explicit EmptyScene(bave::App& app, Services const& services) : Scene(app, services, "EmptyScene") {}
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/scenes/game.cpp b/src/spaced/spaced/scenes/game.cpp
index 52138a0..5ab679d 100644
--- a/src/spaced/spaced/scenes/game.cpp
+++ b/src/spaced/spaced/scenes/game.cpp
@@ -1,13 +1,13 @@
 #include <bave/core/random.hpp>
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/scene_switcher.hpp>
+#include <bave/services/styles.hpp>
+#include <bave/ui/button.hpp>
+#include <bave/ui/dialog.hpp>
 #include <spaced/assets/asset_list.hpp>
 #include <spaced/scenes/game.hpp>
 #include <spaced/scenes/menu.hpp>
-#include <spaced/services/scene_switcher.hpp>
 #include <spaced/services/stats.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/dialog.hpp>
 
 namespace spaced {
 using bave::Action;
@@ -21,7 +21,11 @@ using bave::PointerMove;
 using bave::PointerTap;
 using bave::Ptr;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
+using bave::Styles;
+
+namespace ui = bave::ui;
 
 auto GameScene::get_manifest() -> AssetManifest {
 	return AssetManifest{
diff --git a/src/spaced/spaced/scenes/game.hpp b/src/spaced/spaced/scenes/game.hpp
index 3bd14d8..4566bb2 100644
--- a/src/spaced/spaced/scenes/game.hpp
+++ b/src/spaced/spaced/scenes/game.hpp
@@ -1,18 +1,18 @@
 #pragma once
+#include <bave/scene.hpp>
 #include <spaced/assets/asset_manifest.hpp>
 #include <spaced/game/game_save.hpp>
 #include <spaced/game/hud.hpp>
 #include <spaced/game/scorer.hpp>
 #include <spaced/game/target_provider.hpp>
 #include <spaced/game/world.hpp>
-#include <spaced/scene.hpp>
 
 namespace spaced {
-class GameScene : public Scene, public IScorer {
+class GameScene : public bave::Scene, public IScorer {
   public:
 	static auto get_manifest() -> AssetManifest;
 
-	GameScene(bave::App& app, Services const& services);
+	GameScene(bave::App& app, bave::Services const& services);
 
   private:
 	void on_focus(bave::FocusChange const& focus_change) final;
diff --git a/src/spaced/spaced/scenes/load_assets.cpp b/src/spaced/spaced/scenes/load_assets.cpp
index 9ea4063..5482362 100644
--- a/src/spaced/spaced/scenes/load_assets.cpp
+++ b/src/spaced/spaced/scenes/load_assets.cpp
@@ -1,14 +1,17 @@
+#include <bave/services/resources.hpp>
+#include <bave/services/scene_switcher.hpp>
 #include <spaced/assets/asset_list.hpp>
 #include <spaced/scenes/game.hpp>
 #include <spaced/scenes/load_assets.hpp>
 #include <spaced/scenes/menu.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/scene_switcher.hpp>
 #include <spaced/util.hpp>
 
 namespace spaced {
 using bave::App;
+using bave::AsyncExec;
 using bave::Loader;
+using bave::Resources;
+using bave::Services;
 
 namespace {
 auto make_load_stages(Loader loader, Services const& services) -> std::vector<AsyncExec::Stage> {
diff --git a/src/spaced/spaced/scenes/load_assets.hpp b/src/spaced/spaced/scenes/load_assets.hpp
index 1b10cc6..4a0f265 100644
--- a/src/spaced/spaced/scenes/load_assets.hpp
+++ b/src/spaced/spaced/scenes/load_assets.hpp
@@ -1,13 +1,13 @@
 #pragma once
-#include <spaced/scene.hpp>
+#include <bave/scene.hpp>
 
 namespace spaced {
-class LoadAssets : public Scene {
+class LoadAssets : public bave::Scene {
   public:
-	explicit LoadAssets(bave::App& app, Services const& services);
+	explicit LoadAssets(bave::App& app, bave::Services const& services);
 
   private:
-	auto build_load_stages() -> std::vector<AsyncExec::Stage> final;
+	auto build_load_stages() -> std::vector<bave::AsyncExec::Stage> final;
 	void on_loaded() final;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/scenes/menu.cpp b/src/spaced/spaced/scenes/menu.cpp
index dcdb75f..d1d5d83 100644
--- a/src/spaced/spaced/scenes/menu.cpp
+++ b/src/spaced/spaced/scenes/menu.cpp
@@ -1,19 +1,22 @@
+#include <bave/services/resources.hpp>
+#include <bave/services/scene_switcher.hpp>
+#include <bave/ui/button.hpp>
+#include <bave/ui/dialog.hpp>
+#include <bave/ui/text.hpp>
 #include <spaced/prefs.hpp>
 #include <spaced/scenes/game.hpp>
 #include <spaced/scenes/menu.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/scene_switcher.hpp>
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/dialog.hpp>
-#include <spaced/ui/text.hpp>
 #include <spaced/util.hpp>
 
 namespace spaced {
 using bave::App;
 using bave::Seconds;
+using bave::Services;
 using bave::TextHeight;
 
+namespace ui = bave::ui;
+
 auto MenuScene::get_text_heights() -> std::vector<TextHeight> { return {TextHeight{100}, TextHeight{60}, ui::Dialog::text_height_v}; }
 
 MenuScene::MenuScene(App& app, Services const& services) : Scene(app, services, "Home") { create_ui(); }
diff --git a/src/spaced/spaced/scenes/menu.hpp b/src/spaced/spaced/scenes/menu.hpp
index bfc7694..ec5e437 100644
--- a/src/spaced/spaced/scenes/menu.hpp
+++ b/src/spaced/spaced/scenes/menu.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include <spaced/scene.hpp>
+#include <bave/scene.hpp>
 
 namespace spaced {
-class MenuScene : public Scene {
+class MenuScene : public bave::Scene {
   public:
 	static auto get_text_heights() -> std::vector<bave::TextHeight>;
 
-	explicit MenuScene(bave::App& app, Services const& services);
+	explicit MenuScene(bave::App& app, bave::Services const& services);
 
   private:
 	void create_ui();
diff --git a/src/spaced/spaced/services/audio.hpp b/src/spaced/spaced/services/audio.hpp
deleted file mode 100644
index abe1f90..0000000
--- a/src/spaced/spaced/services/audio.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include <bave/core/random.hpp>
-#include <bave/core/time.hpp>
-#include <spaced/services/service.hpp>
-#include <span>
-#include <string_view>
-
-namespace spaced {
-class IAudio : public IService {
-  public:
-	[[nodiscard]] virtual auto get_sfx_gain() const -> float = 0;
-	virtual void set_sfx_gain(float gain) = 0;
-
-	[[nodiscard]] virtual auto get_music_gain() const -> float = 0;
-	virtual void set_music_gain(float gain) = 0;
-
-	virtual void play_sfx(std::string_view uri) = 0;
-	virtual void play_music(std::string_view uri, bave::Seconds crossfade = 1s) = 0;
-	virtual void stop_music() = 0;
-
-	void play_any_sfx(std::span<std::string const> uris) {
-		if (uris.empty()) { return; }
-		if (uris.size() == 1) { return play_sfx(uris.front()); }
-		auto const index = bave::random_in_range(std::size_t{}, uris.size() - 1);
-		play_sfx(uris[index]);
-	}
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/display.hpp b/src/spaced/spaced/services/display.hpp
deleted file mode 100644
index ce444f1..0000000
--- a/src/spaced/spaced/services/display.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include <bave/graphics/render_view.hpp>
-#include <spaced/services/service.hpp>
-
-namespace spaced {
-class IDisplay : public IService {
-  public:
-	[[nodiscard]] virtual auto get_main_view() const -> bave::RenderView const& = 0;
-	[[nodiscard]] virtual auto get_framebuffer_size() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_world_space() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto unproject(glm::vec2 pointer) const -> glm::vec2 = 0;
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/gamepad_provider.hpp b/src/spaced/spaced/services/gamepad_provider.hpp
index 50e7711..11d9dde 100644
--- a/src/spaced/spaced/services/gamepad_provider.hpp
+++ b/src/spaced/spaced/services/gamepad_provider.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include <bave/input/gamepad.hpp>
-#include <spaced/services/service.hpp>
+#include <bave/services/service.hpp>
 
 namespace spaced {
-class IGamepadProvider : public IService {
+class IGamepadProvider : public bave::IService {
   public:
 	[[nodiscard]] virtual auto get_gamepad() const -> bave::Gamepad const& = 0;
 };
diff --git a/src/spaced/spaced/services/layout.hpp b/src/spaced/spaced/services/layout.hpp
index c3dfcfc..61d8b69 100644
--- a/src/spaced/spaced/services/layout.hpp
+++ b/src/spaced/spaced/services/layout.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include <bave/graphics/rect.hpp>
-#include <spaced/services/service.hpp>
+#include <bave/services/service.hpp>
 
 namespace spaced {
-struct Layout : IService {
+struct Layout : bave::IService {
 	glm::vec2 world_space{};
 	bave::Rect<> play_area{};
 	bave::Rect<> hud_area{};
diff --git a/src/spaced/spaced/services/resources.hpp b/src/spaced/spaced/services/resources.hpp
deleted file mode 100644
index cdd9089..0000000
--- a/src/spaced/spaced/services/resources.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-#include <bave/font/font.hpp>
-#include <bave/graphics/texture.hpp>
-#include <spaced/resource_map.hpp>
-#include <spaced/services/service.hpp>
-#include <memory>
-
-namespace spaced {
-struct Resources : ResourceMap, IService {
-	std::shared_ptr<bave::Font> main_font{};
-	std::shared_ptr<bave::Texture> spinner{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/scene_switcher.hpp b/src/spaced/spaced/services/scene_switcher.hpp
deleted file mode 100644
index 3e26897..0000000
--- a/src/spaced/spaced/services/scene_switcher.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-#include <spaced/scene.hpp>
-#include <spaced/services/service.hpp>
-
-namespace spaced {
-class ISceneSwitcher : public IService {
-  public:
-	virtual void switch_to_scene(std::unique_ptr<Scene> new_scene) = 0;
-
-	template <std::derived_from<Scene> T, typename... Args>
-		requires(std::constructible_from<T, bave::App&, Services const&, Args && ...>)
-	void switch_to(Args&&... args) {
-		switch_to_scene(std::make_unique<T>(get_app(), get_services(), std::forward<Args>(args)...));
-	}
-
-  private:
-	[[nodiscard]] virtual auto get_app() const -> bave::App& = 0;
-	[[nodiscard]] virtual auto get_services() const -> Services const& = 0;
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/serializer.hpp b/src/spaced/spaced/services/serializer.hpp
index 206f12f..b636c7d 100644
--- a/src/spaced/spaced/services/serializer.hpp
+++ b/src/spaced/spaced/services/serializer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/logger.hpp>
+#include <bave/services/service.hpp>
 #include <spaced/serializable.hpp>
-#include <spaced/services/service.hpp>
 #include <functional>
 #include <memory>
 #include <string_view>
@@ -13,7 +13,7 @@ namespace spaced {
 template <typename Type>
 concept SerializableT = std::derived_from<Type, ISerializable>;
 
-class Serializer : public IService {
+class Serializer : public bave::IService {
   public:
 	using Factory = std::function<std::unique_ptr<ISerializable>()>;
 
diff --git a/src/spaced/spaced/services/service.hpp b/src/spaced/spaced/services/service.hpp
deleted file mode 100644
index 653cd52..0000000
--- a/src/spaced/spaced/services/service.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#include <bave/core/polymorphic.hpp>
-
-namespace spaced {
-/// \brief Base class for all services.
-class IService : public bave::Polymorphic {};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/services.hpp b/src/spaced/spaced/services/services.hpp
deleted file mode 100644
index 4c6b43f..0000000
--- a/src/spaced/spaced/services/services.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-#include <bave/core/not_null.hpp>
-#include <bave/core/ptr.hpp>
-#include <spaced/services/service.hpp>
-#include <memory>
-#include <mutex>
-#include <typeindex>
-#include <unordered_map>
-
-namespace spaced {
-/// \brief Concept constraining Type to a subclass of IService.
-template <typename Type>
-concept ServiceT = std::derived_from<Type, IService>;
-
-/// \brief Container of stored services.
-///
-/// Intended usage:
-/// 1. Own an instance in main / app Driver.
-/// 2. Bind services to subclasses. (From and To being the same type is also OK.)
-/// 3. Pass a const reference of Services to dependencies
-/// Point 3 ensures dependencies cannot bind new / remove existing services,
-/// but can locate and use already bound ones.
-class Services {
-  public:
-	/// \brief Bind a service instance to a type (From).
-	/// \param service Concrete instance of service to bind.
-	/// \pre service must not be null, From must not already be bound.
-	template <ServiceT From, std::derived_from<From> To>
-	void bind(std::unique_ptr<To> service) {
-		if (!service) { throw std::runtime_error{"Attempt to bind null service"}; }
-		static auto const index = std::type_index{typeid(From)};
-		auto lock = std::scoped_lock{m_mutex};
-		if (m_services.contains(index)) { throw std::runtime_error{"Attempt to bind duplicate service"}; }
-		m_services.insert_or_assign(index, std::move(service));
-	}
-
-	/// \brief Remove a bound service instance. Type need not actually be bound.
-	template <ServiceT Type>
-	void remove() {
-		static auto const index = std::type_index{typeid(Type)};
-		auto lock = std::scoped_lock{m_mutex};
-		m_services.erase(index);
-	}
-
-	/// \brief Remove all bound service instances.
-	void remove_all() {
-		auto lock = std::scoped_lock{m_mutex};
-		m_services.clear();
-	}
-
-	/// \brief Check if a service is bound.
-	/// \returns true if bound.
-	template <ServiceT Type>
-	[[nodiscard]] auto contains() const -> bool {
-		return find<Type>() != nullptr;
-	}
-
-	/// \brief Locate a service instance if bound.
-	/// \returns Pointer to service instance if bound, else nullptr.
-	template <ServiceT Type>
-	[[nodiscard]] auto find() const -> bave::Ptr<Type> {
-		static auto const index = std::type_index{typeid(Type)};
-		auto lock = std::scoped_lock{m_mutex};
-		if (auto const it = m_services.find(index); it != m_services.end()) { return static_cast<Type*>(it->second.get()); }
-		return {};
-	}
-
-	/// \brief Obtain a bound service.
-	/// \returns Mutable reference to bound service.
-	/// \pre Type must be bound.
-	template <ServiceT Type>
-	[[nodiscard]] auto get() const -> Type& {
-		auto ret = find<Type>();
-		if (!ret) { throw std::runtime_error{"Service not found"}; }
-		return *ret;
-	}
-
-	/// \brief Obtain the count of bound services.
-	/// \returns Count of bound services.
-	[[nodiscard]] auto size() const -> std::size_t {
-		auto lock = std::scoped_lock{m_mutex};
-		return m_services.size();
-	}
-
-  private:
-	std::unordered_map<std::type_index, std::unique_ptr<IService>> m_services{};
-	mutable std::mutex m_mutex{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/stats.hpp b/src/spaced/spaced/services/stats.hpp
index 682901f..ed4d037 100644
--- a/src/spaced/spaced/services/stats.hpp
+++ b/src/spaced/spaced/services/stats.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <spaced/services/service.hpp>
+#include <bave/services/service.hpp>
 #include <cstdint>
 
 namespace dj {
@@ -7,7 +7,7 @@ class Json;
 }
 
 namespace spaced {
-struct Stats : IService {
+struct Stats : bave::IService {
 	struct {
 		std::int64_t play_count{};
 	} game{};
diff --git a/src/spaced/spaced/services/styles.cpp b/src/spaced/spaced/services/styles.cpp
deleted file mode 100644
index 1601e2c..0000000
--- a/src/spaced/spaced/services/styles.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-#include <bave/io/json_io.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/util.hpp>
-
-namespace spaced {
-namespace {
-using bave::from_json;
-using bave::Rgba;
-
-class StylesLoader {
-  public:
-	StringMap<Rgba> const& rgbas; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
-
-	template <typename Type>
-	void load(StringMap<Type>& out, dj::Json const& json) const {
-		for (auto const& [id, in_style] : json.object_view()) {
-			if (id.empty()) { continue; }
-			auto out_style = Type{};
-			from(in_style, out_style);
-			out.insert_or_assign(std::string{id}, out_style);
-		}
-	}
-
-	template <typename Type>
-	void from(dj::Json const& json, Type& out) const {
-		from_json(json, out);
-	}
-
-	void from(dj::Json const& json, Rgba& out) const {
-		auto const str = json.as_string();
-		if (str.starts_with('#')) {
-			from_json(json, out);
-		} else {
-			out = rgbas[str];
-		}
-	}
-
-	void from(dj::Json const& json, ui::LoadingScreenStyle& out) const {
-		from(json["background_tint"], out.background_tint);
-		auto const& spinner = json["spinner"];
-		from(spinner["size"], out.spinner.size);
-		from(spinner["spin_rate"], out.spinner.spin_rate.value);
-		auto const& progress_bar = json["progress_bar"];
-		from(progress_bar["n_width"], out.progress_bar.n_width);
-		from(progress_bar["height"], out.progress_bar.height);
-		from(progress_bar["bottom_offset"], out.progress_bar.bottom_offset);
-		from(progress_bar["padding"], out.progress_bar.padding);
-	}
-
-	void from(dj::Json const& json, ui::ButtonStyle::Tint& out) const {
-		from(json["idle"], out[ui::ButtonState::eIdle]);
-		from(json["hover"], out[ui::ButtonState::eHover]);
-		from(json["press"], out[ui::ButtonState::ePress]);
-	}
-
-	void from(dj::Json const& json, ui::ButtonStyle& out) const {
-		from(json["background"], out.background);
-		from(json["outline"], out.outline);
-		from(json["text"], out.text);
-		from(json["outline_width"], out.outline_width);
-		from(json["corner_ratio"], out.corner_ratio);
-	}
-
-	void from(dj::Json const& json, ui::ProgressBarStyle& out) const {
-		from(json["background"], out.background);
-		from(json["fill"], out.fill);
-		from(json["corner_ratio"], out.corner_ratio);
-		from(json["padding"], out.padding);
-	}
-
-	void from(dj::Json const& json, ui::DialogStyle& out) const {
-		from(json["footer_padding"], out.footer_padding);
-		from(json["corner_ratio"], out.corner_ratio);
-		from(json["background_tint"], out.background_tint);
-		from(json["outline_tint"], out.outline_tint);
-		from(json["content_text_tint"], out.content_text_tint);
-	}
-
-	void from(dj::Json const& json, ui::SliderStyle& out) const {
-		from(json["progress_bar"], out.progress_bar);
-		from(json["knob_diameter"], out.knob_diameter);
-		from(json["knob_tint"], out.knob_tint);
-	}
-};
-} // namespace
-
-namespace {
-using bave::to_json;
-using util::to_json;
-
-template <typename Type>
-void save_styles(StringMap<Type> const& styles, dj::Json& out, std::string_view const key) {
-	auto out_styles = dj::Json{};
-	for (auto const& [id, button_style] : styles) {
-		if (id.empty()) { continue; }
-		to_json(out_styles[id], button_style);
-	}
-	if (out_styles) { out[key] = std::move(out_styles); }
-}
-} // namespace
-
-auto Styles::load(dj::Json const& json) -> Styles {
-	auto ret = Styles{};
-	auto const loader = StylesLoader{ret.rgbas};
-	loader.load(ret.rgbas, json["rgbas"]);
-	loader.load(ret.buttons, json["buttons"]);
-	loader.load(ret.progress_bars, json["progress_bars"]);
-	loader.load(ret.dialogs, json["dialogs"]);
-	loader.load(ret.sliders, json["sliders"]);
-	if (auto const& loading_screen = json["loading_screen"]) { loader.from(loading_screen, ret.loading_screen); }
-	return ret;
-}
-
-auto Styles::save() const -> dj::Json {
-	auto ret = dj::Json{};
-	save_styles(rgbas, ret, "rgbas");
-	save_styles(buttons, ret, "buttons");
-	save_styles(progress_bars, ret, "progress_bars");
-	save_styles(dialogs, ret, "dialogs");
-	save_styles(sliders, ret, "sliders");
-	to_json(ret["loading_screen"], loading_screen);
-	return ret;
-}
-} // namespace spaced
diff --git a/src/spaced/spaced/services/styles.hpp b/src/spaced/spaced/services/styles.hpp
deleted file mode 100644
index 32a8d8a..0000000
--- a/src/spaced/spaced/services/styles.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-#include <spaced/services/service.hpp>
-#include <spaced/string_map.hpp>
-#include <spaced/ui/style.hpp>
-
-namespace dj {
-class Json;
-}
-
-namespace spaced {
-struct Styles : IService {
-	StringMap<bave::Rgba> rgbas{};
-	StringMap<ui::ButtonStyle> buttons{};
-	StringMap<ui::ProgressBarStyle> progress_bars{};
-	StringMap<ui::DialogStyle> dialogs{};
-	StringMap<ui::SliderStyle> sliders{};
-	ui::LoadingScreenStyle loading_screen{};
-
-	static auto load(dj::Json const& json) -> Styles;
-
-	[[nodiscard]] auto save() const -> dj::Json;
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/spaced.cpp b/src/spaced/spaced/spaced.cpp
index ff64f98..7db77e3 100644
--- a/src/spaced/spaced/spaced.cpp
+++ b/src/spaced/spaced/spaced.cpp
@@ -2,16 +2,15 @@
 #include <bave/io/json_io.hpp>
 #include <bave/loader.hpp>
 #include <bave/persistor.hpp>
+#include <bave/services/audio.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/prefs.hpp>
 #include <spaced/scenes/load_assets.hpp>
-#include <spaced/services/audio.hpp>
 #include <spaced/services/gamepad_provider.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/scene_switcher.hpp>
 #include <spaced/services/serializer.hpp>
 #include <spaced/services/stats.hpp>
-#include <spaced/services/styles.hpp>
 #include <spaced/spaced.hpp>
 
 namespace spaced {
@@ -21,13 +20,17 @@ using bave::AudioClip;
 using bave::AudioDevice;
 using bave::AudioStreamer;
 using bave::Gamepad;
+using bave::IAudio;
+using bave::IDisplay;
 using bave::Loader;
 using bave::NotNull;
 using bave::Persistor;
 using bave::Rect;
 using bave::RenderDevice;
 using bave::RenderView;
+using bave::Resources;
 using bave::Seconds;
+using bave::Styles;
 
 struct GamepadProvider : IGamepadProvider {
 	bave::App& app; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
@@ -37,35 +40,6 @@ struct GamepadProvider : IGamepadProvider {
 	[[nodiscard]] auto get_gamepad() const -> Gamepad const& final { return app.get_most_recent_gamepad(); }
 };
 
-struct Audio : IAudio {
-	NotNull<AudioDevice*> audio_device;
-	NotNull<AudioStreamer*> audio_streamer;
-	NotNull<Resources const*> resources;
-
-	explicit Audio(NotNull<AudioDevice*> audio_device, NotNull<AudioStreamer*> audio_streamer, NotNull<Resources const*> resources)
-		: audio_device(audio_device), audio_streamer(audio_streamer), resources(resources) {}
-
-	[[nodiscard]] auto get_sfx_gain() const -> float final { return audio_device->sfx_gain; }
-	void set_sfx_gain(float const gain) final { audio_device->sfx_gain = gain; }
-
-	[[nodiscard]] auto get_music_gain() const -> float final { return audio_streamer->gain; }
-	void set_music_gain(float const gain) final { audio_streamer->gain = gain; }
-
-	void play_sfx(std::string_view const uri) final {
-		auto const clip = resources->get<AudioClip>(uri);
-		if (!clip) { return; }
-		audio_device->play_once(*clip);
-	}
-
-	void play_music(std::string_view const uri, Seconds const crossfade) final {
-		auto const clip = resources->get<AudioClip>(uri);
-		if (!clip) { return; }
-		audio_streamer->play(clip, crossfade);
-	}
-
-	void stop_music() final { audio_streamer->stop(); }
-};
-
 struct PersistentStats : Stats {
 	static constexpr std::string_view uri_v{"spaced/stats.json"};
 
diff --git a/src/spaced/spaced/spaced.hpp b/src/spaced/spaced/spaced.hpp
index 4d13df5..e534ef8 100644
--- a/src/spaced/spaced/spaced.hpp
+++ b/src/spaced/spaced/spaced.hpp
@@ -1,14 +1,16 @@
 #pragma once
 #include <bave/driver.hpp>
-#include <spaced/game_driver.hpp>
-#include <spaced/services/services.hpp>
+#include <bave/game_driver.hpp>
+
+namespace bave {
+struct Resources;
+}
 
 namespace spaced {
 class Serializer;
-struct Resources;
 struct SceneSwitcher;
 
-class Spaced : public GameDriver {
+class Spaced : public bave::GameDriver {
   public:
 	explicit Spaced(bave::App& app);
 
@@ -22,6 +24,6 @@ class Spaced : public GameDriver {
 	void set_scene();
 
 	bave::Logger m_log{"Spaced"};
-	bave::Ptr<Resources> m_resources{};
+	bave::Ptr<bave::Resources> m_resources{};
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/string_map.hpp b/src/spaced/spaced/string_map.hpp
deleted file mode 100644
index 079af0e..0000000
--- a/src/spaced/spaced/string_map.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-#include <bave/core/string_hash.hpp>
-#include <unordered_map>
-
-namespace spaced {
-template <typename ValueType>
-class StringMap : public std::unordered_map<std::string, ValueType, bave::StringHash, std::equal_to<>> {
-  public:
-	[[nodiscard]] auto get_or(std::string_view const key, ValueType const& fallback) const -> ValueType {
-		if (auto const it = this->find(key); it != this->end()) { return it->second; }
-		return fallback;
-	}
-
-	[[nodiscard]] auto get(std::string_view const key) const -> ValueType
-		requires(std::is_default_constructible_v<ValueType>)
-	{
-		return get_or(key, ValueType{});
-	}
-
-	[[nodiscard]] auto operator[](std::string_view const key) const -> ValueType
-		requires(std::is_default_constructible_v<ValueType>)
-	{
-		return get(key);
-	}
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/ui/button.cpp b/src/spaced/spaced/ui/button.cpp
deleted file mode 100644
index 75f4356..0000000
--- a/src/spaced/spaced/ui/button.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <spaced/services/layout.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/button.hpp>
-#include <algorithm>
-
-namespace spaced::ui {
-using bave::Action;
-using bave::MouseButton;
-using bave::PointerId;
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::RoundedQuad;
-using bave::Seconds;
-using bave::Shader;
-using bave::TextHeight;
-
-Button::Button(Services const& services) : m_display(&services.get<IDisplay>()), m_styles(&services.get<Styles>()) {
-	m_text.set_font(services.get<Resources>().main_font);
-	set_text_height(TextHeight::eDefault);
-	set_style(m_styles->buttons["default"]);
-}
-
-void Button::set_position(glm::vec2 const position) {
-	m_background.set_position(position);
-	m_text.transform.position = position;
-	reposition_text();
-}
-
-void Button::set_scale(glm::vec2 const scale) {
-	m_background.set_scale(scale);
-	m_text.transform.scale = scale;
-}
-
-void Button::set_font(std::shared_ptr<bave::Font> font) {
-	m_text.set_font(std::move(font));
-	resize_background();
-}
-
-void Button::set_text(std::string text, bool const resize) {
-	m_text.set_string(std::move(text));
-	if (resize) { resize_background(); }
-}
-
-void Button::set_text_height(TextHeight const height, bool const resize) {
-	m_text.set_height(height);
-	if (resize) { resize_background(); }
-	reposition_text();
-}
-
-void Button::set_size(glm::vec2 const size) {
-	auto const ratio = std::clamp(m_style.corner_ratio, 0.0f, 0.5f);
-	auto quad = RoundedQuad{};
-	quad.size = glm::max(size, min_size_v);
-	quad.corner_resolution = 16;
-	m_background.set_size(glm::max(size, min_size_v));
-	m_background.set_corner_resolution(16);
-	m_background.set_corner_ratio(ratio);
-	m_background.set_outline_width(m_style.outline_width);
-}
-
-void Button::set_style(Style const& style) {
-	m_style = style;
-	resize_background();
-}
-
-void Button::on_move(PointerMove const& pointer_move) {
-	if (pointer_move.pointer.id != PointerId::ePrimary) { return; }
-	auto const position = m_display->unproject(pointer_move.pointer.position);
-	if (m_hitbox.contains(position)) {
-		m_state = State::eHover;
-	} else {
-		m_state = State::eIdle;
-	}
-}
-
-void Button::on_tap(PointerTap const& pointer_tap) {
-	if (pointer_tap.pointer.id != PointerId::ePrimary || pointer_tap.button != MouseButton::eLeft) { return; }
-
-	auto const position = m_display->unproject(pointer_tap.pointer.position);
-	if (!m_hitbox.contains(position)) {
-		m_state = State::eIdle;
-		return;
-	}
-
-	if (pointer_tap.action == Action::ePress) {
-		m_state = State::ePress;
-		return;
-	}
-
-	if (pointer_tap.action == Action::eRelease) {
-		m_state = State::eHover;
-		if (callback) { callback(); }
-	}
-}
-
-void Button::tick(Seconds const /*dt*/) {
-	m_hitbox = m_background.get_background().get_bounds();
-
-	m_background.set_outline_tint(m_style.outline[m_state]);
-	m_background.set_tint(m_style.background[m_state]);
-	m_text.tint = m_style.text[m_state];
-}
-
-void Button::draw(Shader& shader) const {
-	m_background.draw(shader);
-	m_text.draw(shader);
-}
-
-void Button::resize_background() { set_size(glm::vec2{1.2f, 2.5f} * m_text.get_bounds().size()); }
-
-void Button::reposition_text() { m_text.transform.position.y -= 0.33f * static_cast<float>(m_text.get_height()); }
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/button.hpp b/src/spaced/spaced/ui/button.hpp
deleted file mode 100644
index 62124fc..0000000
--- a/src/spaced/spaced/ui/button.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-#include <bave/graphics/text.hpp>
-#include <spaced/services/display.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/style.hpp>
-#include <spaced/ui/widget.hpp>
-#include <functional>
-
-namespace spaced::ui {
-class Button : public IWidget {
-  public:
-	using State = ButtonState;
-	using Style = ButtonStyle;
-
-	static constexpr auto min_size_v = glm::vec2{200.0f, 50.0f};
-
-	explicit Button(Services const& services);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final { return m_background.get_size(); }
-	void set_position(glm::vec2 position) final;
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return m_background.get_position(); }
-
-	void set_scale(glm::vec2 scale);
-	void set_font(std::shared_ptr<bave::Font> font);
-	void set_text(std::string text, bool resize = true);
-	void set_text_height(bave::TextHeight height, bool resize = true);
-	void set_size(glm::vec2 size);
-
-	[[nodiscard]] auto get_style() const -> Style { return m_style; }
-	void set_style(Style const& style);
-
-	[[nodiscard]] auto get_scale() const -> glm::vec2 { return m_background.get_background().transform.scale; }
-	[[nodiscard]] auto get_text() const -> std::string_view { return m_text.get_string(); }
-
-	[[nodiscard]] auto get_state() const -> State { return m_state; }
-
-	std::function<void()> callback{};
-
-  private:
-	void on_move(bave::PointerMove const& pointer_move) final;
-	void on_tap(bave::PointerTap const& pointer_tap) final;
-	void tick(bave::Seconds dt) final;
-	void draw(bave::Shader& shader) const final;
-
-	void resize_background();
-	void reposition_text();
-
-	bave::NotNull<IDisplay const*> m_display;
-	bave::NotNull<Styles const*> m_styles;
-
-	OutlineQuad m_background{};
-	bave::Text m_text{};
-
-	State m_state{};
-	Style m_style{};
-	bave::Rect<> m_hitbox{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/dialog.cpp b/src/spaced/spaced/ui/dialog.cpp
deleted file mode 100644
index 75c445b..0000000
--- a/src/spaced/spaced/ui/dialog.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/dialog.hpp>
-
-namespace spaced::ui {
-Dialog::Dialog(Services const& services, CreateInfo create_info) : View(services), m_style(services.get<Styles>().dialogs["default"]) {
-	auto main_button = std::make_unique<Button>(services);
-	auto const footer_height = main_button->get_size().y + m_style.footer_padding.y;
-	auto const footer_position = glm::vec2{0.0f, -0.5f * (create_info.size.y - footer_height)};
-
-	auto background = std::make_unique<OutlineQuad>();
-	background->set_size({create_info.size.x, create_info.size.y + footer_height});
-	background->set_tint(m_style.background_tint);
-	background->set_outline_tint(m_style.outline_tint);
-	background->set_corner_ratio(0.25f);
-	push(std::move(background));
-
-	auto content_text = std::make_unique<Text>(services);
-	content_text->text.set_string(std::move(create_info.content_text));
-	content_text->text.set_height(text_height_v);
-	content_text->text.tint = m_style.content_text_tint;
-	push(std::move(content_text));
-
-	main_button->set_text(std::move(create_info.main_button.text));
-	main_button->callback = [this, f = std::move(create_info.main_button.callback)] {
-		if (f) { f(); }
-		set_destroyed();
-	};
-	if (create_info.second_button.text.empty()) {
-		main_button->set_position(footer_position);
-	} else {
-		auto const x_offset = -0.5f * (create_info.size.x - main_button->get_size().x) + m_style.footer_padding.x;
-		main_button->set_position({footer_position.x + x_offset, footer_position.y});
-	}
-	push(std::move(main_button));
-
-	if (!create_info.second_button.text.empty()) {
-		auto second_button = std::make_unique<Button>(services);
-		second_button->set_text(std::move(create_info.second_button.text));
-		second_button->callback = [this, f = std::move(create_info.second_button.callback)] {
-			if (f) { f(); }
-			set_destroyed();
-		};
-		auto const x_offset = 0.5f * (create_info.size.x - second_button->get_size().x) - m_style.footer_padding.x;
-		second_button->set_position({footer_position.x + x_offset, footer_position.y});
-		push(std::move(second_button));
-	}
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/dialog.hpp b/src/spaced/spaced/ui/dialog.hpp
deleted file mode 100644
index 72d0533..0000000
--- a/src/spaced/spaced/ui/dialog.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/text.hpp>
-#include <spaced/ui/view.hpp>
-
-namespace spaced::ui {
-struct DialogCreateInfo {
-	struct ButtonInfo {
-		std::string text{};
-		std::function<void()> callback{};
-	};
-
-	glm::vec2 size{500.0f, 200.0f};
-	std::string content_text{"Content text."};
-	ButtonInfo main_button{.text = "OK"};
-	ButtonInfo second_button{};
-};
-
-class Dialog : public ui::View {
-  public:
-	using CreateInfo = DialogCreateInfo;
-
-	static constexpr auto text_height_v = bave::TextHeight{static_cast<int>(bave::TextHeight::eDefault) + 16};
-
-	explicit Dialog(Services const& services, CreateInfo create_info = {});
-
-  protected:
-	DialogStyle m_style{};
-
-	bave::Ptr<OutlineQuad> m_background{};
-	bave::Ptr<Text> m_content_text{};
-	std::array<bave::Ptr<ui::Button>, 2> m_footer_buttons{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/element.hpp b/src/spaced/spaced/ui/element.hpp
deleted file mode 100644
index c6fd879..0000000
--- a/src/spaced/spaced/ui/element.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-#include <bave/graphics/drawable.hpp>
-
-namespace spaced::ui {
-class IElement : public bave::IDrawable {
-  public:
-	[[nodiscard]] virtual auto get_size() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_position() const -> glm::vec2 = 0;
-	virtual void set_position(glm::vec2 position) = 0;
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/list_box.hpp b/src/spaced/spaced/ui/list_box.hpp
deleted file mode 100644
index 259848d..0000000
--- a/src/spaced/spaced/ui/list_box.hpp
+++ /dev/null
@@ -1,201 +0,0 @@
-#pragma once
-#include <bave/graphics/drawable.hpp>
-#include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/widget.hpp>
-
-namespace spaced::ui {
-enum class ListBoxDir : int { eHorz, eVert };
-
-template <std::derived_from<IElement> Type>
-class ListBox : public IWidget {
-  public:
-	using Dir = ListBoxDir;
-
-	explicit ListBox(Services const& services, Dir dir = Dir::eHorz) : m_layout(&services.get<ILayout>()), m_dir(dir) {}
-
-	void push_back(Type item) {
-		m_items.push_back(std::move(item));
-		switch (m_dir) {
-		case Dir::eHorz: rearrange_horz(); break;
-		case Dir::eVert: rearrange_vert(); break;
-		}
-	}
-
-	void clear() { m_items.clear(); }
-
-	void shift_items(glm::vec2 delta) {
-		if (m_items.empty()) { return; }
-		switch (m_dir) {
-		default:
-		case Dir::eHorz: delta.y = 0.0f; break;
-		case Dir::eVert: delta.x = 0.0f; break;
-		}
-		delta = glm::clamp(delta, get_min_delta(), get_max_delta());
-		for (auto& item : m_items) { item.set_position(item.get_position() + delta); }
-	}
-
-	[[nodiscard]] auto get_items() const -> std::span<Type const> { return m_items; }
-	[[nodiscard]] auto get_items() -> std::span<Type> { return m_items; }
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 override { return background.get_size(); }
-	[[nodiscard]] auto get_position() const -> glm::vec2 override { return m_position; }
-
-	void set_position(glm::vec2 const position) override {
-		auto const delta = position - m_position;
-		background.set_position(position);
-		for (auto& item : m_items) { item.set_position(item.get_position() + delta); }
-		m_position = position;
-	}
-
-	void on_move(bave::PointerMove const& pointer_move) override {
-		if (m_drag_pos) {
-			auto const delta = pointer_move.pointer.position - *m_drag_pos;
-			shift_items(m_layout->project_to_world(delta));
-			m_drag_pos = pointer_move.pointer.position;
-			m_dragging = true;
-			return;
-		}
-		if constexpr (std::derived_from<Type, IWidget>) {
-			for (auto& item : m_items) { item.on_move(pointer_move); }
-		}
-	}
-
-	void on_tap(bave::PointerTap const& pointer_tap) override {
-		auto was_dragging = m_dragging;
-		if (pointer_tap.pointer.id == bave::PointerId::ePrimary && pointer_tap.button == bave::MouseButton::eLeft) {
-			switch (pointer_tap.action) {
-			case bave::Action::ePress: {
-				if (background.get_background().get_bounds().contains(m_layout->unproject(pointer_tap.pointer.position))) {
-					m_drag_pos = pointer_tap.pointer.position;
-				}
-				break;
-			}
-			case bave::Action::eRelease: {
-				m_drag_pos.reset();
-				m_dragging = false;
-				break;
-			}
-			default: break;
-			}
-		}
-		if (was_dragging) { return; }
-		if constexpr (std::derived_from<Type, IWidget>) {
-			for (auto& item : m_items) { item.on_tap(pointer_tap); }
-		}
-	}
-
-	void tick(bave::Seconds dt) override {
-		if constexpr (std::derived_from<Type, IWidget>) {
-			for (auto& item : m_items) { item.tick(dt); }
-		}
-	}
-
-	void draw(bave::Shader& shader) const override {
-		background.draw(shader);
-		auto const& collect_bg = background.get_background();
-		auto const collect_rect = bave::Rect<>::from_size(collect_bg.get_shape().size, collect_bg.transform.position);
-		auto render_view = m_layout->get_main_view();
-		render_view.n_scissor = render_view.to_n_scissor(collect_rect);
-		shader.set_render_view(render_view);
-		for (auto const& item : m_items) { item.draw(shader); }
-		render_view.n_scissor = bave::uv_rect_v;
-		shader.set_render_view(render_view);
-	}
-
-	OutlineQuad background{};
-	float item_pad{100.0f};
-
-  protected:
-	[[nodiscard]] auto get_min_delta() const -> glm::vec2 {
-		switch (m_dir) {
-		default:
-		case Dir::eHorz: return m_position - m_items.back().get_position();
-		case Dir::eVert: return m_position - m_items.front().get_position();
-		}
-	}
-
-	[[nodiscard]] auto get_max_delta() const -> glm::vec2 {
-		switch (m_dir) {
-		default:
-		case Dir::eHorz: return m_position - m_items.front().get_position();
-		case Dir::eVert: return m_position - m_items.back().get_position();
-		}
-	}
-
-	void rearrange_horz() {
-		if (m_items.size() == 1) {
-			m_items.front().set_position(background.get_position());
-			return;
-		}
-
-		auto const items_width = [&] {
-			auto ret = float{};
-			auto first = true;
-			for (auto const& item : m_items) {
-				ret += item.get_size().x;
-				if (!first) { ret += item_pad; }
-				first = false;
-			}
-			return ret;
-		}();
-		auto const bg_width = background.get_size().x;
-
-		auto pos = background.get_position();
-		pos.x += -0.5f * bg_width;
-		for (auto& item : m_items) {
-			auto const half_width = 0.5f * item.get_size().x;
-			pos.x += half_width;
-			item.set_position(pos);
-			pos.x += half_width + item_pad;
-		}
-		if (items_width > bg_width) {
-			shift_items({item_pad, 0.0f});
-		} else {
-			shift_items({0.5f * (bg_width - items_width), 0.0f});
-		}
-	}
-
-	void rearrange_vert() {
-		if (m_items.size() == 1) {
-			m_items.front().set_position(background.get_position());
-			return;
-		}
-
-		auto const items_height = [&] {
-			auto ret = float{};
-			auto first = true;
-			for (auto const& item : m_items) {
-				ret += item.get_size().y;
-				if (!first) { ret += item_pad; }
-				first = false;
-			}
-			return ret;
-		}();
-		auto const bg_height = background.get_size().y;
-
-		auto pos = background.get_position();
-		pos.y += 0.5f * bg_height;
-		for (auto& item : m_items) {
-			auto const half_height = 0.5f * item.get_size().y;
-			pos.y -= half_height;
-			item.set_position(pos);
-			pos.y -= half_height + item_pad;
-		}
-		if (items_height > bg_height) {
-			shift_items({0.0f, -item_pad});
-		} else {
-			shift_items({0.0f, -0.5f * (bg_height - items_height)});
-		}
-	}
-
-	bave::NotNull<ILayout const*> m_layout;
-	Dir m_dir;
-
-	std::vector<Type> m_items{};
-	glm::vec2 m_position{};
-	std::optional<glm::vec2> m_drag_pos{};
-	bool m_dragging{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/loading_screen.cpp b/src/spaced/spaced/ui/loading_screen.cpp
deleted file mode 100644
index 5e88a36..0000000
--- a/src/spaced/spaced/ui/loading_screen.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <spaced/services/resources.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/loading_screen.hpp>
-
-namespace spaced::ui {
-using bave::Seconds;
-using bave::Shader;
-
-LoadingScreen::LoadingScreen(Services const& services)
-	: m_display(&services.get<IDisplay>()), m_style(services.get<Styles>().loading_screen), m_progress_bar(services) {
-	auto const world_space = m_display->get_world_space();
-
-	m_background.set_size(1.1f * world_space);
-	m_background.tint = m_style.background_tint;
-
-	m_spinner.set_size(m_style.spinner.size);
-	m_spinner.set_texture(services.get<Resources>().spinner);
-
-	m_progress_bar.size = {m_style.progress_bar.n_width * world_space.x, m_style.progress_bar.height};
-	m_progress_bar.position.y = -0.5f * world_space.y + m_style.progress_bar.bottom_offset;
-	auto style = m_progress_bar.get_style();
-	style.padding = m_style.progress_bar.padding;
-	m_progress_bar.set_style(style);
-}
-
-void LoadingScreen::update(Seconds const dt, float const progress) {
-	m_progress_bar.set_progress(progress);
-
-	bave::Degrees rotation = m_spinner.transform.rotation;
-	rotation.value -= m_style.spinner.spin_rate.value * dt.count();
-	m_spinner.transform.rotation = rotation;
-}
-
-void LoadingScreen::draw(Shader& shader) const {
-	shader.set_render_view(m_display->get_main_view());
-	m_background.draw(shader);
-	m_spinner.draw(shader);
-	m_progress_bar.draw(shader);
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/loading_screen.hpp b/src/spaced/spaced/ui/loading_screen.hpp
deleted file mode 100644
index 180f217..0000000
--- a/src/spaced/spaced/ui/loading_screen.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-#include <bave/core/time.hpp>
-#include <bave/graphics/sprite.hpp>
-#include <spaced/services/display.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/progress_bar.hpp>
-
-namespace spaced::ui {
-class LoadingScreen {
-  public:
-	explicit LoadingScreen(Services const& services);
-
-	void update(bave::Seconds dt, float progress);
-	void draw(bave::Shader& shader) const;
-
-  private:
-	bave::NotNull<IDisplay const*> m_display;
-	LoadingScreenStyle m_style{};
-	bave::Sprite m_background{};
-	bave::Sprite m_spinner{};
-	ProgressBar m_progress_bar;
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/outline_quad.cpp b/src/spaced/spaced/ui/outline_quad.cpp
deleted file mode 100644
index dae00bc..0000000
--- a/src/spaced/spaced/ui/outline_quad.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <spaced/ui/outline_quad.hpp>
-
-namespace spaced::ui {
-using bave::Rgba;
-using bave::RoundedQuad;
-using bave::Shader;
-
-void OutlineQuad::draw(Shader& shader) const {
-	m_outline.draw(shader);
-	m_quad.draw(shader);
-}
-
-void OutlineQuad::set_size(glm::vec2 const size) {
-	set_quad_and_outline([size, this](RoundedQuad& quad, RoundedQuad& outline) {
-		quad.size = size;
-		quad.corner_radius = m_corner_ratio * std::min(quad.size.x, quad.size.y);
-		outline.size = size + m_outline_width;
-		outline.corner_radius = m_corner_ratio * std::min(outline.size.x, outline.size.y);
-	});
-}
-
-void OutlineQuad::set_position(glm::vec2 const position) { m_quad.transform.position = m_outline.transform.position = position; }
-
-void OutlineQuad::set_scale(glm::vec2 const scale) { m_quad.transform.scale = m_outline.transform.scale = scale; }
-
-void OutlineQuad::set_corner_ratio(float const ratio) {
-	m_corner_ratio = ratio;
-	set_size(m_quad.get_shape().size);
-}
-
-void OutlineQuad::set_corner_resolution(int const resolution) {
-	set_quad_and_outline([resolution](RoundedQuad& quad, RoundedQuad& outline) { quad.corner_resolution = outline.corner_resolution = resolution; });
-}
-
-void OutlineQuad::set_outline_width(float const width) {
-	m_outline_width = width;
-	set_size(m_quad.get_shape().size);
-}
-
-void OutlineQuad::set_outline_tint(Rgba const tint) { m_outline.tint = tint; }
-
-void OutlineQuad::set_tint(Rgba const tint) { m_quad.tint = tint; }
-
-template <typename F>
-void OutlineQuad::set_quad_and_outline(F func) {
-	auto quad_shape = m_quad.get_shape();
-	auto outline_shape = m_outline.get_shape();
-	func(quad_shape, outline_shape);
-	m_quad.set_shape(quad_shape);
-	m_outline.set_shape(outline_shape);
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/outline_quad.hpp b/src/spaced/spaced/ui/outline_quad.hpp
deleted file mode 100644
index 808e715..0000000
--- a/src/spaced/spaced/ui/outline_quad.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-#include <bave/graphics/shape.hpp>
-#include <spaced/ui/element.hpp>
-
-namespace spaced::ui {
-class OutlineQuad : public IElement {
-  public:
-	OutlineQuad() { set_size(bave::Quad::size_v); }
-
-	void draw(bave::Shader& shader) const final;
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final { return m_quad.get_shape().size; }
-	void set_size(glm::vec2 size);
-
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return m_quad.transform.position; }
-	void set_position(glm::vec2 position) final;
-
-	void set_scale(glm::vec2 scale);
-
-	void set_corner_ratio(float ratio);
-	void set_corner_resolution(int resolution);
-	void set_outline_width(float width);
-	void set_outline_tint(bave::Rgba tint);
-	void set_tint(bave::Rgba tint);
-
-	[[nodiscard]] auto get_background() const -> bave::RoundedQuadShape const& { return m_quad; }
-	[[nodiscard]] auto get_outline() const -> bave::RoundedQuadShape const& { return m_outline; }
-
-  private:
-	template <typename F>
-	void set_quad_and_outline(F func);
-
-	bave::RoundedQuadShape m_quad{};
-	bave::RoundedQuadShape m_outline{};
-	float m_outline_width{10.0f};
-	float m_corner_ratio{0.0f};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/progress_bar.cpp b/src/spaced/spaced/ui/progress_bar.cpp
deleted file mode 100644
index 556a788..0000000
--- a/src/spaced/spaced/ui/progress_bar.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/progress_bar.hpp>
-
-namespace spaced::ui {
-using bave::Shader;
-
-ProgressBar::ProgressBar(Services const& services) : m_style(services.get<Styles>().progress_bars["default"]) {}
-
-void ProgressBar::set_progress(float const progress) {
-	m_progress = progress;
-	auto const width = (1.0f - progress) * size.x;
-
-	auto bg_size = size;
-	bg_size.x += m_style.corner_ratio * bg_size.y;
-	auto quad = bave::RoundedQuad{};
-	quad.size = bg_size;
-	quad.corner_radius = m_style.corner_ratio * std::min(bg_size.x, bg_size.y);
-	m_background.set_shape(quad);
-
-	quad.size = size - m_style.padding;
-	quad.corner_radius = 0.0f;
-	quad.size.x = width;
-	m_fill.set_shape(quad);
-
-	m_background.tint = m_style.background;
-	m_fill.tint = m_style.fill;
-
-	m_fill.tint.channels.w = 0xff;
-
-	m_background.transform.position = m_fill.transform.position = position;
-	m_fill.transform.position.x += 0.5f * (size.x - width);
-}
-
-void ProgressBar::set_style(Style style) {
-	m_style = style;
-	set_progress(m_progress);
-}
-
-void ProgressBar::draw(Shader& shader) const {
-	m_background.draw(shader);
-	m_fill.draw(shader);
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/progress_bar.hpp b/src/spaced/spaced/ui/progress_bar.hpp
deleted file mode 100644
index b86037f..0000000
--- a/src/spaced/spaced/ui/progress_bar.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-#include <spaced/services/services.hpp>
-#include <spaced/ui/element.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/style.hpp>
-
-namespace spaced::ui {
-class ProgressBar : public IElement {
-  public:
-	using Style = ProgressBarStyle;
-
-	explicit ProgressBar(Services const& services);
-
-	glm::vec2 size{200.0f, 20.0f};
-	glm::vec2 position{};
-
-	void draw(bave::Shader& shader) const final;
-
-	[[nodiscard]] auto get_progress() const -> float { return m_progress; }
-	void set_progress(float progress);
-
-	[[nodiscard]] auto get_style() const -> Style const& { return m_style; }
-	void set_style(Style style);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final { return size; }
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return position; }
-	void set_position(glm::vec2 position) final { this->position = position; }
-
-	[[nodiscard]] auto get_bounds() const -> bave::Rect<> { return m_background.get_bounds(); }
-
-  private:
-	Style m_style{};
-
-	bave::RoundedQuadShape m_background{};
-	bave::QuadShape m_fill{};
-
-	float m_progress{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/slider.cpp b/src/spaced/spaced/ui/slider.cpp
deleted file mode 100644
index 390fab0..0000000
--- a/src/spaced/spaced/ui/slider.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/slider.hpp>
-#include <algorithm>
-
-namespace spaced::ui {
-using bave::Action;
-using bave::MouseButton;
-using bave::PointerId;
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::Rect;
-using bave::Shader;
-
-Slider::Slider(Services const& services) : m_styles(&services.get<Styles>()), m_progress_bar(services) {
-	set_style(m_styles->sliders["default"]);
-	set_value(0.0f);
-}
-
-auto Slider::get_size() const -> glm::vec2 {
-	auto ret = m_progress_bar.get_size();
-	ret.y = m_knob.get_shape().diameter;
-	return ret;
-}
-
-void Slider::set_position(glm::vec2 const position) {
-	m_progress_bar.set_position(position);
-	set_value(m_value);
-}
-
-void Slider::set_value(float const value) {
-	update_value(std::clamp(value, 0.0f, 1.0f));
-	auto const origin = m_progress_bar.get_position();
-	auto const size = m_progress_bar.get_size();
-	auto const left_x = origin.x - 0.5f * size.x;
-	auto const delta = m_value * size.x;
-
-	m_knob.transform.position = glm::vec2{left_x + delta, origin.y};
-	m_progress_bar.set_progress(m_value);
-}
-
-void Slider::set_style(Style style) {
-	m_style = std::move(style);
-	m_knob.tint = m_style.knob_tint;
-	auto shape = m_knob.get_shape();
-	shape.diameter = m_style.knob_diameter;
-	m_knob.set_shape(shape);
-	m_progress_bar.set_style(m_styles->progress_bars[m_style.progress_bar]);
-}
-
-void Slider::draw(Shader& shader) const {
-	m_progress_bar.draw(shader);
-	m_knob.draw(shader);
-}
-
-void Slider::on_tap(PointerTap const& pointer_tap) {
-	if (pointer_tap.pointer.id != PointerId::ePrimary || pointer_tap.button != MouseButton::eLeft) { return; }
-	switch (pointer_tap.action) {
-	case Action::ePress: m_pointer_down = hit_test(pointer_tap.pointer.position); break;
-	case Action::eRelease: m_pointer_down = false; break;
-	default: break;
-	}
-
-	if (m_pointer_down) { track(pointer_tap.pointer.position); }
-}
-
-void Slider::on_move(PointerMove const& pointer_move) {
-	if (pointer_move.pointer.id != PointerId::ePrimary) { return; }
-	if (!m_pointer_down) { return; }
-	track(pointer_move.pointer.position);
-}
-
-auto Slider::hit_test(glm::vec2 const position) const -> bool {
-	auto const bar_rect = Rect<>::from_size(m_progress_bar.get_size(), m_progress_bar.get_position());
-	if (bar_rect.contains(position)) { return true; }
-	if (m_knob.get_bounds().contains(position)) { return true; }
-	return false;
-}
-
-void Slider::track(glm::vec2 const pointer) {
-	auto const pointer_x = pointer.x;
-	auto const origin_x = m_progress_bar.get_position().x;
-	auto const size_x = m_progress_bar.get_size().x;
-	auto const left_x = origin_x - 0.5f * size_x;
-	auto const right_x = origin_x + 0.5f * size_x;
-	auto const knob_x = std::clamp(pointer_x, left_x, right_x);
-
-	m_knob.transform.position.x = knob_x;
-	update_value((knob_x - left_x) / size_x);
-	m_progress_bar.set_progress(m_value);
-}
-
-void Slider::update_value(float const value) {
-	if (std::abs(m_value - value) < 0.001f) { return; }
-	m_value = value;
-	if (on_change) { on_change(m_value); }
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/slider.hpp b/src/spaced/spaced/ui/slider.hpp
deleted file mode 100644
index dfda708..0000000
--- a/src/spaced/spaced/ui/slider.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/progress_bar.hpp>
-#include <spaced/ui/style.hpp>
-#include <spaced/ui/widget.hpp>
-#include <functional>
-
-namespace spaced::ui {
-class Slider : public IWidget {
-  public:
-	using Style = SliderStyle;
-
-	explicit Slider(Services const& services);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final;
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return m_progress_bar.get_position(); }
-	void set_position(glm::vec2 position) final;
-
-	[[nodiscard]] auto get_value() const -> float { return m_value; }
-	void set_value(float value);
-
-	[[nodiscard]] auto get_style() const -> Style { return m_style; }
-	void set_style(Style style);
-
-	std::function<void(float)> on_change{};
-
-  protected:
-	void draw(bave::Shader& shader) const final;
-	void on_move(bave::PointerMove const& pointer_move) final;
-	void on_tap(bave::PointerTap const& pointer_tap) final;
-
-	[[nodiscard]] auto hit_test(glm::vec2 position) const -> bool;
-	void track(glm::vec2 pointer);
-
-	void update_value(float value);
-
-	bave::NotNull<Styles const*> m_styles;
-	Style m_style{};
-
-	ui::ProgressBar m_progress_bar;
-	bave::CircleShape m_knob{};
-	float m_value{};
-
-	bool m_pointer_down{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/style.hpp b/src/spaced/spaced/ui/style.hpp
deleted file mode 100644
index f7405b3..0000000
--- a/src/spaced/spaced/ui/style.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-#include <bave/core/enum_array.hpp>
-#include <bave/core/radians.hpp>
-#include <bave/font/text_height.hpp>
-#include <bave/graphics/rgba.hpp>
-#include <glm/vec2.hpp>
-
-namespace spaced::ui {
-enum class ButtonState { eIdle, eHover, ePress, eCOUNT_ };
-
-struct LoadingScreenStyle {
-	bave::Rgba background_tint{bave::black_v};
-	struct {
-		glm::vec2 size{100.0f};
-		bave::Degrees spin_rate{720.0f};
-	} spinner{};
-	struct {
-		float n_width{0.9f};
-		float height{50.0f};
-		float bottom_offset{200.0f};
-		float padding{30.0f};
-	} progress_bar{};
-};
-
-struct ButtonStyle {
-	using Tint = bave::EnumArray<ButtonState, bave::Rgba>;
-
-	Tint background{bave::white_v, bave::yellow_v, bave::cyan_v};
-	Tint outline{bave::black_v, bave::black_v, bave::black_v};
-	Tint text{bave::black_v, bave::black_v, bave::black_v};
-	float outline_width{10.0f};
-	float corner_ratio{0.33f};
-};
-
-struct ProgressBarStyle {
-	bave::Rgba background{bave::white_v};
-	bave::Rgba fill{bave::yellow_v};
-	float corner_ratio{0.5f};
-	float padding{10.0f};
-};
-
-struct DialogStyle {
-	glm::vec2 footer_padding{20.0f, 10.0f};
-	float corner_ratio{0.25f};
-	bave::Rgba background_tint{bave::yellow_v};
-	bave::Rgba outline_tint{bave::cyan_v};
-	bave::Rgba content_text_tint{bave::black_v};
-};
-
-struct SliderStyle {
-	std::string progress_bar{};
-	float knob_diameter{30.0f};
-	bave::Rgba knob_tint{bave::white_v};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/text.cpp b/src/spaced/spaced/ui/text.cpp
deleted file mode 100644
index 432e7ed..0000000
--- a/src/spaced/spaced/ui/text.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <spaced/services/resources.hpp>
-#include <spaced/ui/text.hpp>
-
-namespace spaced::ui {
-Text::Text(Services const& services) {
-	text.set_font(services.get<Resources>().main_font);
-	text.tint = bave::white_v;
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/text.hpp b/src/spaced/spaced/ui/text.hpp
deleted file mode 100644
index 5110b7e..0000000
--- a/src/spaced/spaced/ui/text.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <bave/graphics/text.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/element.hpp>
-
-namespace spaced::ui {
-class Text : public IElement {
-  public:
-	explicit Text(Services const& services);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 override { return text.get_bounds().size(); }
-	[[nodiscard]] auto get_position() const -> glm::vec2 override { return text.transform.position; }
-	void set_position(glm::vec2 position) override { text.transform.position = position; }
-	void draw(bave::Shader& shader) const override { text.draw(shader); }
-
-	bave::Text text{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/view.cpp b/src/spaced/spaced/ui/view.cpp
deleted file mode 100644
index 850db92..0000000
--- a/src/spaced/spaced/ui/view.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <spaced/ui/view.hpp>
-
-namespace spaced::ui {
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::Seconds;
-using bave::Shader;
-
-View::View(Services const& services) : m_display(&services.get<IDisplay>()) {}
-
-void View::push(std::unique_ptr<IElement> element) {
-	if (!element) { return; }
-	m_elements.push_back(std::move(element));
-	if (auto* widget = dynamic_cast<IWidget*>(m_elements.back().get())) { m_widgets.push_back(widget); }
-}
-
-void View::on_move(PointerMove const& pointer_move) {
-	for (auto const& widget : m_widgets) { widget->on_move(pointer_move); }
-}
-
-void View::on_tap(PointerTap const& pointer_tap) {
-	for (auto const& widget : m_widgets) { widget->on_tap(pointer_tap); }
-}
-
-void View::tick(Seconds const dt) {
-	for (auto const& widget : m_widgets) { widget->tick(dt); }
-}
-
-void View::render(Shader& shader) const {
-	if (m_elements.empty()) { return; }
-	shader.set_render_view(m_display->get_main_view());
-	for (auto const& element : m_elements) { element->draw(shader); }
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/view.hpp b/src/spaced/spaced/ui/view.hpp
deleted file mode 100644
index 354b929..0000000
--- a/src/spaced/spaced/ui/view.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-#include <spaced/services/display.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/widget.hpp>
-#include <memory>
-#include <vector>
-
-namespace spaced::ui {
-class View : public bave::Polymorphic {
-  public:
-	explicit View(Services const& services);
-
-	void push(std::unique_ptr<IElement> element);
-
-	[[nodiscard]] auto is_destroyed() const -> bool { return m_destroyed; }
-	void set_destroyed() { m_destroyed = true; }
-
-	virtual void on_move(bave::PointerMove const& pointer_move);
-	virtual void on_tap(bave::PointerTap const& pointer_tap);
-	virtual void tick(bave::Seconds dt);
-	virtual void render(bave::Shader& shader) const;
-
-	bool block_input_events{true};
-	bool active{true};
-
-  protected:
-	std::vector<std::unique_ptr<ui::IElement>> m_elements{};
-	std::vector<bave::Ptr<ui::IWidget>> m_widgets{};
-	bave::NotNull<IDisplay const*> m_display;
-	bool m_destroyed{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/widget.hpp b/src/spaced/spaced/ui/widget.hpp
deleted file mode 100644
index b77a31a..0000000
--- a/src/spaced/spaced/ui/widget.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include <bave/core/time.hpp>
-#include <bave/graphics/shader.hpp>
-#include <bave/input/event.hpp>
-#include <spaced/ui/element.hpp>
-
-namespace spaced::ui {
-class IWidget : public IElement {
-  public:
-	virtual void on_move(bave::PointerMove const& /*pointer_move*/) {}
-	virtual void on_tap(bave::PointerTap const& /*pointer_tap*/) {}
-	virtual void tick(bave::Seconds /*dt*/) {}
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/util.cpp b/src/spaced/spaced/util.cpp
index 9886888..0ca3854 100644
--- a/src/spaced/spaced/util.cpp
+++ b/src/spaced/spaced/util.cpp
@@ -1,108 +1,6 @@
-#include <bave/io/json_io.hpp>
 #include <spaced/util.hpp>
 
 namespace spaced {
-void util::to_json(dj::Json& out, ui::LoadingScreenStyle const& loading_screen_style) {
-	using bave::to_json;
-	to_json(out["background_tint"], loading_screen_style.background_tint);
-	auto& spinner = out["spinner"];
-	to_json(spinner["size"], loading_screen_style.spinner.size);
-	spinner["spin_rate"] = loading_screen_style.spinner.spin_rate.value;
-	auto& progress_bar = out["progress_bar"];
-	progress_bar["n_width"] = loading_screen_style.progress_bar.n_width;
-	progress_bar["height"] = loading_screen_style.progress_bar.height;
-	progress_bar["bottom_offset"] = loading_screen_style.progress_bar.bottom_offset;
-	progress_bar["padding"] = loading_screen_style.progress_bar.padding;
-}
-
-void util::from_json(dj::Json const& json, ui::LoadingScreenStyle& out) {
-	using bave::from_json;
-	from_json(json["background_tint"], out.background_tint);
-	auto const& spinner = json["spinner"];
-	from_json(spinner["size"], out.spinner.size);
-	out.spinner.spin_rate.value = spinner["spin_rate"].as<float>(out.spinner.spin_rate.value);
-	auto const& progress_bar = json["progress_bar"];
-	out.progress_bar.n_width = progress_bar["n_width"].as<float>(out.progress_bar.n_width);
-	out.progress_bar.height = progress_bar["height"].as<float>(out.progress_bar.height);
-	out.progress_bar.bottom_offset = progress_bar["bottom_offset"].as<float>(out.progress_bar.bottom_offset);
-	out.progress_bar.padding = progress_bar["padding"].as<float>(out.progress_bar.padding);
-}
-
-void util::to_json(dj::Json& out, ui::ButtonStyle::Tint const& button_tint) {
-	using bave::to_json;
-	to_json(out["idle"], button_tint[ui::ButtonState::eIdle]);
-	to_json(out["hover"], button_tint[ui::ButtonState::eHover]);
-	to_json(out["press"], button_tint[ui::ButtonState::ePress]);
-}
-
-void util::from_json(dj::Json const& json, ui::ButtonStyle::Tint& out) {
-	from_json(json["idle"], out[ui::ButtonState::eIdle]);
-	from_json(json["hover"], out[ui::ButtonState::eHover]);
-	from_json(json["press"], out[ui::ButtonState::ePress]);
-}
-
-void util::to_json(dj::Json& out, ui::ButtonStyle const& button_style) {
-	to_json(out["background"], button_style.background);
-	to_json(out["outline"], button_style.outline);
-	to_json(out["text"], button_style.text);
-	out["outline_width"] = button_style.outline_width;
-	out["corner_ratio"] = button_style.corner_ratio;
-}
-
-void util::from_json(dj::Json const& json, ui::ButtonStyle& out) {
-	from_json(json["background"], out.background);
-	from_json(json["outline"], out.outline);
-	from_json(json["text"], out.text);
-	out.outline_width = json["outline_width"].as<float>();
-	out.corner_ratio = json["corner_ratio"].as<float>();
-}
-
-void util::to_json(dj::Json& out, ui::ProgressBarStyle const& progress_bar_style) {
-	to_json(out["background"], progress_bar_style.background);
-	to_json(out["fill"], progress_bar_style.fill);
-	out["corner_ratio"] = progress_bar_style.corner_ratio;
-	out["padding"] = progress_bar_style.padding;
-}
-
-void util::from_json(dj::Json const& json, ui::ProgressBarStyle& out) {
-	from_json(json["background"], out.background);
-	from_json(json["fill"], out.fill);
-	out.corner_ratio = json["corner_ratio"].as<float>(out.corner_ratio);
-	out.padding = json["padding"].as<float>(out.padding);
-}
-
-void util::to_json(dj::Json& out, ui::DialogStyle const& dialog_style) {
-	using bave::to_json;
-	to_json(out["footer_padding"], dialog_style.footer_padding);
-	to_json(out["corner_ratio"], dialog_style.corner_ratio);
-	to_json(out["background_tint"], dialog_style.background_tint);
-	to_json(out["outline_tint"], dialog_style.outline_tint);
-	to_json(out["content_text_tint"], dialog_style.content_text_tint);
-}
-
-void util::from_json(dj::Json const& json, ui::DialogStyle& out) {
-	using bave::from_json;
-	from_json(json["footer_padding"], out.footer_padding);
-	from_json(json["corner_ratio"], out.corner_ratio);
-	from_json(json["background_tint"], out.background_tint);
-	from_json(json["outline_tint"], out.outline_tint);
-	from_json(json["content_text_tint"], out.content_text_tint);
-}
-
-void util::to_json(dj::Json& out, ui::SliderStyle const& slider_style) {
-	using bave::to_json;
-	to_json(out["progress_bar"], slider_style.progress_bar);
-	to_json(out["knob_diameter"], slider_style.knob_diameter);
-	to_json(out["knob_tint"], slider_style.knob_tint);
-}
-
-void util::from_json(dj::Json const& json, ui::SliderStyle& out) {
-	using bave::from_json;
-	from_json(json["progress_bar"], out.progress_bar);
-	from_json(json["knob_diameter"], out.knob_diameter);
-	from_json(json["knob_tint"], out.knob_tint);
-}
-
 auto util::create_font_atlas_task(std::shared_ptr<bave::Font> font, std::vector<bave::TextHeight> heights) -> std::function<void()> {
 	if (!font || heights.empty()) { return {}; }
 	return [font = std::move(font), heights = std::move(heights)] {
diff --git a/src/spaced/spaced/util.hpp b/src/spaced/spaced/util.hpp
index 89bbbb4..bd54c39 100644
--- a/src/spaced/spaced/util.hpp
+++ b/src/spaced/spaced/util.hpp
@@ -1,27 +1,7 @@
 #pragma once
 #include <bave/font/font.hpp>
-#include <djson/json.hpp>
-#include <spaced/ui/style.hpp>
 #include <functional>
 
 namespace spaced::util {
-void to_json(dj::Json& out, ui::LoadingScreenStyle const& loading_screen_style);
-void from_json(dj::Json const& json, ui::LoadingScreenStyle& out);
-
-void to_json(dj::Json& out, ui::ButtonStyle::Tint const& button_tint);
-void from_json(dj::Json const& json, ui::ButtonStyle::Tint& out);
-
-void to_json(dj::Json& out, ui::ButtonStyle const& button_style);
-void from_json(dj::Json const& json, ui::ButtonStyle& out);
-
-void to_json(dj::Json& out, ui::ProgressBarStyle const& progress_bar_style);
-void from_json(dj::Json const& json, ui::ProgressBarStyle& out);
-
-void to_json(dj::Json& out, ui::DialogStyle const& dialog_style);
-void from_json(dj::Json const& json, ui::DialogStyle& out);
-
-void to_json(dj::Json& out, ui::SliderStyle const& slider_style);
-void from_json(dj::Json const& json, ui::SliderStyle& out);
-
 auto create_font_atlas_task(std::shared_ptr<bave::Font> font, std::vector<bave::TextHeight> heights) -> std::function<void()>;
 } // namespace spaced::util

From 9ca259193c7ffd9ef69c5739422cac91a069267d Mon Sep 17 00:00:00 2001
From: Karn Kaul <karnkaul@gmail.com>
Date: Fri, 14 Jun 2024 00:14:50 +0530
Subject: [PATCH 6/7] Start using RGBA keys in styles.

---
 assets/styles.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/styles.json b/assets/styles.json
index 50dd488..06607c0 100644
--- a/assets/styles.json
+++ b/assets/styles.json
@@ -37,8 +37,8 @@
       "padding": 10
     },
     "enemy": {
-      "background": "#f75c03ff",
-      "fill": "#ffffffff",
+      "background": "orange",
+      "fill": "milk",
       "corner_ratio": 0.5,
       "padding": 5
     }
@@ -50,9 +50,9 @@
         10.000000
       ],
       "corner_ratio": 0.25,
-      "background_tint": "#e5cdaeff",
-      "outline_tint": "#231d2aff",
-      "content_text_tint": "#231d2aff"
+      "background_tint": "milk",
+      "outline_tint": "black",
+      "content_text_tint": "black"
     }
   },
   "sliders": {
@@ -63,7 +63,7 @@
     }
   },
   "loading_screen": {
-    "background_tint": "#231d2aff",
+    "background_tint": "black",
     "spinner": {
       "size": [
         100.000000,

From f153fa79b1bcd87b16a309e13427b785fa000fd1 Mon Sep 17 00:00:00 2001
From: Karn Kaul <karnkaul@gmail.com>
Date: Fri, 14 Jun 2024 00:15:27 +0530
Subject: [PATCH 7/7] Replace font.

---
 assets/fonts/CuteDino.otf           | Bin 0 -> 29976 bytes
 assets/fonts/hesitation.regular.ttf | Bin 21264 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 assets/fonts/CuteDino.otf
 delete mode 100644 assets/fonts/hesitation.regular.ttf

diff --git a/assets/fonts/CuteDino.otf b/assets/fonts/CuteDino.otf
new file mode 100644
index 0000000000000000000000000000000000000000..d247239c5e7d4c7d6e5a83f48c6b80da84423c8f
GIT binary patch
literal 29976
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
U<ou$(fY=eos+~yU_HEn#7f8jpq5uE@

literal 0
HcmV?d00001

diff --git a/assets/fonts/hesitation.regular.ttf b/assets/fonts/hesitation.regular.ttf
deleted file mode 100644
index 83dafc7ae47c69c993ae81b5335551d3cc612597..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21264
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
La&6c;H%I;lF>|ib