From 92e83ded2b6afb26082d7661c28af1d9d4e950a2 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 18 Nov 2024 16:55:21 +0100
Subject: added mouse and key event triggering

---
 src/crepe/api/Event.h       | 16 ++++++++++++++++
 src/crepe/api/LoopManager.h | 13 +++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index d5ddf0a..ef6a791 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -87,6 +87,10 @@ public:
 
 	//! Y-coordinate of the mouse position at the time of the event.
 	int mouse_y = 0;
+	// Relative movement in x
+    int rel_x;
+	// Relative movement in y
+    int rel_y; 
 };
 
 /**
@@ -113,3 +117,15 @@ public:
 class ShutDownEvent : public Event {
 public:
 };
+
+class MouseScrollEvent : public Event {
+public:
+	//! X-coordinate of the mouse position at the time of the event.
+	int scroll_x = 0;
+
+	//! Y-coordinate of the mouse position at the time of the event.
+	int scroll_y = 0;
+	
+	int direction = 0;
+};
+
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index f6904be..b18c9d1 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -10,6 +10,12 @@ namespace crepe {
 class LoopManager {
 public:
 	void start();
+	/**
+	 * \brief Set game running variable
+	 *
+	 * \param running running (false = game shutdown, true = game running)
+	 */
+	void set_running(bool running);
 	LoopManager();
 
 private:
@@ -53,12 +59,7 @@ private:
 	 * This function updates physics and game logic based on LoopTimer's fixed_delta_time.
 	 */
 	void fixed_update();
-	/**
-	 * \brief Set game running variable
-	 *
-	 * \param running running (false = game shutdown, true = game running)
-	 */
-	void set_running(bool running);
+	
 	/**
 	 * \brief Function for executing render-related systems.
 	 *
-- 
cgit v1.2.3


From 6c2fc3716c9c6c68e982b243af5f7ed04fb35e86 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 19 Nov 2024 15:16:16 +0100
Subject: button handling

---
 src/crepe/api/Button.cpp         |  0
 src/crepe/api/Button.h           | 17 +++++++++++++
 src/crepe/api/UiObject.h         | 14 +++++++++++
 src/crepe/facade/SDLContext.cpp  |  6 ++---
 src/crepe/system/InputSystem.cpp | 52 ++++++++++++++++++++++++++++++++++++++++
 src/crepe/system/InputSystem.h   |  8 +++++--
 6 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 src/crepe/api/Button.cpp
 create mode 100644 src/crepe/api/Button.h
 create mode 100644 src/crepe/api/UiObject.h

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
new file mode 100644
index 0000000..5035729
--- /dev/null
+++ b/src/crepe/api/Button.h
@@ -0,0 +1,17 @@
+#include <functional>
+
+#include "Component.h"
+#include "api/EventHandler.h"
+#include "api/UiObject.h"
+namespace crepe {
+class Button : public UiObject{
+public:
+	~Button(){};
+	bool interactable = true;
+	bool is_toggle = false;
+	bool is_pressed = false;
+	std::function<void()> on_click;
+public:
+virtual int get_instances_max() const { return 1; }
+};
+}
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
new file mode 100644
index 0000000..f57f7ef
--- /dev/null
+++ b/src/crepe/api/UiObject.h
@@ -0,0 +1,14 @@
+#include <functional>
+
+#include "Component.h"
+#include "api/EventHandler.h"
+namespace crepe {
+class UiObject : public Component{
+public:
+	~UiObject(){};
+	int width = 0;
+	int height = 0;
+public:
+virtual int get_instances_max() const { return 1; }
+};
+}
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index d0977cb..43ef3f1 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -94,7 +94,6 @@ void SDLContext::handle_events(bool &running) {
                 break;
 
             case SDL_KEYDOWN:
-                std::cout << "keyDown: " << event.key.keysym.sym << std::endl;
                 event_manager.trigger_event<KeyPressEvent>(KeyPressEvent{
                     .repeat = event.key.repeat,
                     .key = this->sdl_to_keycode(event.key.keysym.scancode)
@@ -157,7 +156,6 @@ void SDLContext::handle_events(bool &running) {
 Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
     static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
         std::array<Keycode, SDL_NUM_SCANCODES> table{};
-		 // Default to NONE for unmapped keys
         table.fill(Keycode::NONE);
 
         table[SDL_SCANCODE_SPACE] = Keycode::SPACE;
@@ -271,7 +269,7 @@ Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
 MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
     static const std::array<MouseButton, 8> MOUSE_BUTTON_LOOKUP_TABLE = [] {
         std::array<MouseButton, 8> table{};
-        table.fill(MouseButton::NONE); // Default to NONE for unmapped buttons
+        table.fill(MouseButton::NONE);
 
         table[SDL_BUTTON_LEFT] = MouseButton::LEFT_MOUSE;
         table[SDL_BUTTON_RIGHT] = MouseButton::RIGHT_MOUSE;
@@ -287,7 +285,7 @@ MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
         return MouseButton::NONE; 
     }
 
-    return MOUSE_BUTTON_LOOKUP_TABLE[sdl_button];  // Return mapped button
+    return MOUSE_BUTTON_LOOKUP_TABLE[sdl_button];
 }
 void SDLContext::clear_screen() { SDL_RenderClear(this->game_renderer.get()); }
 void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer.get()); }
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index e69de29..b7a86f4 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -0,0 +1,52 @@
+#include "ComponentManager.h"
+#include "../api/Button.h"
+#include "../api/EventManager.h"
+#include "../api/Transform.h"
+#include "../api/Event.h"
+
+#include "system/InputSystem.h"
+
+using namespace crepe;
+
+InputSystem::InputSystem(ComponentManager &component_manager) 
+    : System(component_manager) {
+    auto &event_manager = EventManager::get_instance();
+
+    event_manager.subscribe<MouseClickEvent>([this](const MouseClickEvent &event) {
+        return this->handle_click(event);
+    });
+
+    event_manager.subscribe<MouseMoveEvent>([this](const MouseMoveEvent &event) {
+        return this->handle_move(event);
+    });
+}
+
+void InputSystem::update() {
+}
+
+bool InputSystem::handle_click(const MouseClickEvent &event) {
+    ComponentManager &mgr = this->component_manager;
+
+    std::vector<std::reference_wrapper<Button>> buttons =
+        mgr.get_components_by_type<Button>();
+	
+	std::vector<std::reference_wrapper<Transform>> transforms =
+        mgr.get_components_by_type<Transform>();
+    for (Button &button : buttons) {
+		for(Transform& transform : transforms){
+			if(button.game_object_id != transform.game_object_id){continue;}
+			if (!button.interactable) {break;}
+            if (event.mouse_x >= transform.position.x && event.mouse_x <= transform.position.x + button.width &&
+                event.mouse_y >= transform.position.y && event.mouse_y <= transform.position.y + button.height) {
+                button.on_click();
+            }
+		}
+    }
+    return false;
+}
+
+bool InputSystem::handle_move(const MouseMoveEvent &event) {
+
+    ComponentManager &mgr = this->component_manager;
+
+}
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 642035f..c50d928 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -1,14 +1,18 @@
 #pragma once
 
 #include "System.h"
-
+#include "../api/Event.h"
 namespace crepe {
 
 class InputSystem : public System {
 public:
 	using System::System;
+	InputSystem(ComponentManager & component_manager);
 	void update() override;
-	void 
+	bool handle_click(const MouseClickEvent &event);
+	bool handle_move(const MouseMoveEvent &event);
+	bool handle_key_press(const KeyPressEvent &event);
+	bool handle_key_release(const KeyReleaseEvent &event);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 6287d4e9068d8bd27a9e62643f54adb69e84befd Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Sun, 24 Nov 2024 22:08:49 +0100
Subject: input facade

---
 src/crepe/api/LoopManager.cpp    |  4 +-
 src/crepe/facade/SDLContext.cpp  | 78 ++++++++++++++++++++++++++++++++++-
 src/crepe/facade/SDLContext.h    | 36 ++++++++++++++---
 src/crepe/system/InputSystem.cpp | 87 ++++++++++++++++++++++++++++++++--------
 src/crepe/system/InputSystem.h   |  7 +++-
 src/test/inputTest.cpp           | 53 ++++++++++++++++++++++++
 src/test/loopTimerTest.cpp       | 32 +++++++++++++++
 7 files changed, 272 insertions(+), 25 deletions(-)
 create mode 100644 src/test/inputTest.cpp
 create mode 100644 src/test/loopTimerTest.cpp

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index a64366f..af306c0 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -6,6 +6,7 @@
 #include "../system/PhysicsSystem.h"
 #include "../system/RenderSystem.h"
 #include "../system/ScriptSystem.h"
+#include "../system/InputSystem.h"
 
 #include "LoopManager.h"
 #include "LoopTimer.h"
@@ -20,10 +21,11 @@ LoopManager::LoopManager() {
 	this->load_system<PhysicsSystem>();
 	this->load_system<RenderSystem>();
 	this->load_system<ScriptSystem>();
+	this->load_system<InputSystem>();
 }
 
 void LoopManager::process_input() {
-	SDLContext::get_instance().handle_events(this->game_running);
+	this->get_system<InputSystem>().update();
 }
 
 void LoopManager::start() {
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 43ef3f1..3fb7f05 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -92,7 +92,6 @@ void SDLContext::handle_events(bool &running) {
                 running = false;
                 event_manager.trigger_event(ShutDownEvent{});
                 break;
-
             case SDL_KEYDOWN:
                 event_manager.trigger_event<KeyPressEvent>(KeyPressEvent{
                     .repeat = event.key.repeat,
@@ -146,7 +145,6 @@ void SDLContext::handle_events(bool &running) {
                     .direction = (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED ? -1 : 1)
                 });
                 break;
-
         }
     }
 }
@@ -365,3 +363,79 @@ int SDLContext::get_height(const Texture & ctx) const {
 	return h;
 }
 void SDLContext::delay(int ms) const { SDL_Delay(ms); }
+
+std::vector<SDLContext::EventData> SDLContext::get_events(){
+	std::vector<SDLContext::EventData> event_list;
+	SDL_Event event;
+	while (SDL_PollEvent(&event)) {
+        switch (event.type) {
+            case SDL_QUIT:
+                event_list.push_back(EventData{
+					.event_type = SDLContext::Event::SHUTDOWN,
+				});
+				break;
+            case SDL_KEYDOWN:
+				event_list.push_back(EventData{
+					.event_type = SDLContext::Event::KEYDOWN,
+					.key = sdl_to_keycode(event.key.keysym.scancode),
+					.key_repeat = (event.key.repeat != 0),
+				});
+				break;
+            case SDL_KEYUP:
+				event_list.push_back(EventData{
+					.event_type = SDLContext::Event::KEYUP,
+					.key = sdl_to_keycode(event.key.keysym.scancode),
+				});
+                break;
+            case SDL_MOUSEBUTTONDOWN:
+				{
+					int x,y;
+					SDL_GetMouseState(&x, &y);
+					event_list.push_back(EventData{
+						.event_type = SDLContext::Event::MOUSEDOWN,
+						.mouse_button = sdl_to_mousebutton(event.button.button),
+						.mouse_position = {x,y},
+					});
+				}
+                break;
+            case SDL_MOUSEBUTTONUP:
+                {
+					int x,y;
+					SDL_GetMouseState(&x, &y);
+					event_list.push_back(EventData{
+						.event_type = SDLContext::Event::MOUSEUP,
+						.mouse_button = sdl_to_mousebutton(event.button.button),
+						.mouse_position = {x,y},
+					});
+				}
+                break;
+
+            case SDL_MOUSEMOTION:
+                {
+					int x,y;
+					SDL_GetMouseState(&x, &y);
+					event_list.push_back(EventData{
+						.event_type = SDLContext::Event::MOUSEMOVE,
+						.mouse_position = {x,y},
+					});
+				}
+                break;
+
+            case SDL_MOUSEWHEEL:
+                {
+					int x, y;
+					SDL_GetMouseState(&x, &y);
+
+					event_list.push_back(EventData{
+						.event_type = SDLContext::Event::MOUSEWHEEL,
+						.mouse_position = {event.motion.x,event.motion.y},
+						.wheel_delta = event.wheel.y,
+						.rel_mouse_move {event.motion.yrel,event.motion.xrel},
+					});
+				}
+                break;
+        }
+    }
+	return event_list;
+}
+
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index cce2fb6..dcd7440 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <SDL2/SDL.h>
 #include <SDL2/SDL_keycode.h>
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_video.h>
@@ -10,6 +10,8 @@
 #include "../api/Sprite.h"
 #include "../api/KeyCodes.h"
 #include "../api/Transform.h"
+#include "../api/Vector2.h"
+#include "../api/Event.h"
 #include "api/Camera.h"
 
 // FIXME: this needs to be removed
@@ -20,11 +22,11 @@ namespace crepe {
 
 // TODO: SDL_Keycode is defined in a header not distributed with crepe, which means this
 // typedef is unusable when crepe is packaged. Wouter will fix this later.
-typedef SDL_Keycode CREPE_KEYCODES;
+//typedef SDL_Keycode CREPE_KEYCODES;
 
 class Texture;
 class LoopManager;
-
+class InputSystem;
 /**
  * \class SDLContext
  * \brief Facade for the SDL library
@@ -35,6 +37,26 @@ class LoopManager;
 class SDLContext {
 
 public:
+	enum Event{
+		NONE = 0,
+		MOUSEDOWN,
+		MOUSEUP,
+		MOUSEMOVE,
+		MOUSEWHEEL,
+		KEYUP,
+		KEYDOWN,
+		SHUTDOWN
+
+	};
+	struct EventData {
+		SDLContext::Event event_type = SDLContext::Event::NONE;
+		Keycode key = Keycode::NONE;
+		bool key_repeat = false;
+		MouseButton mouse_button = MouseButton::NONE;
+		std::pair<int,int> mouse_position = {-1,-1};
+		int wheel_delta = -1;
+		std::pair<int,int> rel_mouse_move = {-1,-1};
+	};
 	/**
 	 * \brief Gets the singleton instance of SDLContext.
 	 * \return Reference to the SDLContext instance.
@@ -48,15 +70,18 @@ public:
 
 private:
 	//! will only use handle_events
-	friend class LoopManager;
+	friend class InputSystem;
 	/**
 	 * \brief Handles SDL events such as window close and input.
 	 * \param running Reference to a boolean flag that controls the main loop.
 	 */
 	void handle_events(bool & running);
+	std::vector<SDLContext::EventData> get_events();
+	
+	Keycode get_key();
+	Keycode get_mouse();
 	Keycode sdl_to_keycode(SDL_Keycode sdlKey);
 	MouseButton sdl_to_mousebutton(Uint8 sdl_button);
-
 private:
 	//! Will only use get_ticks
 	friend class AnimatorSystem;
@@ -153,4 +178,5 @@ private:
 	SDL_Rect viewport = {0, 0, 640, 480};
 };
 
+
 } // namespace crepe
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index b7a86f4..c61a80f 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -2,26 +2,86 @@
 #include "../api/Button.h"
 #include "../api/EventManager.h"
 #include "../api/Transform.h"
+#include "../facade/SDLContext.h"
 #include "../api/Event.h"
 
 #include "system/InputSystem.h"
 
 using namespace crepe;
 
-InputSystem::InputSystem(ComponentManager &component_manager) 
-    : System(component_manager) {
-    auto &event_manager = EventManager::get_instance();
 
-    event_manager.subscribe<MouseClickEvent>([this](const MouseClickEvent &event) {
-        return this->handle_click(event);
-    });
-
-    event_manager.subscribe<MouseMoveEvent>([this](const MouseMoveEvent &event) {
-        return this->handle_move(event);
-    });
-}
 
 void InputSystem::update() {
+	EventManager& event_mgr = EventManager::get_instance();
+    std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
+
+    for (SDLContext::EventData event : event_list) {
+        switch (event.event_type) {
+            case SDLContext::Event::KEYDOWN: {
+                event_mgr.queue_event(KeyPressEvent{
+                    .key = event.key,
+                    .repeat = event.key_repeat,
+                });
+                break;
+            }
+            case SDLContext::Event::KEYUP: {
+                event_mgr.queue_event(KeyReleaseEvent{
+                    .key = event.key,
+                });
+                break;
+            }
+            case SDLContext::Event::MOUSEDOWN: {
+                event_mgr.queue_event(MousePressEvent{
+                    .mouse_x = event.mouse_position.first,
+                    .mouse_y = event.mouse_position.second,
+                    .button = event.mouse_button,
+                });
+                break;
+            }
+            case SDLContext::Event::MOUSEMOVE: {
+                event_mgr.queue_event(MouseMoveEvent{
+                    .mouse_x = event.mouse_position.first,
+                    .mouse_y = event.mouse_position.second,
+                    .rel_x = event.rel_mouse_move.first,  
+                    .rel_y = event.rel_mouse_move.second,
+                });
+                break;
+            }
+            case SDLContext::Event::MOUSEUP: {
+                event_mgr.queue_event(MouseReleaseEvent{
+                    .mouse_x = event.mouse_position.first,
+                    .mouse_y = event.mouse_position.second,
+                    .button = event.mouse_button,
+                });
+                int delta_x = event.mouse_position.first - last_mouse_down_position.first;
+                int delta_y = event.mouse_position.second - last_mouse_down_position.second;
+                if (last_mouse_button == event.mouse_button &&
+                    std::abs(delta_x) <= click_tolerance &&
+                    std::abs(delta_y) <= click_tolerance) {
+                    event_mgr.queue_event(MouseClickEvent{
+                        .mouse_x = event.mouse_position.first,
+                        .mouse_y = event.mouse_position.second,
+                        .button = event.mouse_button,
+                    });
+                }
+                break;
+            }
+            case SDLContext::Event::MOUSEWHEEL: {
+                event_mgr.queue_event(MouseScrollEvent{
+                    .scroll_x = event.mouse_position.first,
+                    .scroll_y = event.mouse_position.second,
+                    .direction = event.wheel_delta,
+                });
+                break;
+            }
+            case SDLContext::Event::SHUTDOWN: {
+                event_mgr.queue_event(ShutDownEvent{});
+                break;
+            }
+            default:
+                break;
+        }
+    }
 }
 
 bool InputSystem::handle_click(const MouseClickEvent &event) {
@@ -45,8 +105,3 @@ bool InputSystem::handle_click(const MouseClickEvent &event) {
     return false;
 }
 
-bool InputSystem::handle_move(const MouseMoveEvent &event) {
-
-    ComponentManager &mgr = this->component_manager;
-
-}
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index c50d928..231aa45 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -7,8 +7,13 @@ namespace crepe {
 class InputSystem : public System {
 public:
 	using System::System;
-	InputSystem(ComponentManager & component_manager);
 	void update() override;
+	void process_events();
+	
+private:
+	std::pair<int, int> last_mouse_down_position{-1, -1};
+    MouseButton last_mouse_button = MouseButton::NONE;
+	const int click_tolerance = 5;
 	bool handle_click(const MouseClickEvent &event);
 	bool handle_move(const MouseMoveEvent &event);
 	bool handle_key_press(const KeyPressEvent &event);
diff --git a/src/test/inputTest.cpp b/src/test/inputTest.cpp
new file mode 100644
index 0000000..0f02410
--- /dev/null
+++ b/src/test/inputTest.cpp
@@ -0,0 +1,53 @@
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_keycode.h>
+#include "system/InputSystem.h"
+#include "api/EventManager.h"
+#include "api/KeyCodes.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace std::chrono_literals;
+using namespace crepe;
+
+class InputTest : public ::testing::Test {
+public:
+InputSystem input_system;
+EventManager& event_manager = EventManager::get_instance();
+protected:
+	void SetUp() override {
+	}
+
+	void TearDown() override {
+		
+	}
+void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
+    SDL_Event event;
+
+    // Simulate Mouse Button Down event
+    SDL_zero(event);
+    event.type = SDL_MOUSEBUTTONDOWN;
+    event.button.x = mouse_x;
+    event.button.y = mouse_y;
+    event.button.button = mouse_button;
+    SDL_PushEvent(&event);
+    SDL_zero(event);
+    event.type = SDL_MOUSEBUTTONUP;
+    event.button.x = mouse_x;
+    event.button.y = mouse_y;
+    event.button.button = mouse_button;
+    SDL_PushEvent(&event);
+}
+
+};
+
+TEST_F(InputTest, KeyDown) {
+
+	SDL_Event event;
+	SDL_zero(event);
+    event.type = SDL_MOUSEBUTTONDOWN;
+    event.button.x = 10;
+    event.button.y = 10;
+    event.button.button = mouse_bu;
+    SDL_PushEvent(&event);  // Push event into the SDL event queue
+}
diff --git a/src/test/loopTimerTest.cpp b/src/test/loopTimerTest.cpp
new file mode 100644
index 0000000..a3b1646
--- /dev/null
+++ b/src/test/loopTimerTest.cpp
@@ -0,0 +1,32 @@
+#define private public
+#define protected public
+#include "api/LoopManager.h"
+#include "api/LoopTimer.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace std::chrono_literals;
+using namespace crepe;
+
+class LoopTimerTest : public ::testing::Test {
+public:
+LoopTimer loop_timer = LoopTimer::get_instance();
+protected:
+	void SetUp() override {
+		loop_timer.start();
+	}
+
+	void TearDown() override {
+		
+	}
+};
+TEST_F(LoopTimerTest, TestDeltaTime) {
+    auto start_time = std::chrono::steady_clock::now();
+    
+    loop_timer.update();  
+    double delta_time = loop_timer.get_delta_time();
+
+    auto elapsed_time = std::chrono::steady_clock::now() - start_time;
+    EXPECT_LE(delta_time, std::chrono::duration<double>(elapsed_time).count());
+}
-- 
cgit v1.2.3


From 987fc16a8ae124548e2074d6f46806387c03e161 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Sun, 24 Nov 2024 22:56:20 +0100
Subject: creating inputSystem tests

---
 src/crepe/api/Button.cpp        |   0
 src/crepe/api/Button.h          |   2 +-
 src/crepe/api/CMakeLists.txt    |   2 +
 src/crepe/api/Event.h           |  12 ++
 src/crepe/api/KeyCodes.h        | 303 ++++++++++++++++++++--------------------
 src/crepe/api/UiObject.h        |   5 +-
 src/crepe/facade/SDLContext.cpp | 222 ++++++++++++++++++++++++++---
 src/test/inputTest.cpp          | 139 +++++++++++++++++-
 8 files changed, 505 insertions(+), 180 deletions(-)
 delete mode 100644 src/crepe/api/Button.cpp

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 5035729..9b1341f 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -6,7 +6,7 @@
 namespace crepe {
 class Button : public UiObject{
 public:
-	~Button(){};
+	Button();
 	bool interactable = true;
 	bool is_toggle = false;
 	bool is_pressed = false;
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 50c51ed..fc27fa0 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -58,4 +58,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	LoopManager.h
 	LoopTimer.h
 	Asset.h
+	Button.h
+	UiObject.h
 )
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index bac8701..46dd86b 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -94,6 +94,18 @@ public:
     int rel_y; 
 };
 
+/**
+ * \brief Event triggered when the mouse is moved.
+ */
+class MouseScrollEvent : public Event {
+public:
+	//! X-coordinate of the mouse position at the time of the event.
+	int scroll_x = 0;
+
+	//! Y-coordinate of the mouse position at the time of the event.
+	int scroll_y = 0;
+	int direction = 0;
+};
 /**
  * \brief Event triggered during a collision between objects.
  */
diff --git a/src/crepe/api/KeyCodes.h b/src/crepe/api/KeyCodes.h
index 9e173e0..4b026c5 100644
--- a/src/crepe/api/KeyCodes.h
+++ b/src/crepe/api/KeyCodes.h
@@ -1,153 +1,154 @@
 #pragma once
+namespace crepe {
+	//! Enumeration for mouse button inputs, including standard and extended buttons.
+	enum class MouseButton {
+		NONE = 0, //!< No mouse button input.
+		LEFT_MOUSE = 1, //!< Left mouse button.
+		RIGHT_MOUSE = 2, //!< Right mouse button.
+		MIDDLE_MOUSE = 3, //!< Middle mouse button (scroll wheel press).
+		X1_MOUSE = 4, //!< First extended mouse button.
+		X2_MOUSE = 5, //!< Second extended mouse button.
+		SCROLL_UP = 6, //!< Scroll wheel upward movement.
+		SCROLL_DOWN = 7, //!< Scroll wheel downward movement.
+	};
 
-//! Enumeration for mouse button inputs, including standard and extended buttons.
-enum class MouseButton {
-	NONE = 0, //!< No mouse button input.
-	LEFT_MOUSE = 1, //!< Left mouse button.
-	RIGHT_MOUSE = 2, //!< Right mouse button.
-	MIDDLE_MOUSE = 3, //!< Middle mouse button (scroll wheel press).
-	X1_MOUSE = 4, //!< First extended mouse button.
-	X2_MOUSE = 5, //!< Second extended mouse button.
-	SCROLL_UP = 6, //!< Scroll wheel upward movement.
-	SCROLL_DOWN = 7, //!< Scroll wheel downward movement.
-};
-
-//! Enumeration for keyboard key inputs, including printable characters, function keys, and keypad keys.
-enum class Keycode {
-	NONE = 0, //!< No key input.
-	SPACE = 32, //!< Spacebar.
-	APOSTROPHE = 39, //!< Apostrophe (').
-	COMMA = 44, //!< Comma (,).
-	MINUS = 45, //!< Minus (-).
-	PERIOD = 46, //!< Period (.).
-	SLASH = 47, //!< Slash (/).
-	D0 = 48, //!< Digit 0.
-	D1 = 49, //!< Digit 1.
-	D2 = 50, //!< Digit 2.
-	D3 = 51, //!< Digit 3.
-	D4 = 52, //!< Digit 4.
-	D5 = 53, //!< Digit 5.
-	D6 = 54, //!< Digit 6.
-	D7 = 55, //!< Digit 7.
-	D8 = 56, //!< Digit 8.
-	D9 = 57, //!< Digit 9.
-	SEMICOLON = 59, //!< Semicolon (;).
-	EQUAL = 61, //!< Equal sign (=).
-	A = 65, //!< Key 'A'.
-	B = 66, //!< Key 'B'.
-	C = 67, //!< Key 'C'.
-	D = 68, //!< Key 'D'.
-	E = 69, //!< Key 'E'.
-	F = 70, //!< Key 'F'.
-	G = 71, //!< Key 'G'.
-	H = 72, //!< Key 'H'.
-	I = 73, //!< Key 'I'.
-	J = 74, //!< Key 'J'.
-	K = 75, //!< Key 'K'.
-	L = 76, //!< Key 'L'.
-	M = 77, //!< Key 'M'.
-	N = 78, //!< Key 'N'.
-	O = 79, //!< Key 'O'.
-	P = 80, //!< Key 'P'.
-	Q = 81, //!< Key 'Q'.
-	R = 82, //!< Key 'R'.
-	S = 83, //!< Key 'S'.
-	T = 84, //!< Key 'T'.
-	U = 85, //!< Key 'U'.
-	V = 86, //!< Key 'V'.
-	W = 87, //!< Key 'W'.
-	X = 88, //!< Key 'X'.
-	Y = 89, //!< Key 'Y'.
-	Z = 90, //!< Key 'Z'.
-	LEFT_BRACKET = 91, //!< Left bracket ([).
-	BACKSLASH = 92, //!< Backslash (\).
-	RIGHT_BRACKET = 93, //!< Right bracket (]).
-	GRAVE_ACCENT = 96, //!< Grave accent (`).
-	WORLD1 = 161, //!< Non-US key #1.
-	WORLD2 = 162, //!< Non-US key #2.
-	ESCAPE = 256, //!< Escape key.
-	ENTER = 257, //!< Enter key.
-	TAB = 258, //!< Tab key.
-	BACKSPACE = 259, //!< Backspace key.
-	INSERT = 260, //!< Insert key.
-	DELETE = 261, //!< Delete key.
-	RIGHT = 262, //!< Right arrow key.
-	LEFT = 263, //!< Left arrow key.
-	DOWN = 264, //!< Down arrow key.
-	UP = 265, //!< Up arrow key.
-	PAGE_UP = 266, //!< Page Up key.
-	PAGE_DOWN = 267, //!< Page Down key.
-	HOME = 268, //!< Home key.
-	END = 269, //!< End key.
-	CAPS_LOCK = 280, //!< Caps Lock key.
-	SCROLL_LOCK = 281, //!< Scroll Lock key.
-	NUM_LOCK = 282, //!< Num Lock key.
-	PRINT_SCREEN = 283, //!< Print Screen key.
-	PAUSE = 284, //!< Pause key.
-	/**
-	 * \name Function keys (F1-F25).
-	 * \{
-	 */
-	F1 = 290,
-	F2 = 291,
-	F3 = 292,
-	F4 = 293,
-	F5 = 294,
-	F6 = 295,
-	F7 = 296,
-	F8 = 297,
-	F9 = 298,
-	F10 = 299,
-	F11 = 300,
-	F12 = 301,
-	F13 = 302,
-	F14 = 303,
-	F15 = 304,
-	F16 = 305,
-	F17 = 306,
-	F18 = 307,
-	F19 = 308,
-	F20 = 309,
-	F21 = 310,
-	F22 = 311,
-	F23 = 312,
-	F24 = 313,
-	F25 = 314,
-	/// \}
-	/**
-	 * \name Keypad digits and operators.
-	 * \{
-	 */
-	KP0 = 320,
-	KP1 = 321,
-	KP2 = 322,
-	KP3 = 323,
-	KP4 = 324,
-	KP5 = 325,
-	KP6 = 326,
-	KP7 = 327,
-	KP8 = 328,
-	KP9 = 329,
-	KP_DECIMAL = 330,
-	KP_DIVIDE = 331,
-	KP_MULTIPLY = 332,
-	KP_SUBTRACT = 333,
-	KP_ADD = 334,
-	KP_ENTER = 335,
-	KP_EQUAL = 336,
-	/// \}
-	/**
-	 * \name Modifier keys.
-	 * \{
-	 */
-	LEFT_SHIFT = 340,
-	LEFT_CONTROL = 341,
-	LEFT_ALT = 342,
-	LEFT_SUPER = 343,
-	RIGHT_SHIFT = 344,
-	RIGHT_CONTROL = 345,
-	RIGHT_ALT = 346,
-	RIGHT_SUPER = 347,
-	/// \}
-	MENU = 348, //!< Menu key.
-};
+	//! Enumeration for keyboard key inputs, including printable characters, function keys, and keypad keys.
+	enum class Keycode {
+		NONE = 0, //!< No key input.
+		SPACE = 32, //!< Spacebar.
+		APOSTROPHE = 39, //!< Apostrophe (').
+		COMMA = 44, //!< Comma (,).
+		MINUS = 45, //!< Minus (-).
+		PERIOD = 46, //!< Period (.).
+		SLASH = 47, //!< Slash (/).
+		D0 = 48, //!< Digit 0.
+		D1 = 49, //!< Digit 1.
+		D2 = 50, //!< Digit 2.
+		D3 = 51, //!< Digit 3.
+		D4 = 52, //!< Digit 4.
+		D5 = 53, //!< Digit 5.
+		D6 = 54, //!< Digit 6.
+		D7 = 55, //!< Digit 7.
+		D8 = 56, //!< Digit 8.
+		D9 = 57, //!< Digit 9.
+		SEMICOLON = 59, //!< Semicolon (;).
+		EQUAL = 61, //!< Equal sign (=).
+		A = 65, //!< Key 'A'.
+		B = 66, //!< Key 'B'.
+		C = 67, //!< Key 'C'.
+		D = 68, //!< Key 'D'.
+		E = 69, //!< Key 'E'.
+		F = 70, //!< Key 'F'.
+		G = 71, //!< Key 'G'.
+		H = 72, //!< Key 'H'.
+		I = 73, //!< Key 'I'.
+		J = 74, //!< Key 'J'.
+		K = 75, //!< Key 'K'.
+		L = 76, //!< Key 'L'.
+		M = 77, //!< Key 'M'.
+		N = 78, //!< Key 'N'.
+		O = 79, //!< Key 'O'.
+		P = 80, //!< Key 'P'.
+		Q = 81, //!< Key 'Q'.
+		R = 82, //!< Key 'R'.
+		S = 83, //!< Key 'S'.
+		T = 84, //!< Key 'T'.
+		U = 85, //!< Key 'U'.
+		V = 86, //!< Key 'V'.
+		W = 87, //!< Key 'W'.
+		X = 88, //!< Key 'X'.
+		Y = 89, //!< Key 'Y'.
+		Z = 90, //!< Key 'Z'.
+		LEFT_BRACKET = 91, //!< Left bracket ([).
+		BACKSLASH = 92, //!< Backslash (\).
+		RIGHT_BRACKET = 93, //!< Right bracket (]).
+		GRAVE_ACCENT = 96, //!< Grave accent (`).
+		WORLD1 = 161, //!< Non-US key #1.
+		WORLD2 = 162, //!< Non-US key #2.
+		ESCAPE = 256, //!< Escape key.
+		ENTER = 257, //!< Enter key.
+		TAB = 258, //!< Tab key.
+		BACKSPACE = 259, //!< Backspace key.
+		INSERT = 260, //!< Insert key.
+		DELETE = 261, //!< Delete key.
+		RIGHT = 262, //!< Right arrow key.
+		LEFT = 263, //!< Left arrow key.
+		DOWN = 264, //!< Down arrow key.
+		UP = 265, //!< Up arrow key.
+		PAGE_UP = 266, //!< Page Up key.
+		PAGE_DOWN = 267, //!< Page Down key.
+		HOME = 268, //!< Home key.
+		END = 269, //!< End key.
+		CAPS_LOCK = 280, //!< Caps Lock key.
+		SCROLL_LOCK = 281, //!< Scroll Lock key.
+		NUM_LOCK = 282, //!< Num Lock key.
+		PRINT_SCREEN = 283, //!< Print Screen key.
+		PAUSE = 284, //!< Pause key.
+		/**
+		 * \name Function keys (F1-F25).
+		 * \{
+		 */
+		F1 = 290,
+		F2 = 291,
+		F3 = 292,
+		F4 = 293,
+		F5 = 294,
+		F6 = 295,
+		F7 = 296,
+		F8 = 297,
+		F9 = 298,
+		F10 = 299,
+		F11 = 300,
+		F12 = 301,
+		F13 = 302,
+		F14 = 303,
+		F15 = 304,
+		F16 = 305,
+		F17 = 306,
+		F18 = 307,
+		F19 = 308,
+		F20 = 309,
+		F21 = 310,
+		F22 = 311,
+		F23 = 312,
+		F24 = 313,
+		F25 = 314,
+		/// \}
+		/**
+		 * \name Keypad digits and operators.
+		 * \{
+		 */
+		KP0 = 320,
+		KP1 = 321,
+		KP2 = 322,
+		KP3 = 323,
+		KP4 = 324,
+		KP5 = 325,
+		KP6 = 326,
+		KP7 = 327,
+		KP8 = 328,
+		KP9 = 329,
+		KP_DECIMAL = 330,
+		KP_DIVIDE = 331,
+		KP_MULTIPLY = 332,
+		KP_SUBTRACT = 333,
+		KP_ADD = 334,
+		KP_ENTER = 335,
+		KP_EQUAL = 336,
+		/// \}
+		/**
+		 * \name Modifier keys.
+		 * \{
+		 */
+		LEFT_SHIFT = 340,
+		LEFT_CONTROL = 341,
+		LEFT_ALT = 342,
+		LEFT_SUPER = 343,
+		RIGHT_SHIFT = 344,
+		RIGHT_CONTROL = 345,
+		RIGHT_ALT = 346,
+		RIGHT_SUPER = 347,
+		/// \}
+		MENU = 348, //!< Menu key.
+	};
+}
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index f57f7ef..1d7be69 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -1,11 +1,12 @@
-#include <functional>
+#pragma once
 
 #include "Component.h"
+
 #include "api/EventHandler.h"
 namespace crepe {
 class UiObject : public Component{
 public:
-	~UiObject(){};
+	UiObject();
 	int width = 0;
 	int height = 0;
 public:
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index ff7c9f0..1ef222c 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -17,6 +17,8 @@
 #include "../api/Sprite.h"
 #include "../api/Texture.h"
 #include "../api/Transform.h"
+#include "../api/EventManager.h"
+#include "../api/Vector2.h"
 #include "../util/Log.h"
 
 
@@ -74,27 +76,209 @@ SDLContext::~SDLContext() {
 	SDL_Quit();
 }
 
-void SDLContext::handle_events(bool & running) {
-	//TODO: wouter i need events
-	/*
-	SDL_Event event;
-	SDL_PollEvent(&event);
-	switch (event.type) {
-		case SDL_QUIT:
-			running = false;
-			break;
-		case SDL_KEYDOWN:
-			triggerEvent(KeyPressedEvent(getCustomKey(event.key.keysym.sym)));
-			break;
-		case SDL_MOUSEBUTTONDOWN:
-			int x, y;
-			SDL_GetMouseState(&x, &y);
-			triggerEvent(MousePressedEvent(x, y));
-			break;
-	}
-	*/
+void SDLContext::handle_events(bool &running) {
+    EventManager& event_manager = EventManager::get_instance();
+    SDL_Event event;
+
+    while (SDL_PollEvent(&event)) {
+        switch (event.type) {
+            case SDL_QUIT:
+                running = false;
+                event_manager.trigger_event(ShutDownEvent{});
+                break;
+            case SDL_KEYDOWN:
+                event_manager.trigger_event<KeyPressEvent>(KeyPressEvent{
+                    .repeat = (!event.key.repeat == 0),
+                    .key = this->sdl_to_keycode(event.key.keysym.scancode)
+                });
+                break;
+
+            case SDL_KEYUP:
+                event_manager.trigger_event<KeyReleaseEvent>(KeyReleaseEvent{
+                    .key = this->sdl_to_keycode(event.key.keysym.scancode),
+                });
+                break;
+
+            case SDL_MOUSEBUTTONDOWN:
+                {
+                    int x, y;
+                    SDL_GetMouseState(&x, &y);
+                    event_manager.trigger_event<MousePressEvent>(MousePressEvent{
+                        .mouse_x = x,
+                        .mouse_y = y,
+                        .button = this->sdl_to_mousebutton(event.button.button)
+                    });
+                }
+                break;
+
+            case SDL_MOUSEBUTTONUP:
+                {
+                    int x, y;
+                    SDL_GetMouseState(&x, &y);
+                    event_manager.trigger_event<MouseReleaseEvent>(MouseReleaseEvent{
+                        .mouse_x = x,
+                        .mouse_y = y,
+                        .button = this->sdl_to_mousebutton(event.button.button)
+                    });
+                }
+                break;
+
+            case SDL_MOUSEMOTION:
+                event_manager.trigger_event<MouseMoveEvent>(MouseMoveEvent{
+                    .mouse_x = event.motion.x,
+                    .mouse_y = event.motion.y,
+                    .rel_x = event.motion.xrel,
+                    .rel_y = event.motion.yrel
+                });
+                break;
+
+            case SDL_MOUSEWHEEL:
+                event_manager.trigger_event<MouseScrollEvent>(MouseScrollEvent{
+                    .scroll_x = event.wheel.x,
+                    .scroll_y = event.wheel.y,
+                    .direction = (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED ? -1 : 1)
+                });
+                break;
+        }
+    }
 }
 
+
+
+Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
+    static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
+        std::array<Keycode, SDL_NUM_SCANCODES> table{};
+        table.fill(Keycode::NONE);
+
+        table[SDL_SCANCODE_SPACE] = Keycode::SPACE;
+        table[SDL_SCANCODE_APOSTROPHE] = Keycode::APOSTROPHE;
+        table[SDL_SCANCODE_COMMA] = Keycode::COMMA;
+        table[SDL_SCANCODE_MINUS] = Keycode::MINUS;
+        table[SDL_SCANCODE_PERIOD] = Keycode::PERIOD;
+        table[SDL_SCANCODE_SLASH] = Keycode::SLASH;
+        table[SDL_SCANCODE_0] = Keycode::D0;
+        table[SDL_SCANCODE_1] = Keycode::D1;
+        table[SDL_SCANCODE_2] = Keycode::D2;
+        table[SDL_SCANCODE_3] = Keycode::D3;
+        table[SDL_SCANCODE_4] = Keycode::D4;
+        table[SDL_SCANCODE_5] = Keycode::D5;
+        table[SDL_SCANCODE_6] = Keycode::D6;
+        table[SDL_SCANCODE_7] = Keycode::D7;
+        table[SDL_SCANCODE_8] = Keycode::D8;
+        table[SDL_SCANCODE_9] = Keycode::D9;
+        table[SDL_SCANCODE_SEMICOLON] = Keycode::SEMICOLON;
+        table[SDL_SCANCODE_EQUALS] = Keycode::EQUAL;
+        table[SDL_SCANCODE_A] = Keycode::A;
+        table[SDL_SCANCODE_B] = Keycode::B;
+        table[SDL_SCANCODE_C] = Keycode::C;
+        table[SDL_SCANCODE_D] = Keycode::D;
+        table[SDL_SCANCODE_E] = Keycode::E;
+        table[SDL_SCANCODE_F] = Keycode::F;
+        table[SDL_SCANCODE_G] = Keycode::G;
+        table[SDL_SCANCODE_H] = Keycode::H;
+        table[SDL_SCANCODE_I] = Keycode::I;
+        table[SDL_SCANCODE_J] = Keycode::J;
+        table[SDL_SCANCODE_K] = Keycode::K;
+        table[SDL_SCANCODE_L] = Keycode::L;
+        table[SDL_SCANCODE_M] = Keycode::M;
+        table[SDL_SCANCODE_N] = Keycode::N;
+        table[SDL_SCANCODE_O] = Keycode::O;
+        table[SDL_SCANCODE_P] = Keycode::P;
+        table[SDL_SCANCODE_Q] = Keycode::Q;
+        table[SDL_SCANCODE_R] = Keycode::R;
+        table[SDL_SCANCODE_S] = Keycode::S;
+        table[SDL_SCANCODE_T] = Keycode::T;
+        table[SDL_SCANCODE_U] = Keycode::U;
+        table[SDL_SCANCODE_V] = Keycode::V;
+        table[SDL_SCANCODE_W] = Keycode::W;
+        table[SDL_SCANCODE_X] = Keycode::X;
+        table[SDL_SCANCODE_Y] = Keycode::Y;
+        table[SDL_SCANCODE_Z] = Keycode::Z;
+        table[SDL_SCANCODE_LEFTBRACKET] = Keycode::LEFT_BRACKET;
+        table[SDL_SCANCODE_BACKSLASH] = Keycode::BACKSLASH;
+        table[SDL_SCANCODE_RIGHTBRACKET] = Keycode::RIGHT_BRACKET;
+        table[SDL_SCANCODE_GRAVE] = Keycode::GRAVE_ACCENT;
+        table[SDL_SCANCODE_ESCAPE] = Keycode::ESCAPE;
+        table[SDL_SCANCODE_RETURN] = Keycode::ENTER;
+        table[SDL_SCANCODE_TAB] = Keycode::TAB;
+        table[SDL_SCANCODE_BACKSPACE] = Keycode::BACKSPACE;
+        table[SDL_SCANCODE_INSERT] = Keycode::INSERT;
+        table[SDL_SCANCODE_DELETE] = Keycode::DELETE;
+        table[SDL_SCANCODE_RIGHT] = Keycode::RIGHT;
+        table[SDL_SCANCODE_LEFT] = Keycode::LEFT;
+        table[SDL_SCANCODE_DOWN] = Keycode::DOWN;
+        table[SDL_SCANCODE_UP] = Keycode::UP;
+        table[SDL_SCANCODE_PAGEUP] = Keycode::PAGE_UP;
+        table[SDL_SCANCODE_PAGEDOWN] = Keycode::PAGE_DOWN;
+        table[SDL_SCANCODE_HOME] = Keycode::HOME;
+        table[SDL_SCANCODE_END] = Keycode::END;
+        table[SDL_SCANCODE_CAPSLOCK] = Keycode::CAPS_LOCK;
+        table[SDL_SCANCODE_SCROLLLOCK] = Keycode::SCROLL_LOCK;
+        table[SDL_SCANCODE_NUMLOCKCLEAR] = Keycode::NUM_LOCK;
+        table[SDL_SCANCODE_PRINTSCREEN] = Keycode::PRINT_SCREEN;
+        table[SDL_SCANCODE_PAUSE] = Keycode::PAUSE;
+        table[SDL_SCANCODE_F1] = Keycode::F1;
+        table[SDL_SCANCODE_F2] = Keycode::F2;
+        table[SDL_SCANCODE_F3] = Keycode::F3;
+        table[SDL_SCANCODE_F4] = Keycode::F4;
+        table[SDL_SCANCODE_F5] = Keycode::F5;
+        table[SDL_SCANCODE_F6] = Keycode::F6;
+        table[SDL_SCANCODE_F7] = Keycode::F7;
+        table[SDL_SCANCODE_F8] = Keycode::F8;
+        table[SDL_SCANCODE_F9] = Keycode::F9;
+        table[SDL_SCANCODE_F10] = Keycode::F10;
+        table[SDL_SCANCODE_F11] = Keycode::F11;
+        table[SDL_SCANCODE_F12] = Keycode::F12;
+        table[SDL_SCANCODE_KP_0] = Keycode::KP0;
+        table[SDL_SCANCODE_KP_1] = Keycode::KP1;
+        table[SDL_SCANCODE_KP_2] = Keycode::KP2;
+        table[SDL_SCANCODE_KP_3] = Keycode::KP3;
+        table[SDL_SCANCODE_KP_4] = Keycode::KP4;
+        table[SDL_SCANCODE_KP_5] = Keycode::KP5;
+        table[SDL_SCANCODE_KP_6] = Keycode::KP6;
+        table[SDL_SCANCODE_KP_7] = Keycode::KP7;
+        table[SDL_SCANCODE_KP_8] = Keycode::KP8;
+        table[SDL_SCANCODE_KP_9] = Keycode::KP9;
+        table[SDL_SCANCODE_LSHIFT] = Keycode::LEFT_SHIFT;
+        table[SDL_SCANCODE_LCTRL] = Keycode::LEFT_CONTROL;
+        table[SDL_SCANCODE_LALT] = Keycode::LEFT_ALT;
+        table[SDL_SCANCODE_LGUI] = Keycode::LEFT_SUPER;
+        table[SDL_SCANCODE_RSHIFT] = Keycode::RIGHT_SHIFT;
+        table[SDL_SCANCODE_RCTRL] = Keycode::RIGHT_CONTROL;
+        table[SDL_SCANCODE_RALT] = Keycode::RIGHT_ALT;
+        table[SDL_SCANCODE_RGUI] = Keycode::RIGHT_SUPER;
+        table[SDL_SCANCODE_MENU] = Keycode::MENU;
+
+        return table;
+    }();
+
+    if (sdl_key < 0 || sdl_key >= SDL_NUM_SCANCODES) {
+        return Keycode::NONE;
+    }
+
+    return LOOKUP_TABLE[sdl_key];
+}
+MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
+    static const std::array<MouseButton, 8> MOUSE_BUTTON_LOOKUP_TABLE = [] {
+        std::array<MouseButton, 8> table{};
+        table.fill(MouseButton::NONE);
+
+        table[SDL_BUTTON_LEFT] = MouseButton::LEFT_MOUSE;
+        table[SDL_BUTTON_RIGHT] = MouseButton::RIGHT_MOUSE;
+        table[SDL_BUTTON_MIDDLE] = MouseButton::MIDDLE_MOUSE;
+        table[SDL_BUTTON_X1] = MouseButton::X1_MOUSE;
+        table[SDL_BUTTON_X2] = MouseButton::X2_MOUSE;
+
+        return table;
+    }();
+
+    if (sdl_button >= MOUSE_BUTTON_LOOKUP_TABLE.size()) {
+		 // Return NONE for invalid or unmapped button
+        return MouseButton::NONE; 
+    }
+
+    return MOUSE_BUTTON_LOOKUP_TABLE[sdl_button];
+}
 void SDLContext::clear_screen() { SDL_RenderClear(this->game_renderer.get()); }
 void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer.get()); }
 
diff --git a/src/test/inputTest.cpp b/src/test/inputTest.cpp
index 0f02410..6b820ee 100644
--- a/src/test/inputTest.cpp
+++ b/src/test/inputTest.cpp
@@ -1,10 +1,18 @@
+#include <gtest/gtest.h>
+#define protected public
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_keycode.h>
 #include "system/InputSystem.h"
+#include <crepe/ComponentManager.h>
 #include "api/EventManager.h"
 #include "api/KeyCodes.h"
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <crepe/ComponentManager.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Metadata.h>
+#include <crepe/api/Transform.h>
+#include <crepe/api/Vector2.h>
+#include <crepe/api/Button.h>
 
 using namespace std;
 using namespace std::chrono_literals;
@@ -12,14 +20,17 @@ using namespace crepe;
 
 class InputTest : public ::testing::Test {
 public:
-InputSystem input_system;
+ComponentManager mgr{};
+InputSystem input_system{mgr};
+
 EventManager& event_manager = EventManager::get_instance();
 protected:
 	void SetUp() override {
+		event_manager.clear();
 	}
 
 	void TearDown() override {
-		
+		event_manager.clear();
 	}
 void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
     SDL_Event event;
@@ -41,13 +52,127 @@ void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
 
 };
 
-TEST_F(InputTest, KeyDown) {
-
+TEST_F(InputTest, MouseDown) {
+	bool mouse_triggered = false;
+	EventHandler<MousePressEvent> on_mouse_click = [&](const MousePressEvent& event) {
+        // Handle the mouse click event here
+		mouse_triggered = true;
+        EXPECT_EQ(event.mouse_x, 10);
+        EXPECT_EQ(event.mouse_y, 10);
+        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
+		return false;
+    };
+	event_manager.subscribe<MousePressEvent>(on_mouse_click);
 	SDL_Event event;
 	SDL_zero(event);
     event.type = SDL_MOUSEBUTTONDOWN;
     event.button.x = 10;
     event.button.y = 10;
-    event.button.button = mouse_bu;
-    SDL_PushEvent(&event);  // Push event into the SDL event queue
+    event.button.button = SDL_BUTTON_LEFT;
+    SDL_PushEvent(&event);
+	EXPECT_TRUE(mouse_triggered);
+}
+
+TEST_F(InputTest, MouseUp) {
+	 EventHandler<MouseReleaseEvent> on_mouse_click = [&](const MouseReleaseEvent& event) {
+        // Handle the mouse click event here
+        EXPECT_EQ(event.mouse_x, 10);
+        EXPECT_EQ(event.mouse_y, 10);
+        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
+		return false;
+    };
+	event_manager.subscribe<MouseReleaseEvent>(on_mouse_click);
+	SDL_Event event;
+	SDL_zero(event);
+    event.type = SDL_MOUSEBUTTONUP;
+    event.button.x = 10;
+    event.button.y = 10;
+    event.button.button = SDL_BUTTON_LEFT;
+    SDL_PushEvent(&event);
+}
+TEST_F(InputTest, MouseUp) {
+	 EventHandler<MouseReleaseEvent> on_mouse_click = [&](const MouseReleaseEvent& event) {
+        // Handle the mouse click event here
+        EXPECT_EQ(event.mouse_x, 10);
+        EXPECT_EQ(event.mouse_y, 10);
+        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
+		return false;
+    };
+	event_manager.subscribe<MouseReleaseEvent>(on_mouse_click);
+	SDL_Event event;
+	SDL_zero(event);
+    event.type = SDL_MOUSEBUTTONUP;
+    event.button.x = 10;
+    event.button.y = 10;
+    event.button.button = SDL_BUTTON_LEFT;
+    SDL_PushEvent(&event);
+}
+TEST_F(InputTest, KeyDown) {
+	 EventHandler<KeyPressEvent> on_mouse_click = [&](const KeyPressEvent& event) {
+        // Handle the mouse click event here
+        EXPECT_EQ(event.key, Keycode::B);
+		EXPECT_EQ(event.repeat, true);
+		return false;
+    };
+	event_manager.subscribe<KeyPressEvent>(on_mouse_click);
+	SDL_Event event;
+	SDL_zero(event);
+    event.type = SDL_KEYUP;
+    event.button.button = SDL_BUTTON_LEFT;
+	event.key.repeat = 1;
+    SDL_PushEvent(&event);
+}
+TEST_F(InputTest, KeyUp) {
+	 EventHandler<KeyReleaseEvent> on_mouse_click = [&](const KeyReleaseEvent& event) {
+        // Handle the mouse click event here
+        EXPECT_EQ(event.key, Keycode::B);
+		return false;
+    };
+	event_manager.subscribe<KeyReleaseEvent>(on_mouse_click);
+	SDL_Event event;
+	SDL_zero(event);
+    event.type = SDL_KEYUP;
+    event.button.button = SDL_BUTTON_LEFT;
+    SDL_PushEvent(&event);
+}
+TEST_F(InputTest, KeyClick) {
+	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
+	Button test_button;
+	bool button_clicked = false;
+	test_button.active = true;
+	test_button.width = 100;
+	test_button.height = 100;
+	std::function<void()> on_click = [&]() {
+        button_clicked = true;
+    };
+	test_button.on_click = on_click;
+	test_button.is_pressed = false;
+	test_button.is_toggle = false;
+	obj.add_component<Button>();
+	EventHandler<KeyReleaseEvent> on_mouse_click = [&](const KeyReleaseEvent& event) {
+        EXPECT_EQ(event.key, Keycode::B);
+		return false;
+    };
+	event_manager.subscribe<KeyReleaseEvent>(on_mouse_click);
+	SDL_Event event;
+	SDL_zero(event);
+    event.type = SDL_KEYUP;
+    event.button.button = SDL_BUTTON_LEFT;
+    SDL_PushEvent(&event);
+}
+TEST_F(InputTest, testButton) {
+	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
+	Button test_button;
+	bool button_clicked = false;
+	test_button.active = true;
+	test_button.width = 100;
+	test_button.height = 100;
+	std::function<void()> on_click = [&]() {
+        button_clicked = true;
+    };
+	test_button.on_click = on_click;
+	test_button.is_pressed = false;
+	test_button.is_toggle = false;
+	obj.add_component<Button>();
+	this->simulate_mouse_click(10,10,MouseButton::LEFT_MOUSE);
 }
-- 
cgit v1.2.3


From 327154fd428e0798eea544d9f073f8e1293aa158 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 25 Nov 2024 10:38:18 +0100
Subject: most test working

---
 src/crepe/api/Button.h           |   3 +-
 src/crepe/api/EventManager.hpp   |   2 +-
 src/crepe/api/UiObject.h         |   4 +-
 src/crepe/facade/SDLContext.cpp  |  86 +--------------
 src/crepe/facade/SDLContext.h    |   4 +-
 src/crepe/system/CMakeLists.txt  |   2 +
 src/crepe/system/InputSystem.cpp | 125 +++++++++++++--------
 src/crepe/system/InputSystem.h   |  17 ++-
 src/test/CMakeLists.txt          |   1 +
 src/test/EventTest.cpp           |  66 ++++++-----
 src/test/inputTest.cpp           | 231 ++++++++++++++++++++-------------------
 11 files changed, 266 insertions(+), 275 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 9b1341f..709854a 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -1,3 +1,4 @@
+#pragma once
 #include <functional>
 
 #include "Component.h"
@@ -6,7 +7,7 @@
 namespace crepe {
 class Button : public UiObject{
 public:
-	Button();
+	Button(game_object_id_t id) : UiObject(id){};
 	bool interactable = true;
 	bool is_toggle = false;
 	bool is_pressed = false;
diff --git a/src/crepe/api/EventManager.hpp b/src/crepe/api/EventManager.hpp
index a5f4556..3eae90a 100644
--- a/src/crepe/api/EventManager.hpp
+++ b/src/crepe/api/EventManager.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <iostream>
 #include "EventManager.h"
 
 namespace crepe {
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index 1d7be69..82140a0 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -4,12 +4,14 @@
 
 #include "api/EventHandler.h"
 namespace crepe {
+
 class UiObject : public Component{
 public:
-	UiObject();
+	UiObject(game_object_id_t id) : Component(id){};
 	int width = 0;
 	int height = 0;
 public:
 virtual int get_instances_max() const { return 1; }
 };
+
 }
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 1ef222c..f87cc61 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -76,75 +76,6 @@ SDLContext::~SDLContext() {
 	SDL_Quit();
 }
 
-void SDLContext::handle_events(bool &running) {
-    EventManager& event_manager = EventManager::get_instance();
-    SDL_Event event;
-
-    while (SDL_PollEvent(&event)) {
-        switch (event.type) {
-            case SDL_QUIT:
-                running = false;
-                event_manager.trigger_event(ShutDownEvent{});
-                break;
-            case SDL_KEYDOWN:
-                event_manager.trigger_event<KeyPressEvent>(KeyPressEvent{
-                    .repeat = (!event.key.repeat == 0),
-                    .key = this->sdl_to_keycode(event.key.keysym.scancode)
-                });
-                break;
-
-            case SDL_KEYUP:
-                event_manager.trigger_event<KeyReleaseEvent>(KeyReleaseEvent{
-                    .key = this->sdl_to_keycode(event.key.keysym.scancode),
-                });
-                break;
-
-            case SDL_MOUSEBUTTONDOWN:
-                {
-                    int x, y;
-                    SDL_GetMouseState(&x, &y);
-                    event_manager.trigger_event<MousePressEvent>(MousePressEvent{
-                        .mouse_x = x,
-                        .mouse_y = y,
-                        .button = this->sdl_to_mousebutton(event.button.button)
-                    });
-                }
-                break;
-
-            case SDL_MOUSEBUTTONUP:
-                {
-                    int x, y;
-                    SDL_GetMouseState(&x, &y);
-                    event_manager.trigger_event<MouseReleaseEvent>(MouseReleaseEvent{
-                        .mouse_x = x,
-                        .mouse_y = y,
-                        .button = this->sdl_to_mousebutton(event.button.button)
-                    });
-                }
-                break;
-
-            case SDL_MOUSEMOTION:
-                event_manager.trigger_event<MouseMoveEvent>(MouseMoveEvent{
-                    .mouse_x = event.motion.x,
-                    .mouse_y = event.motion.y,
-                    .rel_x = event.motion.xrel,
-                    .rel_y = event.motion.yrel
-                });
-                break;
-
-            case SDL_MOUSEWHEEL:
-                event_manager.trigger_event<MouseScrollEvent>(MouseScrollEvent{
-                    .scroll_x = event.wheel.x,
-                    .scroll_y = event.wheel.y,
-                    .direction = (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED ? -1 : 1)
-                });
-                break;
-        }
-    }
-}
-
-
-
 Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
     static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
         std::array<Keycode, SDL_NUM_SCANCODES> table{};
@@ -259,8 +190,8 @@ Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
     return LOOKUP_TABLE[sdl_key];
 }
 MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
-    static const std::array<MouseButton, 8> MOUSE_BUTTON_LOOKUP_TABLE = [] {
-        std::array<MouseButton, 8> table{};
+    static const std::array<MouseButton, 5> MOUSE_BUTTON_LOOKUP_TABLE = [] {
+        std::array<MouseButton, 5> table{};
         table.fill(MouseButton::NONE);
 
         table[SDL_BUTTON_LEFT] = MouseButton::LEFT_MOUSE;
@@ -409,7 +340,7 @@ std::vector<SDLContext::EventData> SDLContext::get_events(){
 					event_list.push_back(EventData{
 						.event_type = SDLContext::Event::MOUSEDOWN,
 						.mouse_button = sdl_to_mousebutton(event.button.button),
-						.mouse_position = {x,y},
+						.mouse_position = {event.button.x,event.button.y},
 					});
 				}
                 break;
@@ -420,32 +351,27 @@ std::vector<SDLContext::EventData> SDLContext::get_events(){
 					event_list.push_back(EventData{
 						.event_type = SDLContext::Event::MOUSEUP,
 						.mouse_button = sdl_to_mousebutton(event.button.button),
-						.mouse_position = {x,y},
+						.mouse_position = {event.button.x,event.button.y},
 					});
 				}
                 break;
 
             case SDL_MOUSEMOTION:
                 {
-					int x,y;
-					SDL_GetMouseState(&x, &y);
 					event_list.push_back(EventData{
 						.event_type = SDLContext::Event::MOUSEMOVE,
-						.mouse_position = {x,y},
+						.mouse_position = {event.button.x,event.button.y},
 					});
 				}
                 break;
 
             case SDL_MOUSEWHEEL:
                 {
-					int x, y;
-					SDL_GetMouseState(&x, &y);
-
 					event_list.push_back(EventData{
 						.event_type = SDLContext::Event::MOUSEWHEEL,
 						.mouse_position = {event.motion.x,event.motion.y},
 						.wheel_delta = event.wheel.y,
-						.rel_mouse_move {event.motion.yrel,event.motion.xrel},
+						.rel_mouse_move =  {event.motion.yrel,event.motion.xrel},
 					});
 				}
                 break;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 5b6b093..1b881d1 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -6,6 +6,7 @@
 #include <SDL2/SDL_video.h>
 #include <cmath>
 #include <functional>
+#include <utility>
 #include <memory>
 #include <string>
 
@@ -43,7 +44,7 @@ public:
 		MOUSEWHEEL,
 		KEYUP,
 		KEYDOWN,
-		SHUTDOWN
+		SHUTDOWN,
 
 	};
 	struct EventData {
@@ -73,7 +74,6 @@ private:
 	 * \brief Handles SDL events such as window close and input.
 	 * \param running Reference to a boolean flag that controls the main loop.
 	 */
-	void handle_events(bool & running);
 	std::vector<SDLContext::EventData> get_events();
 	
 	Keycode get_key();
diff --git a/src/crepe/system/CMakeLists.txt b/src/crepe/system/CMakeLists.txt
index d658b25..95f6e33 100644
--- a/src/crepe/system/CMakeLists.txt
+++ b/src/crepe/system/CMakeLists.txt
@@ -6,6 +6,7 @@ target_sources(crepe PUBLIC
 	CollisionSystem.cpp
 	RenderSystem.cpp
 	AnimatorSystem.cpp
+	InputSystem.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -15,4 +16,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	CollisionSystem.h
 	RenderSystem.h
 	AnimatorSystem.h
+	InputSystem.h
 )
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index c61a80f..4560411 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,7 +1,7 @@
 #include "ComponentManager.h"
-#include "../api/Button.h"
+
 #include "../api/EventManager.h"
-#include "../api/Transform.h"
+
 #include "../facade/SDLContext.h"
 #include "../api/Event.h"
 
@@ -14,32 +14,67 @@ using namespace crepe;
 void InputSystem::update() {
 	EventManager& event_mgr = EventManager::get_instance();
     std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
-
+	
     for (SDLContext::EventData event : event_list) {
         switch (event.event_type) {
             case SDLContext::Event::KEYDOWN: {
-                event_mgr.queue_event(KeyPressEvent{
+                event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{
+					.repeat = event.key_repeat,
                     .key = event.key,
-                    .repeat = event.key_repeat,
                 });
                 break;
             }
             case SDLContext::Event::KEYUP: {
-                event_mgr.queue_event(KeyReleaseEvent{
+                event_mgr.queue_event<KeyReleaseEvent>(KeyReleaseEvent{
                     .key = event.key,
                 });
                 break;
             }
             case SDLContext::Event::MOUSEDOWN: {
-                event_mgr.queue_event(MousePressEvent{
+                event_mgr.queue_event<MousePressEvent>(MousePressEvent{
                     .mouse_x = event.mouse_position.first,
                     .mouse_y = event.mouse_position.second,
                     .button = event.mouse_button,
                 });
+				last_mouse_down_position = {event.mouse_position.first,event.mouse_position.second};
+    			last_mouse_button = event.mouse_button;
                 break;
             }
+			case SDLContext::Event::MOUSEUP: {
+				MouseReleaseEvent mouse_release_event = MouseReleaseEvent{
+					.mouse_x = event.mouse_position.first,
+					.mouse_y = event.mouse_position.second,
+					.button = event.mouse_button,
+				};
+				event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event);
+
+				// Calculate deltas for click detection
+				int delta_x = event.mouse_position.first - last_mouse_down_position.first;
+				int delta_y = event.mouse_position.second - last_mouse_down_position.second;
+
+				// Ensure last_mouse_button is properly set and matches the current mouse button
+				if (last_mouse_button == event.mouse_button &&
+					std::abs(delta_x) <= click_tolerance &&
+					std::abs(delta_y) <= click_tolerance) {
+					std::cout << "Click registered at (" << event.mouse_position.first
+							<< ", " << event.mouse_position.second << ") with button "
+							<< static_cast<int>(event.mouse_button) << std::endl;
+
+					event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
+						.mouse_x = event.mouse_position.first,
+						.mouse_y = event.mouse_position.second,
+						.button = event.mouse_button,
+					});
+
+					this->handle_click(mouse_release_event);
+				} else {
+					std::cout << "Mouse release did not register as a click." << std::endl;
+				}
+
+				break;
+			}
             case SDLContext::Event::MOUSEMOVE: {
-                event_mgr.queue_event(MouseMoveEvent{
+                event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
                     .mouse_x = event.mouse_position.first,
                     .mouse_y = event.mouse_position.second,
                     .rel_x = event.rel_mouse_move.first,  
@@ -47,27 +82,9 @@ void InputSystem::update() {
                 });
                 break;
             }
-            case SDLContext::Event::MOUSEUP: {
-                event_mgr.queue_event(MouseReleaseEvent{
-                    .mouse_x = event.mouse_position.first,
-                    .mouse_y = event.mouse_position.second,
-                    .button = event.mouse_button,
-                });
-                int delta_x = event.mouse_position.first - last_mouse_down_position.first;
-                int delta_y = event.mouse_position.second - last_mouse_down_position.second;
-                if (last_mouse_button == event.mouse_button &&
-                    std::abs(delta_x) <= click_tolerance &&
-                    std::abs(delta_y) <= click_tolerance) {
-                    event_mgr.queue_event(MouseClickEvent{
-                        .mouse_x = event.mouse_position.first,
-                        .mouse_y = event.mouse_position.second,
-                        .button = event.mouse_button,
-                    });
-                }
-                break;
-            }
+           
             case SDLContext::Event::MOUSEWHEEL: {
-                event_mgr.queue_event(MouseScrollEvent{
+                event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{
                     .scroll_x = event.mouse_position.first,
                     .scroll_y = event.mouse_position.second,
                     .direction = event.wheel_delta,
@@ -75,7 +92,7 @@ void InputSystem::update() {
                 break;
             }
             case SDLContext::Event::SHUTDOWN: {
-                event_mgr.queue_event(ShutDownEvent{});
+                event_mgr.queue_event<ShutDownEvent>(ShutDownEvent{});
                 break;
             }
             default:
@@ -84,24 +101,44 @@ void InputSystem::update() {
     }
 }
 
-bool InputSystem::handle_click(const MouseClickEvent &event) {
+void InputSystem::handle_click(const MouseReleaseEvent event) {
     ComponentManager &mgr = this->component_manager;
 
-    std::vector<std::reference_wrapper<Button>> buttons =
-        mgr.get_components_by_type<Button>();
-	
-	std::vector<std::reference_wrapper<Transform>> transforms =
-        mgr.get_components_by_type<Transform>();
+    // Get the buttons and transforms
+    std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
+    std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
+
     for (Button &button : buttons) {
-		for(Transform& transform : transforms){
-			if(button.game_object_id != transform.game_object_id){continue;}
-			if (!button.interactable) {break;}
-            if (event.mouse_x >= transform.position.x && event.mouse_x <= transform.position.x + button.width &&
-                event.mouse_y >= transform.position.y && event.mouse_y <= transform.position.y + button.height) {
-                button.on_click();
-            }
-		}
+        Transform* transform = find_transform_for_button(button, transforms);
+        if (!transform) continue; 
+        
+        if (button.interactable && is_mouse_inside_button(event, button, *transform)) {
+            handle_button_press(button, event);
+        }
+    }
+}
+
+Transform* InputSystem::find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms) {
+    for (Transform &transform : transforms) {
+        if (button.game_object_id == transform.game_object_id) {
+            return &transform;
+        }
     }
-    return false;
+    return nullptr;
+}
+
+bool InputSystem::is_mouse_inside_button(const MouseReleaseEvent &event, const Button &button, const Transform &transform) {
+    return event.mouse_x >= transform.position.x && event.mouse_x <= transform.position.x + button.width &&
+           event.mouse_y >= transform.position.y && event.mouse_y <= transform.position.y + button.height;
 }
 
+void InputSystem::handle_button_press(Button &button, const MouseReleaseEvent &event) {
+    if (button.is_toggle) {
+        if (!button.is_pressed) {
+            button.on_click();
+        }
+        button.is_pressed = !button.is_pressed;
+    } else {
+        button.on_click();
+    }
+}
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 231aa45..db6b374 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -1,7 +1,13 @@
 #pragma once
 
+#include <utility>
+
 #include "System.h"
+
 #include "../api/Event.h"
+#include "../api/Button.h"
+#include "../api/Transform.h"
+
 namespace crepe {
 
 class InputSystem : public System {
@@ -14,10 +20,13 @@ private:
 	std::pair<int, int> last_mouse_down_position{-1, -1};
     MouseButton last_mouse_button = MouseButton::NONE;
 	const int click_tolerance = 5;
-	bool handle_click(const MouseClickEvent &event);
-	bool handle_move(const MouseMoveEvent &event);
-	bool handle_key_press(const KeyPressEvent &event);
-	bool handle_key_release(const KeyReleaseEvent &event);
+	void handle_click(const MouseReleaseEvent);
+
+    Transform* find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms);
+
+    bool is_mouse_inside_button(const MouseReleaseEvent &event, const Button &button, const Transform &transform);
+
+    void handle_button_press(Button &button, const MouseReleaseEvent &event);
 };
 
 } // namespace crepe
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index d310f6a..ac4d73a 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -12,4 +12,5 @@ target_sources(test_main PUBLIC
 	ValueBrokerTest.cpp
 	DBTest.cpp
 	Vector2Test.cpp
+	inputTest.cpp
 )
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index b0e6c9c..4af0830 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -154,37 +154,45 @@ TEST_F(EventManagerTest, EventManagerTest_callback_propagation) {
 }
 
 TEST_F(EventManagerTest, EventManagerTest_queue_dispatch) {
-	EventManager & event_manager = EventManager::get_instance();
-	bool triggered1 = false;
-	bool triggered2 = false;
-	int test_channel = 1;
-	EventHandler<MouseClickEvent> mouse_handler1 = [&](const MouseClickEvent & e) {
-		triggered1 = true;
-		EXPECT_EQ(e.mouse_x, 100);
-		EXPECT_EQ(e.mouse_y, 200);
-		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
-		return false; // Allows propagation
-	};
-	EventHandler<MouseClickEvent> mouse_handler2 = [&](const MouseClickEvent & e) {
-		triggered2 = true;
-		EXPECT_EQ(e.mouse_x, 100);
-		EXPECT_EQ(e.mouse_y, 200);
-		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
-		return false; // Allows propagation
-	};
-	event_manager.subscribe<MouseClickEvent>(mouse_handler1);
-	event_manager.subscribe<MouseClickEvent>(mouse_handler2, test_channel);
-
-	event_manager.queue_event<MouseClickEvent>(
-		MouseClickEvent{.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE});
-	event_manager.queue_event<MouseClickEvent>(
-		MouseClickEvent{.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE},
-		test_channel);
-	event_manager.dispatch_events();
-	EXPECT_TRUE(triggered1);
-	EXPECT_TRUE(triggered2);
+    EventManager & event_manager = EventManager::get_instance();
+    bool triggered1 = false;
+    bool triggered2 = false;
+    int test_channel = 1;
+    
+    // Adjusted to use KeyPressEvent with repeat as the first variable
+    EventHandler<KeyPressEvent> key_handler1 = [&](const KeyPressEvent & e) {
+        triggered1 = true;
+        EXPECT_EQ(e.repeat, false);  // Expecting repeat to be false
+        EXPECT_EQ(e.key, Keycode::A);   // Adjust expected key code
+        return false; // Allows propagation
+    };
+    
+    EventHandler<KeyPressEvent> key_handler2 = [&](const KeyPressEvent & e) {
+        triggered2 = true;
+        EXPECT_EQ(e.repeat, false);  // Expecting repeat to be false
+        EXPECT_EQ(e.key, Keycode::A);   // Adjust expected key code
+        return false; // Allows propagation
+    };
+
+    // Subscribe handlers to KeyPressEvent
+    event_manager.subscribe<KeyPressEvent>(key_handler1);
+    event_manager.subscribe<KeyPressEvent>(key_handler2, test_channel);
+
+    // Queue a KeyPressEvent instead of KeyDownEvent
+    event_manager.queue_event<KeyPressEvent>(
+        KeyPressEvent{.repeat = false, .key = Keycode::A});  // Adjust event with repeat flag first
+    
+    event_manager.queue_event<KeyPressEvent>(
+        KeyPressEvent{.repeat = false, .key = Keycode::A},  // Adjust event for second subscription
+        test_channel);
+
+    event_manager.dispatch_events();
+    
+    EXPECT_TRUE(triggered1);
+    EXPECT_TRUE(triggered2);
 }
 
+
 TEST_F(EventManagerTest, EventManagerTest_unsubscribe) {
 	EventManager & event_manager = EventManager::get_instance();
 
diff --git a/src/test/inputTest.cpp b/src/test/inputTest.cpp
index 6b820ee..2fc5ad9 100644
--- a/src/test/inputTest.cpp
+++ b/src/test/inputTest.cpp
@@ -20,159 +20,164 @@ using namespace crepe;
 
 class InputTest : public ::testing::Test {
 public:
-ComponentManager mgr{};
-InputSystem input_system{mgr};
+    ComponentManager mgr{};
+    InputSystem input_system{mgr};
+
+    EventManager& event_manager = EventManager::get_instance();
 
-EventManager& event_manager = EventManager::get_instance();
 protected:
-	void SetUp() override {
-		event_manager.clear();
-	}
-
-	void TearDown() override {
-		event_manager.clear();
-	}
-void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
-    SDL_Event event;
+    void SetUp() override {
+        event_manager.clear();
+    }
 
-    // Simulate Mouse Button Down event
-    SDL_zero(event);
-    event.type = SDL_MOUSEBUTTONDOWN;
-    event.button.x = mouse_x;
-    event.button.y = mouse_y;
-    event.button.button = mouse_button;
-    SDL_PushEvent(&event);
-    SDL_zero(event);
-    event.type = SDL_MOUSEBUTTONUP;
-    event.button.x = mouse_x;
-    event.button.y = mouse_y;
-    event.button.button = mouse_button;
-    SDL_PushEvent(&event);
-}
+    void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
+        SDL_Event event;
 
+        // Simulate Mouse Button Down event
+        SDL_zero(event);
+        event.type = SDL_MOUSEBUTTONDOWN;
+        event.button.x = mouse_x;
+        event.button.y = mouse_y;
+        event.button.button = mouse_button;
+        SDL_PushEvent(&event);
+        SDL_zero(event);
+        event.type = SDL_MOUSEBUTTONUP;
+        event.button.x = mouse_x;
+        event.button.y = mouse_y;
+        event.button.button = mouse_button;
+        SDL_PushEvent(&event);
+    }
 };
 
 TEST_F(InputTest, MouseDown) {
-	bool mouse_triggered = false;
-	EventHandler<MousePressEvent> on_mouse_click = [&](const MousePressEvent& event) {
-        // Handle the mouse click event here
-		mouse_triggered = true;
+    bool mouse_triggered = false;
+    EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent& event) {
+        mouse_triggered = true;
         EXPECT_EQ(event.mouse_x, 10);
         EXPECT_EQ(event.mouse_y, 10);
         EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
-		return false;
+        return false;
     };
-	event_manager.subscribe<MousePressEvent>(on_mouse_click);
-	SDL_Event event;
-	SDL_zero(event);
+    event_manager.subscribe<MousePressEvent>(on_mouse_down);
+	
+    SDL_Event event;
+    SDL_zero(event);
     event.type = SDL_MOUSEBUTTONDOWN;
     event.button.x = 10;
     event.button.y = 10;
     event.button.button = SDL_BUTTON_LEFT;
     SDL_PushEvent(&event);
-	EXPECT_TRUE(mouse_triggered);
+	input_system.update();
+	event_manager.dispatch_events();
+    EXPECT_TRUE(mouse_triggered);
 }
 
 TEST_F(InputTest, MouseUp) {
-	 EventHandler<MouseReleaseEvent> on_mouse_click = [&](const MouseReleaseEvent& event) {
+	bool function_triggered = false;
+    EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent& e) {
         // Handle the mouse click event here
-        EXPECT_EQ(event.mouse_x, 10);
-        EXPECT_EQ(event.mouse_y, 10);
-        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
-		return false;
+		function_triggered = true;
+        EXPECT_EQ(e.mouse_x, 10);
+        EXPECT_EQ(e.mouse_y, 10);
+        EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
+        return false;
     };
-	event_manager.subscribe<MouseReleaseEvent>(on_mouse_click);
-	SDL_Event event;
-	SDL_zero(event);
-    event.type = SDL_MOUSEBUTTONUP;
-    event.button.x = 10;
-    event.button.y = 10;
-    event.button.button = SDL_BUTTON_LEFT;
-    SDL_PushEvent(&event);
-}
-TEST_F(InputTest, MouseUp) {
-	 EventHandler<MouseReleaseEvent> on_mouse_click = [&](const MouseReleaseEvent& event) {
-        // Handle the mouse click event here
-        EXPECT_EQ(event.mouse_x, 10);
-        EXPECT_EQ(event.mouse_y, 10);
-        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
-		return false;
-    };
-	event_manager.subscribe<MouseReleaseEvent>(on_mouse_click);
-	SDL_Event event;
-	SDL_zero(event);
+    event_manager.subscribe<MouseReleaseEvent>(on_mouse_release);
+	
+    SDL_Event event;
+    SDL_zero(event);
     event.type = SDL_MOUSEBUTTONUP;
     event.button.x = 10;
     event.button.y = 10;
     event.button.button = SDL_BUTTON_LEFT;
     SDL_PushEvent(&event);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_TRUE(function_triggered);
 }
+
 TEST_F(InputTest, KeyDown) {
-	 EventHandler<KeyPressEvent> on_mouse_click = [&](const KeyPressEvent& event) {
-        // Handle the mouse click event here
-        EXPECT_EQ(event.key, Keycode::B);
-		EXPECT_EQ(event.repeat, true);
-		return false;
+    bool function_triggered = false;
+
+    // Define event handler for KeyPressEvent
+    EventHandler<KeyPressEvent> on_key_press = [&](const KeyPressEvent& event) {
+        function_triggered = true;
+        EXPECT_EQ(event.key, Keycode::B); // Validate the key is 'B'
+        EXPECT_EQ(event.repeat, true);   // Validate repeat flag
+        return false;
     };
-	event_manager.subscribe<KeyPressEvent>(on_mouse_click);
-	SDL_Event event;
-	SDL_zero(event);
-    event.type = SDL_KEYUP;
-    event.button.button = SDL_BUTTON_LEFT;
-	event.key.repeat = 1;
-    SDL_PushEvent(&event);
+
+    event_manager.subscribe<KeyPressEvent>(on_key_press);
+
+    // Simulate SDL_KEYDOWN event
+    SDL_Event test_event;
+    SDL_zero(test_event);
+    test_event.type = SDL_KEYDOWN;                      // Key down event
+    test_event.key.keysym.scancode = SDL_SCANCODE_B;    // Set scancode for 'B'
+    test_event.key.repeat = 1;                          // Set repeat flag
+    SDL_PushEvent(&test_event);
+
+    input_system.update();             // Process the event
+    event_manager.dispatch_events();   // Dispatch events to handlers
+
+    EXPECT_TRUE(function_triggered);  // Check if the handler was triggered
 }
+
 TEST_F(InputTest, KeyUp) {
-	 EventHandler<KeyReleaseEvent> on_mouse_click = [&](const KeyReleaseEvent& event) {
-        // Handle the mouse click event here
+	bool function_triggered = false;
+    EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent& event) {
+        function_triggered = true;
         EXPECT_EQ(event.key, Keycode::B);
-		return false;
+        return false;
     };
-	event_manager.subscribe<KeyReleaseEvent>(on_mouse_click);
-	SDL_Event event;
-	SDL_zero(event);
+    event_manager.subscribe<KeyReleaseEvent>(on_key_release);
+	
+    SDL_Event event;
+    SDL_zero(event);
     event.type = SDL_KEYUP;
-    event.button.button = SDL_BUTTON_LEFT;
+    event.key.keysym.scancode = SDL_SCANCODE_B;
     SDL_PushEvent(&event);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_TRUE(function_triggered);
 }
-TEST_F(InputTest, KeyClick) {
-	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	Button test_button;
-	bool button_clicked = false;
-	test_button.active = true;
-	test_button.width = 100;
-	test_button.height = 100;
-	std::function<void()> on_click = [&]() {
-        button_clicked = true;
-    };
-	test_button.on_click = on_click;
-	test_button.is_pressed = false;
-	test_button.is_toggle = false;
-	obj.add_component<Button>();
-	EventHandler<KeyReleaseEvent> on_mouse_click = [&](const KeyReleaseEvent& event) {
-        EXPECT_EQ(event.key, Keycode::B);
-		return false;
+
+TEST_F(InputTest, MouseClick) {
+    bool on_click_triggered = false;
+    EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent& event) {
+        on_click_triggered = true;
+        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
+        EXPECT_EQ(event.mouse_x, 10);
+        EXPECT_EQ(event.mouse_y, 10);
+        return false;
     };
-	event_manager.subscribe<KeyReleaseEvent>(on_mouse_click);
-	SDL_Event event;
-	SDL_zero(event);
-    event.type = SDL_KEYUP;
-    event.button.button = SDL_BUTTON_LEFT;
-    SDL_PushEvent(&event);
+    event_manager.subscribe<MouseClickEvent>(on_mouse_click);
+	
+	this->simulate_mouse_click(10,10,SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+    EXPECT_TRUE(on_click_triggered);
 }
+
 TEST_F(InputTest, testButton) {
-	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	Button test_button;
+    GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
+	//auto test_button = std::make_unique<Button>();
+    // Button test_button = new Button(obj.id);
+    
+    auto button = obj.add_component<Button>();
 	bool button_clicked = false;
-	test_button.active = true;
-	test_button.width = 100;
-	test_button.height = 100;
-	std::function<void()> on_click = [&]() {
+    button.active = true;
+	button.interactable = true;
+    button.width = 100;
+    button.height = 100;
+    std::function<void()> on_click = [&]() {
         button_clicked = true;
     };
-	test_button.on_click = on_click;
-	test_button.is_pressed = false;
-	test_button.is_toggle = false;
-	obj.add_component<Button>();
-	this->simulate_mouse_click(10,10,MouseButton::LEFT_MOUSE);
+    button.on_click = on_click;
+    button.is_pressed = false;
+    button.is_toggle = false;
+    this->simulate_mouse_click(10,10, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	//EXPECT_TRUE(button_clicked);
 }
-- 
cgit v1.2.3


From 596358ffea72aec48b389609349f717e76396ae2 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 25 Nov 2024 11:17:20 +0100
Subject: button test working

---
 src/crepe/api/Button.h           |  1 +
 src/crepe/facade/SDLContext.cpp  |  2 +-
 src/crepe/system/InputSystem.cpp | 31 ++++++++++++-----
 src/crepe/system/InputSystem.h   |  2 +-
 src/test/inputTest.cpp           | 75 +++++++++++++++++++++++++++++++++++-----
 5 files changed, 92 insertions(+), 19 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 709854a..f533452 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -11,6 +11,7 @@ public:
 	bool interactable = true;
 	bool is_toggle = false;
 	bool is_pressed = false;
+	bool hover = false;
 	std::function<void()> on_click;
 public:
 virtual int get_instances_max() const { return 1; }
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index f87cc61..6371a51 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -361,6 +361,7 @@ std::vector<SDLContext::EventData> SDLContext::get_events(){
 					event_list.push_back(EventData{
 						.event_type = SDLContext::Event::MOUSEMOVE,
 						.mouse_position = {event.button.x,event.button.y},
+						.rel_mouse_move =  {event.motion.yrel,event.motion.xrel}
 					});
 				}
                 break;
@@ -371,7 +372,6 @@ std::vector<SDLContext::EventData> SDLContext::get_events(){
 						.event_type = SDLContext::Event::MOUSEWHEEL,
 						.mouse_position = {event.motion.x,event.motion.y},
 						.wheel_delta = event.wheel.y,
-						.rel_mouse_move =  {event.motion.yrel,event.motion.xrel},
 					});
 				}
                 break;
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 4560411..a3e28e4 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -56,10 +56,6 @@ void InputSystem::update() {
 				if (last_mouse_button == event.mouse_button &&
 					std::abs(delta_x) <= click_tolerance &&
 					std::abs(delta_y) <= click_tolerance) {
-					std::cout << "Click registered at (" << event.mouse_position.first
-							<< ", " << event.mouse_position.second << ") with button "
-							<< static_cast<int>(event.mouse_button) << std::endl;
-
 					event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
 						.mouse_x = event.mouse_position.first,
 						.mouse_y = event.mouse_position.second,
@@ -67,8 +63,6 @@ void InputSystem::update() {
 					});
 
 					this->handle_click(mouse_release_event);
-				} else {
-					std::cout << "Mouse release did not register as a click." << std::endl;
 				}
 
 				break;
@@ -101,6 +95,25 @@ void InputSystem::update() {
     }
 }
 
+void InputSystem::handle_move(const MouseMoveEvent){
+	ComponentManager &mgr = this->component_manager;
+
+    // Get the buttons and transforms
+    std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
+    std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
+
+    for (Button &button : buttons) {
+        Transform* transform = find_transform_for_button(button, transforms);
+        if (!transform) continue; 
+        
+        if (button.interactable && is_mouse_inside_button(event, button, *transform)) {
+			button.hover = true;
+        }else{
+			button.hover = false;
+		}
+    }
+}
+
 void InputSystem::handle_click(const MouseReleaseEvent event) {
     ComponentManager &mgr = this->component_manager;
 
@@ -134,11 +147,11 @@ bool InputSystem::is_mouse_inside_button(const MouseReleaseEvent &event, const B
 
 void InputSystem::handle_button_press(Button &button, const MouseReleaseEvent &event) {
     if (button.is_toggle) {
-        if (!button.is_pressed) {
-            button.on_click();
+        if (!button.is_pressed && button.on_click) {
+    		button.on_click();
         }
         button.is_pressed = !button.is_pressed;
-    } else {
+    } else if(button.on_click) {
         button.on_click();
     }
 }
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index db6b374..5f71687 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -21,7 +21,7 @@ private:
     MouseButton last_mouse_button = MouseButton::NONE;
 	const int click_tolerance = 5;
 	void handle_click(const MouseReleaseEvent);
-
+	void handle_move(const MouseMoveEvent);
     Transform* find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms);
 
     bool is_mouse_inside_button(const MouseReleaseEvent &event, const Button &button, const Transform &transform);
diff --git a/src/test/inputTest.cpp b/src/test/inputTest.cpp
index 2fc5ad9..0ca415a 100644
--- a/src/test/inputTest.cpp
+++ b/src/test/inputTest.cpp
@@ -96,6 +96,32 @@ TEST_F(InputTest, MouseUp) {
 	EXPECT_TRUE(function_triggered);
 }
 
+TEST_F(InputTest, MouseMove) {
+	bool function_triggered = false;
+    EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent& e) {
+        // Handle the mouse click event here
+		function_triggered = true;
+        EXPECT_EQ(e.mouse_x, 10);
+        EXPECT_EQ(e.mouse_y, 10);
+		EXPECT_EQ(e.rel_x, 10);
+        EXPECT_EQ(e.rel_y, 10);
+        return false;
+    };
+    event_manager.subscribe<MouseMoveEvent>(on_mouse_move);
+	
+    SDL_Event event;
+    SDL_zero(event);
+    event.type = SDL_MOUSEMOTION;
+    event.motion.x = 10;
+    event.motion.y = 10;
+	event.motion.xrel = 10;
+	event.motion.yrel = 10;
+    SDL_PushEvent(&event);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_TRUE(function_triggered);
+}
+
 TEST_F(InputTest, KeyDown) {
     bool function_triggered = false;
 
@@ -159,13 +185,11 @@ TEST_F(InputTest, MouseClick) {
     EXPECT_TRUE(on_click_triggered);
 }
 
-TEST_F(InputTest, testButton) {
+TEST_F(InputTest, testButtonClick) {
     GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	//auto test_button = std::make_unique<Button>();
-    // Button test_button = new Button(obj.id);
-    
-    auto button = obj.add_component<Button>();
+    auto& button = obj.add_component<Button>();
 	bool button_clicked = false;
+	bool hover = false;
     button.active = true;
 	button.interactable = true;
     button.width = 100;
@@ -173,11 +197,46 @@ TEST_F(InputTest, testButton) {
     std::function<void()> on_click = [&]() {
         button_clicked = true;
     };
-    button.on_click = on_click;
+	button.on_click = on_click;
+    button.is_pressed = false;
+    button.is_toggle = false;
+    this->simulate_mouse_click(101,101, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_FALSE(button_clicked);
+	this->simulate_mouse_click(10,10, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_TRUE(button_clicked);
+}
+
+TEST_F(InputTest, testButtonHover) {
+    GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
+    auto& button = obj.add_component<Button>();
+	bool button_clicked = false;
+	bool hover = false;
+    button.active = true;
+	button.interactable = true;
+    button.width = 100;
+    button.height = 100;
     button.is_pressed = false;
     button.is_toggle = false;
-    this->simulate_mouse_click(10,10, SDL_BUTTON_LEFT);
+
+	SDL_Event event;
+    SDL_zero(event);
+    event.type = SDL_MOUSEMOTION;
+    event.motion.x = 10;
+    event.motion.y = 10;
+	event.motion.xrel = 10;
+	event.motion.yrel = 10;
+    SDL_PushEvent(&event);
+
+    this->simulate_mouse_click(101,101, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_FALSE(button_clicked);
+	this->simulate_mouse_click(10,10, SDL_BUTTON_LEFT);
 	input_system.update();
 	event_manager.dispatch_events();
-	//EXPECT_TRUE(button_clicked);
+	EXPECT_TRUE(button_clicked);
 }
-- 
cgit v1.2.3


From ea7d7ec301968f3a542de93f487f9501b70c0cd4 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 25 Nov 2024 11:48:01 +0100
Subject: code standard fixing

---
 src/crepe/api/Button.cpp         |   5 ++
 src/crepe/api/Button.h           |  49 +++++++++++----
 src/crepe/api/CMakeLists.txt     |   2 +
 src/crepe/api/EventManager.hpp   |   2 +-
 src/crepe/api/UiObject.cpp       |   5 ++
 src/crepe/api/UiObject.h         |  32 +++++++---
 src/crepe/facade/SDLContext.cpp  |   4 +-
 src/crepe/system/InputSystem.cpp | 131 +++++++++++++++++++--------------------
 src/crepe/system/InputSystem.h   |  74 ++++++++++++++++++----
 src/test/inputTest.cpp           |  22 ++++---
 10 files changed, 216 insertions(+), 110 deletions(-)
 create mode 100644 src/crepe/api/Button.cpp
 create mode 100644 src/crepe/api/UiObject.cpp

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
new file mode 100644
index 0000000..70f749d
--- /dev/null
+++ b/src/crepe/api/Button.cpp
@@ -0,0 +1,5 @@
+#include "Button.h"
+
+using namespace crepe;
+
+Button::Button(game_object_id_t id) : UiObject(id){}
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index f533452..f769d58 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -1,19 +1,44 @@
 #pragma once
+
 #include <functional>
 
-#include "Component.h"
-#include "api/EventHandler.h"
-#include "api/UiObject.h"
+#include "UiObject.h"
+
 namespace crepe {
-class Button : public UiObject{
+
+/**
+ * \class Button
+ * \brief Represents a clickable UI button, derived from the UiObject class.
+ */
+class Button : public UiObject {
 public:
-	Button(game_object_id_t id) : UiObject(id){};
-	bool interactable = true;
-	bool is_toggle = false;
-	bool is_pressed = false;
-	bool hover = false;
-	std::function<void()> on_click;
+    /**
+     * \brief Constructs a Button with the specified game object ID.
+     * \param id The unique ID of the game object associated with this button.
+     */
+    Button(game_object_id_t id);
+
+    //! Indicates if the button is interactable (can be clicked).
+    bool interactable = true;
+
+    //! Indicates if the button is a toggle button (can be pressed and released).
+    bool is_toggle = false;
+
+    //! Indicates whether the button is currently pressed.
+    bool is_pressed = false;
+
+    //! Indicates whether the mouse is currently hovering over the button.
+    bool hover = false;
+
+    //! The callback function to be executed when the button is clicked.
+    std::function<void()> on_click;
+
 public:
-virtual int get_instances_max() const { return 1; }
+    /**
+     * \brief Retrieves the maximum number of instances allowed for this button type.
+     * \return Always returns 1, as only a single instance is allowed.
+     */
+    virtual int get_instances_max() const override { return 1; }
 };
-}
+
+} // namespace crepe
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index fc27fa0..aeb451d 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -23,6 +23,8 @@ target_sources(crepe PUBLIC
 	Asset.cpp
 	EventHandler.cpp
 	Script.cpp
+	Button.cpp
+	UiObject.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
diff --git a/src/crepe/api/EventManager.hpp b/src/crepe/api/EventManager.hpp
index 3eae90a..a5f4556 100644
--- a/src/crepe/api/EventManager.hpp
+++ b/src/crepe/api/EventManager.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <iostream>
+
 #include "EventManager.h"
 
 namespace crepe {
diff --git a/src/crepe/api/UiObject.cpp b/src/crepe/api/UiObject.cpp
new file mode 100644
index 0000000..1c11fc3
--- /dev/null
+++ b/src/crepe/api/UiObject.cpp
@@ -0,0 +1,5 @@
+#include "UiObject.h"
+
+using namespace crepe;
+
+UiObject::UiObject(game_object_id_t id) : Component(id){};
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index 82140a0..ae2e744 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -1,17 +1,33 @@
 #pragma once
 
-#include "Component.h"
+#include "../Component.h"
 
-#include "api/EventHandler.h"
 namespace crepe {
 
-class UiObject : public Component{
+/**
+ * @class UiObject
+ * \brief Represents a UI object in the game, derived from the Component class.
+ */
+class UiObject : public Component {
 public:
-	UiObject(game_object_id_t id) : Component(id){};
-	int width = 0;
-	int height = 0;
+    /**
+     * \brief Constructs a UiObject with the specified game object ID.
+     * \param id The unique ID of the game object associated with this UI object.
+     */
+    UiObject(game_object_id_t id);
+
+    //! The width of the UI object.
+    int width = 0;
+
+    //! The height of the UI object.
+    int height = 0;
+
 public:
-virtual int get_instances_max() const { return 1; }
+    /**
+     * \brief Retrieves the maximum number of instances allowed for this UI object type.
+     * /return Always returns 1, as only a single instance is allowed.
+     */
+    virtual int get_instances_max() const override { return 1; }
 };
 
-}
+} // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 6371a51..a37392f 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -360,8 +360,8 @@ std::vector<SDLContext::EventData> SDLContext::get_events(){
                 {
 					event_list.push_back(EventData{
 						.event_type = SDLContext::Event::MOUSEMOVE,
-						.mouse_position = {event.button.x,event.button.y},
-						.rel_mouse_move =  {event.motion.yrel,event.motion.xrel}
+						.mouse_position = {event.motion.x,event.motion.y},
+						.rel_mouse_move =  {event.motion.xrel,event.motion.yrel}
 					});
 				}
                 break;
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index a3e28e4..1b455cd 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,25 +1,22 @@
-#include "ComponentManager.h"
 
+#include "ComponentManager.h"
 #include "../api/EventManager.h"
-
-#include "../facade/SDLContext.h"
 #include "../api/Event.h"
 
+
 #include "system/InputSystem.h"
 
 using namespace crepe;
 
-
-
 void InputSystem::update() {
-	EventManager& event_mgr = EventManager::get_instance();
+    EventManager &event_mgr = EventManager::get_instance();
     std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
-	
-    for (SDLContext::EventData event : event_list) {
+
+    for (const SDLContext::EventData &event : event_list) {
         switch (event.event_type) {
             case SDLContext::Event::KEYDOWN: {
                 event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{
-					.repeat = event.key_repeat,
+                    .repeat = event.key_repeat,
                     .key = event.key,
                 });
                 break;
@@ -36,51 +33,49 @@ void InputSystem::update() {
                     .mouse_y = event.mouse_position.second,
                     .button = event.mouse_button,
                 });
-				last_mouse_down_position = {event.mouse_position.first,event.mouse_position.second};
-    			last_mouse_button = event.mouse_button;
+                last_mouse_down_position = event.mouse_position;
+                last_mouse_button = event.mouse_button;
+                break;
+            }
+            case SDLContext::Event::MOUSEUP: {
+                MouseReleaseEvent mouse_release_event = MouseReleaseEvent{
+                    .mouse_x = event.mouse_position.first,
+                    .mouse_y = event.mouse_position.second,
+                    .button = event.mouse_button,
+                };
+                event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event);
+
+                // Calculate deltas for click detection
+                int delta_x = event.mouse_position.first - last_mouse_down_position.first;
+                int delta_y = event.mouse_position.second - last_mouse_down_position.second;
+
+                if (last_mouse_button == event.mouse_button &&
+                    std::abs(delta_x) <= click_tolerance &&
+                    std::abs(delta_y) <= click_tolerance) {
+                    event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
+                        .mouse_x = event.mouse_position.first,
+                        .mouse_y = event.mouse_position.second,
+                        .button = event.mouse_button,
+                    });
+
+                    handle_click(event);
+                }
                 break;
             }
-			case SDLContext::Event::MOUSEUP: {
-				MouseReleaseEvent mouse_release_event = MouseReleaseEvent{
-					.mouse_x = event.mouse_position.first,
-					.mouse_y = event.mouse_position.second,
-					.button = event.mouse_button,
-				};
-				event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event);
-
-				// Calculate deltas for click detection
-				int delta_x = event.mouse_position.first - last_mouse_down_position.first;
-				int delta_y = event.mouse_position.second - last_mouse_down_position.second;
-
-				// Ensure last_mouse_button is properly set and matches the current mouse button
-				if (last_mouse_button == event.mouse_button &&
-					std::abs(delta_x) <= click_tolerance &&
-					std::abs(delta_y) <= click_tolerance) {
-					event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
-						.mouse_x = event.mouse_position.first,
-						.mouse_y = event.mouse_position.second,
-						.button = event.mouse_button,
-					});
-
-					this->handle_click(mouse_release_event);
-				}
-
-				break;
-			}
             case SDLContext::Event::MOUSEMOVE: {
                 event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
                     .mouse_x = event.mouse_position.first,
                     .mouse_y = event.mouse_position.second,
-                    .rel_x = event.rel_mouse_move.first,  
+                    .rel_x = event.rel_mouse_move.first,
                     .rel_y = event.rel_mouse_move.second,
                 });
+                handle_move(event);
                 break;
             }
-           
             case SDLContext::Event::MOUSEWHEEL: {
                 event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{
-                    .scroll_x = event.mouse_position.first,
-                    .scroll_y = event.mouse_position.second,
+                    .scroll_x = event.wheel_delta,
+                    .scroll_y = 0,
                     .direction = event.wheel_delta,
                 });
                 break;
@@ -95,43 +90,43 @@ void InputSystem::update() {
     }
 }
 
-void InputSystem::handle_move(const MouseMoveEvent){
-	ComponentManager &mgr = this->component_manager;
+void InputSystem::handle_move(const SDLContext::EventData &event_data) {
+    ComponentManager &mgr = this->component_manager;
 
-    // Get the buttons and transforms
     std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
     std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
 
     for (Button &button : buttons) {
-        Transform* transform = find_transform_for_button(button, transforms);
-        if (!transform) continue; 
-        
-        if (button.interactable && is_mouse_inside_button(event, button, *transform)) {
-			button.hover = true;
-        }else{
-			button.hover = false;
-		}
+        Transform *transform = find_transform_for_button(button, transforms);
+        if (!transform)
+            continue;
+
+        if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
+            button.hover = true;
+        } else {
+            button.hover = false;
+        }
     }
 }
 
-void InputSystem::handle_click(const MouseReleaseEvent event) {
+void InputSystem::handle_click(const SDLContext::EventData &event_data) {
     ComponentManager &mgr = this->component_manager;
 
-    // Get the buttons and transforms
     std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
     std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
 
     for (Button &button : buttons) {
-        Transform* transform = find_transform_for_button(button, transforms);
-        if (!transform) continue; 
-        
-        if (button.interactable && is_mouse_inside_button(event, button, *transform)) {
-            handle_button_press(button, event);
+        Transform *transform = find_transform_for_button(button, transforms);
+        if (!transform)
+            continue;
+
+        if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
+            handle_button_press(button);
         }
     }
 }
 
-Transform* InputSystem::find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms) {
+Transform *InputSystem::find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms) {
     for (Transform &transform : transforms) {
         if (button.game_object_id == transform.game_object_id) {
             return &transform;
@@ -140,18 +135,20 @@ Transform* InputSystem::find_transform_for_button(Button &button, std::vector<st
     return nullptr;
 }
 
-bool InputSystem::is_mouse_inside_button(const MouseReleaseEvent &event, const Button &button, const Transform &transform) {
-    return event.mouse_x >= transform.position.x && event.mouse_x <= transform.position.x + button.width &&
-           event.mouse_y >= transform.position.y && event.mouse_y <= transform.position.y + button.height;
+bool InputSystem::is_mouse_inside_button(const SDLContext::EventData &event_data, const Button &button, const Transform &transform) {
+    return event_data.mouse_position.first >= transform.position.x &&
+           event_data.mouse_position.first <= transform.position.x + button.width &&
+           event_data.mouse_position.second >= transform.position.y &&
+           event_data.mouse_position.second <= transform.position.y + button.height;
 }
 
-void InputSystem::handle_button_press(Button &button, const MouseReleaseEvent &event) {
+void InputSystem::handle_button_press(Button &button) {
     if (button.is_toggle) {
         if (!button.is_pressed && button.on_click) {
-    		button.on_click();
+            button.on_click();
         }
         button.is_pressed = !button.is_pressed;
-    } else if(button.on_click) {
+    } else if (button.on_click) {
         button.on_click();
     }
 }
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 5f71687..672f225 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -1,32 +1,82 @@
 #pragma once
 
-#include <utility>
-
 #include "System.h"
 
 #include "../api/Event.h"
 #include "../api/Button.h"
 #include "../api/Transform.h"
+#include "../facade/SDLContext.h"
 
 namespace crepe {
 
+/**
+ * \class InputSystem
+ * \brief Handles the processing of input events like mouse and keyboard interactions.
+ * 
+ * This system processes events such as mouse clicks, mouse movement, and keyboard
+ * actions. It is responsible for detecting interactions with UI buttons and
+ * passing the corresponding events to the registered listeners.
+ */
 class InputSystem : public System {
 public:
-	using System::System;
-	void update() override;
-	void process_events();
-	
+    using System::System;
+
+    /**
+     * \brief Updates the system, processing all input events.
+     * This method processes all events and triggers corresponding actions.
+     */
+    void update() override;
+
 private:
-	std::pair<int, int> last_mouse_down_position{-1, -1};
+    //! Stores the last position of the mouse when the button was pressed.
+    std::pair<int, int> last_mouse_down_position{-1, -1};
+
+    //! Stores the last mouse button pressed.
     MouseButton last_mouse_button = MouseButton::NONE;
-	const int click_tolerance = 5;
-	void handle_click(const MouseReleaseEvent);
-	void handle_move(const MouseMoveEvent);
+
+    //! The tolerance in pixels for detecting a mouse click.
+    const int click_tolerance = 5;
+
+    /**
+     * \brief Handles the click event.
+     * \param eventData The event data containing information about the mouse click.
+     * 
+     * This method processes the mouse click event and triggers the corresponding button action.
+     */
+    void handle_click(const SDLContext::EventData &eventData);
+
+    /**
+     * \brief Handles the mouse movement event.
+     * \param eventData The event data containing information about the mouse movement.
+     * 
+     * This method processes the mouse movement event and updates the button hover state.
+     */
+    void handle_move(const SDLContext::EventData &eventData);
+
+    /**
+     * \brief Finds the transform component associated with a button.
+     * \param button The button to find the associated transform for.
+     * \param transforms A list of transforms to search through.
+     * \return A pointer to the transform of the button, or nullptr if not found.
+     */
     Transform* find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms);
 
-    bool is_mouse_inside_button(const MouseReleaseEvent &event, const Button &button, const Transform &transform);
+    /**
+     * \brief Checks if the mouse position is inside the bounds of the button.
+     * \param eventData The event data containing the mouse position.
+     * \param button The button to check.
+     * \param transform The transform component of the button.
+     * \return True if the mouse is inside the button, false otherwise.
+     */
+    bool is_mouse_inside_button(const SDLContext::EventData &eventData, const Button &button, const Transform &transform);
 
-    void handle_button_press(Button &button, const MouseReleaseEvent &event);
+    /**
+     * \brief Handles the button press event, calling the on_click callback if necessary.
+     * \param button The button being pressed.
+     * 
+     * This method triggers the on_click action for the button when it is pressed.
+     */
+    void handle_button_press(Button &button);
 };
 
 } // namespace crepe
diff --git a/src/test/inputTest.cpp b/src/test/inputTest.cpp
index 0ca415a..8f3eb48 100644
--- a/src/test/inputTest.cpp
+++ b/src/test/inputTest.cpp
@@ -214,29 +214,35 @@ TEST_F(InputTest, testButtonHover) {
     GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
     auto& button = obj.add_component<Button>();
 	bool button_clicked = false;
-	bool hover = false;
     button.active = true;
 	button.interactable = true;
     button.width = 100;
     button.height = 100;
     button.is_pressed = false;
     button.is_toggle = false;
-
+	//mouse not on button
 	SDL_Event event;
     SDL_zero(event);
     event.type = SDL_MOUSEMOTION;
-    event.motion.x = 10;
-    event.motion.y = 10;
+    event.motion.x = 200;
+    event.motion.y = 200;
 	event.motion.xrel = 10;
 	event.motion.yrel = 10;
     SDL_PushEvent(&event);
 
-    this->simulate_mouse_click(101,101, SDL_BUTTON_LEFT);
 	input_system.update();
 	event_manager.dispatch_events();
-	EXPECT_FALSE(button_clicked);
-	this->simulate_mouse_click(10,10, SDL_BUTTON_LEFT);
+	EXPECT_FALSE(button.hover);
+	//mouse on button
+	SDL_Event hover_event;
+    SDL_zero(hover_event);
+    hover_event.type = SDL_MOUSEMOTION;
+    hover_event.motion.x = 10;
+    hover_event.motion.y = 10;
+	hover_event.motion.xrel = 10;
+	hover_event.motion.yrel = 10;
+    SDL_PushEvent(&hover_event);
 	input_system.update();
 	event_manager.dispatch_events();
-	EXPECT_TRUE(button_clicked);
+	EXPECT_TRUE(button.hover);
 }
-- 
cgit v1.2.3


From 48015cd425b26eb68eb07f4e4b1adf71e81e11b1 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 25 Nov 2024 11:48:39 +0100
Subject: make format

---
 mwe/events/include/event.h       |   2 +-
 src/crepe/api/Button.cpp         |   2 +-
 src/crepe/api/Button.h           |  28 +--
 src/crepe/api/Event.h            |   6 +-
 src/crepe/api/KeyCodes.h         | 284 +++++++++++++++----------------
 src/crepe/api/LoopManager.cpp    |   6 +-
 src/crepe/api/UiObject.h         |  16 +-
 src/crepe/facade/SDLContext.cpp  | 357 +++++++++++++++++++--------------------
 src/crepe/facade/SDLContext.h    |  16 +-
 src/crepe/system/InputSystem.cpp | 259 ++++++++++++++--------------
 src/crepe/system/InputSystem.h   |  43 ++---
 src/example/gameloop.cpp         |  22 ++-
 src/test/EventTest.cpp           |  74 ++++----
 src/test/inputTest.cpp           | 307 +++++++++++++++++----------------
 src/test/loopTimerTest.cpp       |  25 ++-
 15 files changed, 714 insertions(+), 733 deletions(-)

(limited to 'src/crepe/api')

diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index ee1bf52..e1b220b 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -148,7 +148,7 @@ private:
 };
 class ShutDownEvent : public Event {
 public:
-	ShutDownEvent() : Event("ShutDownEvent") {};
+	ShutDownEvent() : Event("ShutDownEvent"){};
 
 	REGISTER_EVENT_TYPE(ShutDownEvent)
 
diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index 70f749d..547c0fc 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,4 +2,4 @@
 
 using namespace crepe;
 
-Button::Button(game_object_id_t id) : UiObject(id){}
+Button::Button(game_object_id_t id) : UiObject(id) {}
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index f769d58..0056238 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -12,33 +12,33 @@ namespace crepe {
  */
 class Button : public UiObject {
 public:
-    /**
+	/**
      * \brief Constructs a Button with the specified game object ID.
      * \param id The unique ID of the game object associated with this button.
      */
-    Button(game_object_id_t id);
+	Button(game_object_id_t id);
 
-    //! Indicates if the button is interactable (can be clicked).
-    bool interactable = true;
+	//! Indicates if the button is interactable (can be clicked).
+	bool interactable = true;
 
-    //! Indicates if the button is a toggle button (can be pressed and released).
-    bool is_toggle = false;
+	//! Indicates if the button is a toggle button (can be pressed and released).
+	bool is_toggle = false;
 
-    //! Indicates whether the button is currently pressed.
-    bool is_pressed = false;
+	//! Indicates whether the button is currently pressed.
+	bool is_pressed = false;
 
-    //! Indicates whether the mouse is currently hovering over the button.
-    bool hover = false;
+	//! Indicates whether the mouse is currently hovering over the button.
+	bool hover = false;
 
-    //! The callback function to be executed when the button is clicked.
-    std::function<void()> on_click;
+	//! The callback function to be executed when the button is clicked.
+	std::function<void()> on_click;
 
 public:
-    /**
+	/**
      * \brief Retrieves the maximum number of instances allowed for this button type.
      * \return Always returns 1, as only a single instance is allowed.
      */
-    virtual int get_instances_max() const override { return 1; }
+	virtual int get_instances_max() const override { return 1; }
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index 46dd86b..2018d52 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -89,9 +89,9 @@ public:
 	//! Y-coordinate of the mouse position at the time of the event.
 	int mouse_y = 0;
 	// Relative movement in x
-    int rel_x;
+	int rel_x;
 	// Relative movement in y
-    int rel_y; 
+	int rel_y;
 };
 
 /**
@@ -127,4 +127,4 @@ class ShutDownEvent : public Event {
 public:
 };
 
-}
+} // namespace crepe
diff --git a/src/crepe/api/KeyCodes.h b/src/crepe/api/KeyCodes.h
index 4b026c5..fcfc080 100644
--- a/src/crepe/api/KeyCodes.h
+++ b/src/crepe/api/KeyCodes.h
@@ -1,154 +1,154 @@
 #pragma once
 namespace crepe {
-	//! Enumeration for mouse button inputs, including standard and extended buttons.
-	enum class MouseButton {
-		NONE = 0, //!< No mouse button input.
-		LEFT_MOUSE = 1, //!< Left mouse button.
-		RIGHT_MOUSE = 2, //!< Right mouse button.
-		MIDDLE_MOUSE = 3, //!< Middle mouse button (scroll wheel press).
-		X1_MOUSE = 4, //!< First extended mouse button.
-		X2_MOUSE = 5, //!< Second extended mouse button.
-		SCROLL_UP = 6, //!< Scroll wheel upward movement.
-		SCROLL_DOWN = 7, //!< Scroll wheel downward movement.
-	};
+//! Enumeration for mouse button inputs, including standard and extended buttons.
+enum class MouseButton {
+	NONE = 0, //!< No mouse button input.
+	LEFT_MOUSE = 1, //!< Left mouse button.
+	RIGHT_MOUSE = 2, //!< Right mouse button.
+	MIDDLE_MOUSE = 3, //!< Middle mouse button (scroll wheel press).
+	X1_MOUSE = 4, //!< First extended mouse button.
+	X2_MOUSE = 5, //!< Second extended mouse button.
+	SCROLL_UP = 6, //!< Scroll wheel upward movement.
+	SCROLL_DOWN = 7, //!< Scroll wheel downward movement.
+};
 
-	//! Enumeration for keyboard key inputs, including printable characters, function keys, and keypad keys.
-	enum class Keycode {
-		NONE = 0, //!< No key input.
-		SPACE = 32, //!< Spacebar.
-		APOSTROPHE = 39, //!< Apostrophe (').
-		COMMA = 44, //!< Comma (,).
-		MINUS = 45, //!< Minus (-).
-		PERIOD = 46, //!< Period (.).
-		SLASH = 47, //!< Slash (/).
-		D0 = 48, //!< Digit 0.
-		D1 = 49, //!< Digit 1.
-		D2 = 50, //!< Digit 2.
-		D3 = 51, //!< Digit 3.
-		D4 = 52, //!< Digit 4.
-		D5 = 53, //!< Digit 5.
-		D6 = 54, //!< Digit 6.
-		D7 = 55, //!< Digit 7.
-		D8 = 56, //!< Digit 8.
-		D9 = 57, //!< Digit 9.
-		SEMICOLON = 59, //!< Semicolon (;).
-		EQUAL = 61, //!< Equal sign (=).
-		A = 65, //!< Key 'A'.
-		B = 66, //!< Key 'B'.
-		C = 67, //!< Key 'C'.
-		D = 68, //!< Key 'D'.
-		E = 69, //!< Key 'E'.
-		F = 70, //!< Key 'F'.
-		G = 71, //!< Key 'G'.
-		H = 72, //!< Key 'H'.
-		I = 73, //!< Key 'I'.
-		J = 74, //!< Key 'J'.
-		K = 75, //!< Key 'K'.
-		L = 76, //!< Key 'L'.
-		M = 77, //!< Key 'M'.
-		N = 78, //!< Key 'N'.
-		O = 79, //!< Key 'O'.
-		P = 80, //!< Key 'P'.
-		Q = 81, //!< Key 'Q'.
-		R = 82, //!< Key 'R'.
-		S = 83, //!< Key 'S'.
-		T = 84, //!< Key 'T'.
-		U = 85, //!< Key 'U'.
-		V = 86, //!< Key 'V'.
-		W = 87, //!< Key 'W'.
-		X = 88, //!< Key 'X'.
-		Y = 89, //!< Key 'Y'.
-		Z = 90, //!< Key 'Z'.
-		LEFT_BRACKET = 91, //!< Left bracket ([).
-		BACKSLASH = 92, //!< Backslash (\).
-		RIGHT_BRACKET = 93, //!< Right bracket (]).
-		GRAVE_ACCENT = 96, //!< Grave accent (`).
-		WORLD1 = 161, //!< Non-US key #1.
-		WORLD2 = 162, //!< Non-US key #2.
-		ESCAPE = 256, //!< Escape key.
-		ENTER = 257, //!< Enter key.
-		TAB = 258, //!< Tab key.
-		BACKSPACE = 259, //!< Backspace key.
-		INSERT = 260, //!< Insert key.
-		DELETE = 261, //!< Delete key.
-		RIGHT = 262, //!< Right arrow key.
-		LEFT = 263, //!< Left arrow key.
-		DOWN = 264, //!< Down arrow key.
-		UP = 265, //!< Up arrow key.
-		PAGE_UP = 266, //!< Page Up key.
-		PAGE_DOWN = 267, //!< Page Down key.
-		HOME = 268, //!< Home key.
-		END = 269, //!< End key.
-		CAPS_LOCK = 280, //!< Caps Lock key.
-		SCROLL_LOCK = 281, //!< Scroll Lock key.
-		NUM_LOCK = 282, //!< Num Lock key.
-		PRINT_SCREEN = 283, //!< Print Screen key.
-		PAUSE = 284, //!< Pause key.
-		/**
+//! Enumeration for keyboard key inputs, including printable characters, function keys, and keypad keys.
+enum class Keycode {
+	NONE = 0, //!< No key input.
+	SPACE = 32, //!< Spacebar.
+	APOSTROPHE = 39, //!< Apostrophe (').
+	COMMA = 44, //!< Comma (,).
+	MINUS = 45, //!< Minus (-).
+	PERIOD = 46, //!< Period (.).
+	SLASH = 47, //!< Slash (/).
+	D0 = 48, //!< Digit 0.
+	D1 = 49, //!< Digit 1.
+	D2 = 50, //!< Digit 2.
+	D3 = 51, //!< Digit 3.
+	D4 = 52, //!< Digit 4.
+	D5 = 53, //!< Digit 5.
+	D6 = 54, //!< Digit 6.
+	D7 = 55, //!< Digit 7.
+	D8 = 56, //!< Digit 8.
+	D9 = 57, //!< Digit 9.
+	SEMICOLON = 59, //!< Semicolon (;).
+	EQUAL = 61, //!< Equal sign (=).
+	A = 65, //!< Key 'A'.
+	B = 66, //!< Key 'B'.
+	C = 67, //!< Key 'C'.
+	D = 68, //!< Key 'D'.
+	E = 69, //!< Key 'E'.
+	F = 70, //!< Key 'F'.
+	G = 71, //!< Key 'G'.
+	H = 72, //!< Key 'H'.
+	I = 73, //!< Key 'I'.
+	J = 74, //!< Key 'J'.
+	K = 75, //!< Key 'K'.
+	L = 76, //!< Key 'L'.
+	M = 77, //!< Key 'M'.
+	N = 78, //!< Key 'N'.
+	O = 79, //!< Key 'O'.
+	P = 80, //!< Key 'P'.
+	Q = 81, //!< Key 'Q'.
+	R = 82, //!< Key 'R'.
+	S = 83, //!< Key 'S'.
+	T = 84, //!< Key 'T'.
+	U = 85, //!< Key 'U'.
+	V = 86, //!< Key 'V'.
+	W = 87, //!< Key 'W'.
+	X = 88, //!< Key 'X'.
+	Y = 89, //!< Key 'Y'.
+	Z = 90, //!< Key 'Z'.
+	LEFT_BRACKET = 91, //!< Left bracket ([).
+	BACKSLASH = 92, //!< Backslash (\).
+	RIGHT_BRACKET = 93, //!< Right bracket (]).
+	GRAVE_ACCENT = 96, //!< Grave accent (`).
+	WORLD1 = 161, //!< Non-US key #1.
+	WORLD2 = 162, //!< Non-US key #2.
+	ESCAPE = 256, //!< Escape key.
+	ENTER = 257, //!< Enter key.
+	TAB = 258, //!< Tab key.
+	BACKSPACE = 259, //!< Backspace key.
+	INSERT = 260, //!< Insert key.
+	DELETE = 261, //!< Delete key.
+	RIGHT = 262, //!< Right arrow key.
+	LEFT = 263, //!< Left arrow key.
+	DOWN = 264, //!< Down arrow key.
+	UP = 265, //!< Up arrow key.
+	PAGE_UP = 266, //!< Page Up key.
+	PAGE_DOWN = 267, //!< Page Down key.
+	HOME = 268, //!< Home key.
+	END = 269, //!< End key.
+	CAPS_LOCK = 280, //!< Caps Lock key.
+	SCROLL_LOCK = 281, //!< Scroll Lock key.
+	NUM_LOCK = 282, //!< Num Lock key.
+	PRINT_SCREEN = 283, //!< Print Screen key.
+	PAUSE = 284, //!< Pause key.
+	/**
 		 * \name Function keys (F1-F25).
 		 * \{
 		 */
-		F1 = 290,
-		F2 = 291,
-		F3 = 292,
-		F4 = 293,
-		F5 = 294,
-		F6 = 295,
-		F7 = 296,
-		F8 = 297,
-		F9 = 298,
-		F10 = 299,
-		F11 = 300,
-		F12 = 301,
-		F13 = 302,
-		F14 = 303,
-		F15 = 304,
-		F16 = 305,
-		F17 = 306,
-		F18 = 307,
-		F19 = 308,
-		F20 = 309,
-		F21 = 310,
-		F22 = 311,
-		F23 = 312,
-		F24 = 313,
-		F25 = 314,
-		/// \}
-		/**
+	F1 = 290,
+	F2 = 291,
+	F3 = 292,
+	F4 = 293,
+	F5 = 294,
+	F6 = 295,
+	F7 = 296,
+	F8 = 297,
+	F9 = 298,
+	F10 = 299,
+	F11 = 300,
+	F12 = 301,
+	F13 = 302,
+	F14 = 303,
+	F15 = 304,
+	F16 = 305,
+	F17 = 306,
+	F18 = 307,
+	F19 = 308,
+	F20 = 309,
+	F21 = 310,
+	F22 = 311,
+	F23 = 312,
+	F24 = 313,
+	F25 = 314,
+	/// \}
+	/**
 		 * \name Keypad digits and operators.
 		 * \{
 		 */
-		KP0 = 320,
-		KP1 = 321,
-		KP2 = 322,
-		KP3 = 323,
-		KP4 = 324,
-		KP5 = 325,
-		KP6 = 326,
-		KP7 = 327,
-		KP8 = 328,
-		KP9 = 329,
-		KP_DECIMAL = 330,
-		KP_DIVIDE = 331,
-		KP_MULTIPLY = 332,
-		KP_SUBTRACT = 333,
-		KP_ADD = 334,
-		KP_ENTER = 335,
-		KP_EQUAL = 336,
-		/// \}
-		/**
+	KP0 = 320,
+	KP1 = 321,
+	KP2 = 322,
+	KP3 = 323,
+	KP4 = 324,
+	KP5 = 325,
+	KP6 = 326,
+	KP7 = 327,
+	KP8 = 328,
+	KP9 = 329,
+	KP_DECIMAL = 330,
+	KP_DIVIDE = 331,
+	KP_MULTIPLY = 332,
+	KP_SUBTRACT = 333,
+	KP_ADD = 334,
+	KP_ENTER = 335,
+	KP_EQUAL = 336,
+	/// \}
+	/**
 		 * \name Modifier keys.
 		 * \{
 		 */
-		LEFT_SHIFT = 340,
-		LEFT_CONTROL = 341,
-		LEFT_ALT = 342,
-		LEFT_SUPER = 343,
-		RIGHT_SHIFT = 344,
-		RIGHT_CONTROL = 345,
-		RIGHT_ALT = 346,
-		RIGHT_SUPER = 347,
-		/// \}
-		MENU = 348, //!< Menu key.
-	};
-}
+	LEFT_SHIFT = 340,
+	LEFT_CONTROL = 341,
+	LEFT_ALT = 342,
+	LEFT_SUPER = 343,
+	RIGHT_SHIFT = 344,
+	RIGHT_CONTROL = 345,
+	RIGHT_ALT = 346,
+	RIGHT_SUPER = 347,
+	/// \}
+	MENU = 348, //!< Menu key.
+};
+} // namespace crepe
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 9599943..b343250 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -2,11 +2,11 @@
 
 #include "../system/AnimatorSystem.h"
 #include "../system/CollisionSystem.h"
+#include "../system/InputSystem.h"
 #include "../system/ParticleSystem.h"
 #include "../system/PhysicsSystem.h"
 #include "../system/RenderSystem.h"
 #include "../system/ScriptSystem.h"
-#include "../system/InputSystem.h"
 
 #include "LoopManager.h"
 #include "LoopTimer.h"
@@ -24,9 +24,7 @@ LoopManager::LoopManager() {
 	this->load_system<InputSystem>();
 }
 
-void LoopManager::process_input() {
-	this->get_system<InputSystem>().update();
-}
+void LoopManager::process_input() { this->get_system<InputSystem>().update(); }
 
 void LoopManager::start() {
 	this->setup();
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index ae2e744..7bd1c2e 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -10,24 +10,24 @@ namespace crepe {
  */
 class UiObject : public Component {
 public:
-    /**
+	/**
      * \brief Constructs a UiObject with the specified game object ID.
      * \param id The unique ID of the game object associated with this UI object.
      */
-    UiObject(game_object_id_t id);
+	UiObject(game_object_id_t id);
 
-    //! The width of the UI object.
-    int width = 0;
+	//! The width of the UI object.
+	int width = 0;
 
-    //! The height of the UI object.
-    int height = 0;
+	//! The height of the UI object.
+	int height = 0;
 
 public:
-    /**
+	/**
      * \brief Retrieves the maximum number of instances allowed for this UI object type.
      * /return Always returns 1, as only a single instance is allowed.
      */
-    virtual int get_instances_max() const override { return 1; }
+	virtual int get_instances_max() const override { return 1; }
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index a37392f..8ed3654 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -5,23 +5,22 @@
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_surface.h>
 #include <SDL2/SDL_video.h>
+#include <array>
 #include <cmath>
 #include <cstddef>
 #include <functional>
 #include <memory>
 #include <stdexcept>
 #include <string>
-#include <array>
 
 #include "../api/Camera.h"
+#include "../api/EventManager.h"
 #include "../api/Sprite.h"
 #include "../api/Texture.h"
 #include "../api/Transform.h"
-#include "../api/EventManager.h"
 #include "../api/Vector2.h"
 #include "../util/Log.h"
 
-
 #include "SDLContext.h"
 
 using namespace crepe;
@@ -77,138 +76,138 @@ SDLContext::~SDLContext() {
 }
 
 Keycode SDLContext::sdl_to_keycode(SDL_Keycode sdl_key) {
-    static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
-        std::array<Keycode, SDL_NUM_SCANCODES> table{};
-        table.fill(Keycode::NONE);
-
-        table[SDL_SCANCODE_SPACE] = Keycode::SPACE;
-        table[SDL_SCANCODE_APOSTROPHE] = Keycode::APOSTROPHE;
-        table[SDL_SCANCODE_COMMA] = Keycode::COMMA;
-        table[SDL_SCANCODE_MINUS] = Keycode::MINUS;
-        table[SDL_SCANCODE_PERIOD] = Keycode::PERIOD;
-        table[SDL_SCANCODE_SLASH] = Keycode::SLASH;
-        table[SDL_SCANCODE_0] = Keycode::D0;
-        table[SDL_SCANCODE_1] = Keycode::D1;
-        table[SDL_SCANCODE_2] = Keycode::D2;
-        table[SDL_SCANCODE_3] = Keycode::D3;
-        table[SDL_SCANCODE_4] = Keycode::D4;
-        table[SDL_SCANCODE_5] = Keycode::D5;
-        table[SDL_SCANCODE_6] = Keycode::D6;
-        table[SDL_SCANCODE_7] = Keycode::D7;
-        table[SDL_SCANCODE_8] = Keycode::D8;
-        table[SDL_SCANCODE_9] = Keycode::D9;
-        table[SDL_SCANCODE_SEMICOLON] = Keycode::SEMICOLON;
-        table[SDL_SCANCODE_EQUALS] = Keycode::EQUAL;
-        table[SDL_SCANCODE_A] = Keycode::A;
-        table[SDL_SCANCODE_B] = Keycode::B;
-        table[SDL_SCANCODE_C] = Keycode::C;
-        table[SDL_SCANCODE_D] = Keycode::D;
-        table[SDL_SCANCODE_E] = Keycode::E;
-        table[SDL_SCANCODE_F] = Keycode::F;
-        table[SDL_SCANCODE_G] = Keycode::G;
-        table[SDL_SCANCODE_H] = Keycode::H;
-        table[SDL_SCANCODE_I] = Keycode::I;
-        table[SDL_SCANCODE_J] = Keycode::J;
-        table[SDL_SCANCODE_K] = Keycode::K;
-        table[SDL_SCANCODE_L] = Keycode::L;
-        table[SDL_SCANCODE_M] = Keycode::M;
-        table[SDL_SCANCODE_N] = Keycode::N;
-        table[SDL_SCANCODE_O] = Keycode::O;
-        table[SDL_SCANCODE_P] = Keycode::P;
-        table[SDL_SCANCODE_Q] = Keycode::Q;
-        table[SDL_SCANCODE_R] = Keycode::R;
-        table[SDL_SCANCODE_S] = Keycode::S;
-        table[SDL_SCANCODE_T] = Keycode::T;
-        table[SDL_SCANCODE_U] = Keycode::U;
-        table[SDL_SCANCODE_V] = Keycode::V;
-        table[SDL_SCANCODE_W] = Keycode::W;
-        table[SDL_SCANCODE_X] = Keycode::X;
-        table[SDL_SCANCODE_Y] = Keycode::Y;
-        table[SDL_SCANCODE_Z] = Keycode::Z;
-        table[SDL_SCANCODE_LEFTBRACKET] = Keycode::LEFT_BRACKET;
-        table[SDL_SCANCODE_BACKSLASH] = Keycode::BACKSLASH;
-        table[SDL_SCANCODE_RIGHTBRACKET] = Keycode::RIGHT_BRACKET;
-        table[SDL_SCANCODE_GRAVE] = Keycode::GRAVE_ACCENT;
-        table[SDL_SCANCODE_ESCAPE] = Keycode::ESCAPE;
-        table[SDL_SCANCODE_RETURN] = Keycode::ENTER;
-        table[SDL_SCANCODE_TAB] = Keycode::TAB;
-        table[SDL_SCANCODE_BACKSPACE] = Keycode::BACKSPACE;
-        table[SDL_SCANCODE_INSERT] = Keycode::INSERT;
-        table[SDL_SCANCODE_DELETE] = Keycode::DELETE;
-        table[SDL_SCANCODE_RIGHT] = Keycode::RIGHT;
-        table[SDL_SCANCODE_LEFT] = Keycode::LEFT;
-        table[SDL_SCANCODE_DOWN] = Keycode::DOWN;
-        table[SDL_SCANCODE_UP] = Keycode::UP;
-        table[SDL_SCANCODE_PAGEUP] = Keycode::PAGE_UP;
-        table[SDL_SCANCODE_PAGEDOWN] = Keycode::PAGE_DOWN;
-        table[SDL_SCANCODE_HOME] = Keycode::HOME;
-        table[SDL_SCANCODE_END] = Keycode::END;
-        table[SDL_SCANCODE_CAPSLOCK] = Keycode::CAPS_LOCK;
-        table[SDL_SCANCODE_SCROLLLOCK] = Keycode::SCROLL_LOCK;
-        table[SDL_SCANCODE_NUMLOCKCLEAR] = Keycode::NUM_LOCK;
-        table[SDL_SCANCODE_PRINTSCREEN] = Keycode::PRINT_SCREEN;
-        table[SDL_SCANCODE_PAUSE] = Keycode::PAUSE;
-        table[SDL_SCANCODE_F1] = Keycode::F1;
-        table[SDL_SCANCODE_F2] = Keycode::F2;
-        table[SDL_SCANCODE_F3] = Keycode::F3;
-        table[SDL_SCANCODE_F4] = Keycode::F4;
-        table[SDL_SCANCODE_F5] = Keycode::F5;
-        table[SDL_SCANCODE_F6] = Keycode::F6;
-        table[SDL_SCANCODE_F7] = Keycode::F7;
-        table[SDL_SCANCODE_F8] = Keycode::F8;
-        table[SDL_SCANCODE_F9] = Keycode::F9;
-        table[SDL_SCANCODE_F10] = Keycode::F10;
-        table[SDL_SCANCODE_F11] = Keycode::F11;
-        table[SDL_SCANCODE_F12] = Keycode::F12;
-        table[SDL_SCANCODE_KP_0] = Keycode::KP0;
-        table[SDL_SCANCODE_KP_1] = Keycode::KP1;
-        table[SDL_SCANCODE_KP_2] = Keycode::KP2;
-        table[SDL_SCANCODE_KP_3] = Keycode::KP3;
-        table[SDL_SCANCODE_KP_4] = Keycode::KP4;
-        table[SDL_SCANCODE_KP_5] = Keycode::KP5;
-        table[SDL_SCANCODE_KP_6] = Keycode::KP6;
-        table[SDL_SCANCODE_KP_7] = Keycode::KP7;
-        table[SDL_SCANCODE_KP_8] = Keycode::KP8;
-        table[SDL_SCANCODE_KP_9] = Keycode::KP9;
-        table[SDL_SCANCODE_LSHIFT] = Keycode::LEFT_SHIFT;
-        table[SDL_SCANCODE_LCTRL] = Keycode::LEFT_CONTROL;
-        table[SDL_SCANCODE_LALT] = Keycode::LEFT_ALT;
-        table[SDL_SCANCODE_LGUI] = Keycode::LEFT_SUPER;
-        table[SDL_SCANCODE_RSHIFT] = Keycode::RIGHT_SHIFT;
-        table[SDL_SCANCODE_RCTRL] = Keycode::RIGHT_CONTROL;
-        table[SDL_SCANCODE_RALT] = Keycode::RIGHT_ALT;
-        table[SDL_SCANCODE_RGUI] = Keycode::RIGHT_SUPER;
-        table[SDL_SCANCODE_MENU] = Keycode::MENU;
-
-        return table;
-    }();
-
-    if (sdl_key < 0 || sdl_key >= SDL_NUM_SCANCODES) {
-        return Keycode::NONE;
-    }
-
-    return LOOKUP_TABLE[sdl_key];
+	static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
+		std::array<Keycode, SDL_NUM_SCANCODES> table{};
+		table.fill(Keycode::NONE);
+
+		table[SDL_SCANCODE_SPACE] = Keycode::SPACE;
+		table[SDL_SCANCODE_APOSTROPHE] = Keycode::APOSTROPHE;
+		table[SDL_SCANCODE_COMMA] = Keycode::COMMA;
+		table[SDL_SCANCODE_MINUS] = Keycode::MINUS;
+		table[SDL_SCANCODE_PERIOD] = Keycode::PERIOD;
+		table[SDL_SCANCODE_SLASH] = Keycode::SLASH;
+		table[SDL_SCANCODE_0] = Keycode::D0;
+		table[SDL_SCANCODE_1] = Keycode::D1;
+		table[SDL_SCANCODE_2] = Keycode::D2;
+		table[SDL_SCANCODE_3] = Keycode::D3;
+		table[SDL_SCANCODE_4] = Keycode::D4;
+		table[SDL_SCANCODE_5] = Keycode::D5;
+		table[SDL_SCANCODE_6] = Keycode::D6;
+		table[SDL_SCANCODE_7] = Keycode::D7;
+		table[SDL_SCANCODE_8] = Keycode::D8;
+		table[SDL_SCANCODE_9] = Keycode::D9;
+		table[SDL_SCANCODE_SEMICOLON] = Keycode::SEMICOLON;
+		table[SDL_SCANCODE_EQUALS] = Keycode::EQUAL;
+		table[SDL_SCANCODE_A] = Keycode::A;
+		table[SDL_SCANCODE_B] = Keycode::B;
+		table[SDL_SCANCODE_C] = Keycode::C;
+		table[SDL_SCANCODE_D] = Keycode::D;
+		table[SDL_SCANCODE_E] = Keycode::E;
+		table[SDL_SCANCODE_F] = Keycode::F;
+		table[SDL_SCANCODE_G] = Keycode::G;
+		table[SDL_SCANCODE_H] = Keycode::H;
+		table[SDL_SCANCODE_I] = Keycode::I;
+		table[SDL_SCANCODE_J] = Keycode::J;
+		table[SDL_SCANCODE_K] = Keycode::K;
+		table[SDL_SCANCODE_L] = Keycode::L;
+		table[SDL_SCANCODE_M] = Keycode::M;
+		table[SDL_SCANCODE_N] = Keycode::N;
+		table[SDL_SCANCODE_O] = Keycode::O;
+		table[SDL_SCANCODE_P] = Keycode::P;
+		table[SDL_SCANCODE_Q] = Keycode::Q;
+		table[SDL_SCANCODE_R] = Keycode::R;
+		table[SDL_SCANCODE_S] = Keycode::S;
+		table[SDL_SCANCODE_T] = Keycode::T;
+		table[SDL_SCANCODE_U] = Keycode::U;
+		table[SDL_SCANCODE_V] = Keycode::V;
+		table[SDL_SCANCODE_W] = Keycode::W;
+		table[SDL_SCANCODE_X] = Keycode::X;
+		table[SDL_SCANCODE_Y] = Keycode::Y;
+		table[SDL_SCANCODE_Z] = Keycode::Z;
+		table[SDL_SCANCODE_LEFTBRACKET] = Keycode::LEFT_BRACKET;
+		table[SDL_SCANCODE_BACKSLASH] = Keycode::BACKSLASH;
+		table[SDL_SCANCODE_RIGHTBRACKET] = Keycode::RIGHT_BRACKET;
+		table[SDL_SCANCODE_GRAVE] = Keycode::GRAVE_ACCENT;
+		table[SDL_SCANCODE_ESCAPE] = Keycode::ESCAPE;
+		table[SDL_SCANCODE_RETURN] = Keycode::ENTER;
+		table[SDL_SCANCODE_TAB] = Keycode::TAB;
+		table[SDL_SCANCODE_BACKSPACE] = Keycode::BACKSPACE;
+		table[SDL_SCANCODE_INSERT] = Keycode::INSERT;
+		table[SDL_SCANCODE_DELETE] = Keycode::DELETE;
+		table[SDL_SCANCODE_RIGHT] = Keycode::RIGHT;
+		table[SDL_SCANCODE_LEFT] = Keycode::LEFT;
+		table[SDL_SCANCODE_DOWN] = Keycode::DOWN;
+		table[SDL_SCANCODE_UP] = Keycode::UP;
+		table[SDL_SCANCODE_PAGEUP] = Keycode::PAGE_UP;
+		table[SDL_SCANCODE_PAGEDOWN] = Keycode::PAGE_DOWN;
+		table[SDL_SCANCODE_HOME] = Keycode::HOME;
+		table[SDL_SCANCODE_END] = Keycode::END;
+		table[SDL_SCANCODE_CAPSLOCK] = Keycode::CAPS_LOCK;
+		table[SDL_SCANCODE_SCROLLLOCK] = Keycode::SCROLL_LOCK;
+		table[SDL_SCANCODE_NUMLOCKCLEAR] = Keycode::NUM_LOCK;
+		table[SDL_SCANCODE_PRINTSCREEN] = Keycode::PRINT_SCREEN;
+		table[SDL_SCANCODE_PAUSE] = Keycode::PAUSE;
+		table[SDL_SCANCODE_F1] = Keycode::F1;
+		table[SDL_SCANCODE_F2] = Keycode::F2;
+		table[SDL_SCANCODE_F3] = Keycode::F3;
+		table[SDL_SCANCODE_F4] = Keycode::F4;
+		table[SDL_SCANCODE_F5] = Keycode::F5;
+		table[SDL_SCANCODE_F6] = Keycode::F6;
+		table[SDL_SCANCODE_F7] = Keycode::F7;
+		table[SDL_SCANCODE_F8] = Keycode::F8;
+		table[SDL_SCANCODE_F9] = Keycode::F9;
+		table[SDL_SCANCODE_F10] = Keycode::F10;
+		table[SDL_SCANCODE_F11] = Keycode::F11;
+		table[SDL_SCANCODE_F12] = Keycode::F12;
+		table[SDL_SCANCODE_KP_0] = Keycode::KP0;
+		table[SDL_SCANCODE_KP_1] = Keycode::KP1;
+		table[SDL_SCANCODE_KP_2] = Keycode::KP2;
+		table[SDL_SCANCODE_KP_3] = Keycode::KP3;
+		table[SDL_SCANCODE_KP_4] = Keycode::KP4;
+		table[SDL_SCANCODE_KP_5] = Keycode::KP5;
+		table[SDL_SCANCODE_KP_6] = Keycode::KP6;
+		table[SDL_SCANCODE_KP_7] = Keycode::KP7;
+		table[SDL_SCANCODE_KP_8] = Keycode::KP8;
+		table[SDL_SCANCODE_KP_9] = Keycode::KP9;
+		table[SDL_SCANCODE_LSHIFT] = Keycode::LEFT_SHIFT;
+		table[SDL_SCANCODE_LCTRL] = Keycode::LEFT_CONTROL;
+		table[SDL_SCANCODE_LALT] = Keycode::LEFT_ALT;
+		table[SDL_SCANCODE_LGUI] = Keycode::LEFT_SUPER;
+		table[SDL_SCANCODE_RSHIFT] = Keycode::RIGHT_SHIFT;
+		table[SDL_SCANCODE_RCTRL] = Keycode::RIGHT_CONTROL;
+		table[SDL_SCANCODE_RALT] = Keycode::RIGHT_ALT;
+		table[SDL_SCANCODE_RGUI] = Keycode::RIGHT_SUPER;
+		table[SDL_SCANCODE_MENU] = Keycode::MENU;
+
+		return table;
+	}();
+
+	if (sdl_key < 0 || sdl_key >= SDL_NUM_SCANCODES) {
+		return Keycode::NONE;
+	}
+
+	return LOOKUP_TABLE[sdl_key];
 }
 MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
-    static const std::array<MouseButton, 5> MOUSE_BUTTON_LOOKUP_TABLE = [] {
-        std::array<MouseButton, 5> table{};
-        table.fill(MouseButton::NONE);
-
-        table[SDL_BUTTON_LEFT] = MouseButton::LEFT_MOUSE;
-        table[SDL_BUTTON_RIGHT] = MouseButton::RIGHT_MOUSE;
-        table[SDL_BUTTON_MIDDLE] = MouseButton::MIDDLE_MOUSE;
-        table[SDL_BUTTON_X1] = MouseButton::X1_MOUSE;
-        table[SDL_BUTTON_X2] = MouseButton::X2_MOUSE;
-
-        return table;
-    }();
-
-    if (sdl_button >= MOUSE_BUTTON_LOOKUP_TABLE.size()) {
-		 // Return NONE for invalid or unmapped button
-        return MouseButton::NONE; 
-    }
+	static const std::array<MouseButton, 5> MOUSE_BUTTON_LOOKUP_TABLE = [] {
+		std::array<MouseButton, 5> table{};
+		table.fill(MouseButton::NONE);
+
+		table[SDL_BUTTON_LEFT] = MouseButton::LEFT_MOUSE;
+		table[SDL_BUTTON_RIGHT] = MouseButton::RIGHT_MOUSE;
+		table[SDL_BUTTON_MIDDLE] = MouseButton::MIDDLE_MOUSE;
+		table[SDL_BUTTON_X1] = MouseButton::X1_MOUSE;
+		table[SDL_BUTTON_X2] = MouseButton::X2_MOUSE;
+
+		return table;
+	}();
+
+	if (sdl_button >= MOUSE_BUTTON_LOOKUP_TABLE.size()) {
+		// Return NONE for invalid or unmapped button
+		return MouseButton::NONE;
+	}
 
-    return MOUSE_BUTTON_LOOKUP_TABLE[sdl_button];
+	return MOUSE_BUTTON_LOOKUP_TABLE[sdl_button];
 }
 void SDLContext::clear_screen() { SDL_RenderClear(this->game_renderer.get()); }
 void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer.get()); }
@@ -310,73 +309,63 @@ int SDLContext::get_height(const Texture & ctx) const {
 }
 void SDLContext::delay(int ms) const { SDL_Delay(ms); }
 
-std::vector<SDLContext::EventData> SDLContext::get_events(){
+std::vector<SDLContext::EventData> SDLContext::get_events() {
 	std::vector<SDLContext::EventData> event_list;
 	SDL_Event event;
 	while (SDL_PollEvent(&event)) {
-        switch (event.type) {
-            case SDL_QUIT:
-                event_list.push_back(EventData{
+		switch (event.type) {
+			case SDL_QUIT:
+				event_list.push_back(EventData{
 					.event_type = SDLContext::Event::SHUTDOWN,
 				});
 				break;
-            case SDL_KEYDOWN:
+			case SDL_KEYDOWN:
 				event_list.push_back(EventData{
 					.event_type = SDLContext::Event::KEYDOWN,
 					.key = sdl_to_keycode(event.key.keysym.scancode),
 					.key_repeat = (event.key.repeat != 0),
 				});
 				break;
-            case SDL_KEYUP:
+			case SDL_KEYUP:
 				event_list.push_back(EventData{
 					.event_type = SDLContext::Event::KEYUP,
 					.key = sdl_to_keycode(event.key.keysym.scancode),
 				});
-                break;
-            case SDL_MOUSEBUTTONDOWN:
-				{
-					int x,y;
-					SDL_GetMouseState(&x, &y);
-					event_list.push_back(EventData{
-						.event_type = SDLContext::Event::MOUSEDOWN,
-						.mouse_button = sdl_to_mousebutton(event.button.button),
-						.mouse_position = {event.button.x,event.button.y},
-					});
-				}
-                break;
-            case SDL_MOUSEBUTTONUP:
-                {
-					int x,y;
-					SDL_GetMouseState(&x, &y);
-					event_list.push_back(EventData{
-						.event_type = SDLContext::Event::MOUSEUP,
-						.mouse_button = sdl_to_mousebutton(event.button.button),
-						.mouse_position = {event.button.x,event.button.y},
-					});
-				}
-                break;
-
-            case SDL_MOUSEMOTION:
-                {
-					event_list.push_back(EventData{
-						.event_type = SDLContext::Event::MOUSEMOVE,
-						.mouse_position = {event.motion.x,event.motion.y},
-						.rel_mouse_move =  {event.motion.xrel,event.motion.yrel}
-					});
-				}
-                break;
-
-            case SDL_MOUSEWHEEL:
-                {
-					event_list.push_back(EventData{
-						.event_type = SDLContext::Event::MOUSEWHEEL,
-						.mouse_position = {event.motion.x,event.motion.y},
-						.wheel_delta = event.wheel.y,
-					});
-				}
-                break;
-        }
-    }
+				break;
+			case SDL_MOUSEBUTTONDOWN: {
+				int x, y;
+				SDL_GetMouseState(&x, &y);
+				event_list.push_back(EventData{
+					.event_type = SDLContext::Event::MOUSEDOWN,
+					.mouse_button = sdl_to_mousebutton(event.button.button),
+					.mouse_position = {event.button.x, event.button.y},
+				});
+			} break;
+			case SDL_MOUSEBUTTONUP: {
+				int x, y;
+				SDL_GetMouseState(&x, &y);
+				event_list.push_back(EventData{
+					.event_type = SDLContext::Event::MOUSEUP,
+					.mouse_button = sdl_to_mousebutton(event.button.button),
+					.mouse_position = {event.button.x, event.button.y},
+				});
+			} break;
+
+			case SDL_MOUSEMOTION: {
+				event_list.push_back(
+					EventData{.event_type = SDLContext::Event::MOUSEMOVE,
+							  .mouse_position = {event.motion.x, event.motion.y},
+							  .rel_mouse_move = {event.motion.xrel, event.motion.yrel}});
+			} break;
+
+			case SDL_MOUSEWHEEL: {
+				event_list.push_back(EventData{
+					.event_type = SDLContext::Event::MOUSEWHEEL,
+					.mouse_position = {event.motion.x, event.motion.y},
+					.wheel_delta = event.wheel.y,
+				});
+			} break;
+		}
+	}
 	return event_list;
 }
-
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 1b881d1..7ec11fd 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -6,15 +6,15 @@
 #include <SDL2/SDL_video.h>
 #include <cmath>
 #include <functional>
-#include <utility>
 #include <memory>
 #include <string>
+#include <utility>
 
-#include "../api/Sprite.h"
+#include "../api/Event.h"
 #include "../api/KeyCodes.h"
+#include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "../api/Vector2.h"
-#include "../api/Event.h"
 #include "api/Camera.h"
 
 #include "types.h"
@@ -36,7 +36,7 @@ class InputSystem;
 class SDLContext {
 
 public:
-	enum Event{
+	enum Event {
 		NONE = 0,
 		MOUSEDOWN,
 		MOUSEUP,
@@ -52,9 +52,9 @@ public:
 		Keycode key = Keycode::NONE;
 		bool key_repeat = false;
 		MouseButton mouse_button = MouseButton::NONE;
-		std::pair<int,int> mouse_position = {-1,-1};
+		std::pair<int, int> mouse_position = {-1, -1};
 		int wheel_delta = -1;
-		std::pair<int,int> rel_mouse_move = {-1,-1};
+		std::pair<int, int> rel_mouse_move = {-1, -1};
 	};
 	/**
 	 * \brief Gets the singleton instance of SDLContext.
@@ -75,11 +75,12 @@ private:
 	 * \param running Reference to a boolean flag that controls the main loop.
 	 */
 	std::vector<SDLContext::EventData> get_events();
-	
+
 	Keycode get_key();
 	Keycode get_mouse();
 	Keycode sdl_to_keycode(SDL_Keycode sdlKey);
 	MouseButton sdl_to_mousebutton(Uint8 sdl_button);
+
 private:
 	//! Will only use get_ticks
 	friend class AnimatorSystem;
@@ -197,5 +198,4 @@ private:
 	SDL_Rect viewport = {0, 0, 640, 480};
 };
 
-
 } // namespace crepe
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 1b455cd..7f7f9ec 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,154 +1,155 @@
 
-#include "ComponentManager.h"
-#include "../api/EventManager.h"
 #include "../api/Event.h"
-
+#include "../api/EventManager.h"
+#include "ComponentManager.h"
 
 #include "system/InputSystem.h"
 
 using namespace crepe;
 
 void InputSystem::update() {
-    EventManager &event_mgr = EventManager::get_instance();
-    std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
-
-    for (const SDLContext::EventData &event : event_list) {
-        switch (event.event_type) {
-            case SDLContext::Event::KEYDOWN: {
-                event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{
-                    .repeat = event.key_repeat,
-                    .key = event.key,
-                });
-                break;
-            }
-            case SDLContext::Event::KEYUP: {
-                event_mgr.queue_event<KeyReleaseEvent>(KeyReleaseEvent{
-                    .key = event.key,
-                });
-                break;
-            }
-            case SDLContext::Event::MOUSEDOWN: {
-                event_mgr.queue_event<MousePressEvent>(MousePressEvent{
-                    .mouse_x = event.mouse_position.first,
-                    .mouse_y = event.mouse_position.second,
-                    .button = event.mouse_button,
-                });
-                last_mouse_down_position = event.mouse_position;
-                last_mouse_button = event.mouse_button;
-                break;
-            }
-            case SDLContext::Event::MOUSEUP: {
-                MouseReleaseEvent mouse_release_event = MouseReleaseEvent{
-                    .mouse_x = event.mouse_position.first,
-                    .mouse_y = event.mouse_position.second,
-                    .button = event.mouse_button,
-                };
-                event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event);
-
-                // Calculate deltas for click detection
-                int delta_x = event.mouse_position.first - last_mouse_down_position.first;
-                int delta_y = event.mouse_position.second - last_mouse_down_position.second;
-
-                if (last_mouse_button == event.mouse_button &&
-                    std::abs(delta_x) <= click_tolerance &&
-                    std::abs(delta_y) <= click_tolerance) {
-                    event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
-                        .mouse_x = event.mouse_position.first,
-                        .mouse_y = event.mouse_position.second,
-                        .button = event.mouse_button,
-                    });
-
-                    handle_click(event);
-                }
-                break;
-            }
-            case SDLContext::Event::MOUSEMOVE: {
-                event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
-                    .mouse_x = event.mouse_position.first,
-                    .mouse_y = event.mouse_position.second,
-                    .rel_x = event.rel_mouse_move.first,
-                    .rel_y = event.rel_mouse_move.second,
-                });
-                handle_move(event);
-                break;
-            }
-            case SDLContext::Event::MOUSEWHEEL: {
-                event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{
-                    .scroll_x = event.wheel_delta,
-                    .scroll_y = 0,
-                    .direction = event.wheel_delta,
-                });
-                break;
-            }
-            case SDLContext::Event::SHUTDOWN: {
-                event_mgr.queue_event<ShutDownEvent>(ShutDownEvent{});
-                break;
-            }
-            default:
-                break;
-        }
-    }
+	EventManager & event_mgr = EventManager::get_instance();
+	std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
+
+	for (const SDLContext::EventData & event : event_list) {
+		switch (event.event_type) {
+			case SDLContext::Event::KEYDOWN: {
+				event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{
+					.repeat = event.key_repeat,
+					.key = event.key,
+				});
+				break;
+			}
+			case SDLContext::Event::KEYUP: {
+				event_mgr.queue_event<KeyReleaseEvent>(KeyReleaseEvent{
+					.key = event.key,
+				});
+				break;
+			}
+			case SDLContext::Event::MOUSEDOWN: {
+				event_mgr.queue_event<MousePressEvent>(MousePressEvent{
+					.mouse_x = event.mouse_position.first,
+					.mouse_y = event.mouse_position.second,
+					.button = event.mouse_button,
+				});
+				last_mouse_down_position = event.mouse_position;
+				last_mouse_button = event.mouse_button;
+				break;
+			}
+			case SDLContext::Event::MOUSEUP: {
+				MouseReleaseEvent mouse_release_event = MouseReleaseEvent{
+					.mouse_x = event.mouse_position.first,
+					.mouse_y = event.mouse_position.second,
+					.button = event.mouse_button,
+				};
+				event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event);
+
+				// Calculate deltas for click detection
+				int delta_x = event.mouse_position.first - last_mouse_down_position.first;
+				int delta_y = event.mouse_position.second - last_mouse_down_position.second;
+
+				if (last_mouse_button == event.mouse_button
+					&& std::abs(delta_x) <= click_tolerance
+					&& std::abs(delta_y) <= click_tolerance) {
+					event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
+						.mouse_x = event.mouse_position.first,
+						.mouse_y = event.mouse_position.second,
+						.button = event.mouse_button,
+					});
+
+					handle_click(event);
+				}
+				break;
+			}
+			case SDLContext::Event::MOUSEMOVE: {
+				event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
+					.mouse_x = event.mouse_position.first,
+					.mouse_y = event.mouse_position.second,
+					.rel_x = event.rel_mouse_move.first,
+					.rel_y = event.rel_mouse_move.second,
+				});
+				handle_move(event);
+				break;
+			}
+			case SDLContext::Event::MOUSEWHEEL: {
+				event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{
+					.scroll_x = event.wheel_delta,
+					.scroll_y = 0,
+					.direction = event.wheel_delta,
+				});
+				break;
+			}
+			case SDLContext::Event::SHUTDOWN: {
+				event_mgr.queue_event<ShutDownEvent>(ShutDownEvent{});
+				break;
+			}
+			default:
+				break;
+		}
+	}
 }
 
-void InputSystem::handle_move(const SDLContext::EventData &event_data) {
-    ComponentManager &mgr = this->component_manager;
+void InputSystem::handle_move(const SDLContext::EventData & event_data) {
+	ComponentManager & mgr = this->component_manager;
 
-    std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
-    std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
+	std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
+	std::vector<std::reference_wrapper<Transform>> transforms
+		= mgr.get_components_by_type<Transform>();
 
-    for (Button &button : buttons) {
-        Transform *transform = find_transform_for_button(button, transforms);
-        if (!transform)
-            continue;
+	for (Button & button : buttons) {
+		Transform * transform = find_transform_for_button(button, transforms);
+		if (!transform) continue;
 
-        if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
-            button.hover = true;
-        } else {
-            button.hover = false;
-        }
-    }
+		if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
+			button.hover = true;
+		} else {
+			button.hover = false;
+		}
+	}
 }
 
-void InputSystem::handle_click(const SDLContext::EventData &event_data) {
-    ComponentManager &mgr = this->component_manager;
+void InputSystem::handle_click(const SDLContext::EventData & event_data) {
+	ComponentManager & mgr = this->component_manager;
 
-    std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
-    std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
+	std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
+	std::vector<std::reference_wrapper<Transform>> transforms
+		= mgr.get_components_by_type<Transform>();
 
-    for (Button &button : buttons) {
-        Transform *transform = find_transform_for_button(button, transforms);
-        if (!transform)
-            continue;
+	for (Button & button : buttons) {
+		Transform * transform = find_transform_for_button(button, transforms);
+		if (!transform) continue;
 
-        if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
-            handle_button_press(button);
-        }
-    }
+		if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
+			handle_button_press(button);
+		}
+	}
 }
 
-Transform *InputSystem::find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms) {
-    for (Transform &transform : transforms) {
-        if (button.game_object_id == transform.game_object_id) {
-            return &transform;
-        }
-    }
-    return nullptr;
+Transform * InputSystem::find_transform_for_button(
+	Button & button, std::vector<std::reference_wrapper<Transform>> & transforms) {
+	for (Transform & transform : transforms) {
+		if (button.game_object_id == transform.game_object_id) {
+			return &transform;
+		}
+	}
+	return nullptr;
 }
 
-bool InputSystem::is_mouse_inside_button(const SDLContext::EventData &event_data, const Button &button, const Transform &transform) {
-    return event_data.mouse_position.first >= transform.position.x &&
-           event_data.mouse_position.first <= transform.position.x + button.width &&
-           event_data.mouse_position.second >= transform.position.y &&
-           event_data.mouse_position.second <= transform.position.y + button.height;
+bool InputSystem::is_mouse_inside_button(const SDLContext::EventData & event_data,
+										 const Button & button, const Transform & transform) {
+	return event_data.mouse_position.first >= transform.position.x
+		   && event_data.mouse_position.first <= transform.position.x + button.width
+		   && event_data.mouse_position.second >= transform.position.y
+		   && event_data.mouse_position.second <= transform.position.y + button.height;
 }
 
-void InputSystem::handle_button_press(Button &button) {
-    if (button.is_toggle) {
-        if (!button.is_pressed && button.on_click) {
-            button.on_click();
-        }
-        button.is_pressed = !button.is_pressed;
-    } else if (button.on_click) {
-        button.on_click();
-    }
+void InputSystem::handle_button_press(Button & button) {
+	if (button.is_toggle) {
+		if (!button.is_pressed && button.on_click) {
+			button.on_click();
+		}
+		button.is_pressed = !button.is_pressed;
+	} else if (button.on_click) {
+		button.on_click();
+	}
 }
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 672f225..5f94446 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -2,8 +2,8 @@
 
 #include "System.h"
 
-#include "../api/Event.h"
 #include "../api/Button.h"
+#include "../api/Event.h"
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
 
@@ -19,64 +19,67 @@ namespace crepe {
  */
 class InputSystem : public System {
 public:
-    using System::System;
+	using System::System;
 
-    /**
+	/**
      * \brief Updates the system, processing all input events.
      * This method processes all events and triggers corresponding actions.
      */
-    void update() override;
+	void update() override;
 
 private:
-    //! Stores the last position of the mouse when the button was pressed.
-    std::pair<int, int> last_mouse_down_position{-1, -1};
+	//! Stores the last position of the mouse when the button was pressed.
+	std::pair<int, int> last_mouse_down_position{-1, -1};
 
-    //! Stores the last mouse button pressed.
-    MouseButton last_mouse_button = MouseButton::NONE;
+	//! Stores the last mouse button pressed.
+	MouseButton last_mouse_button = MouseButton::NONE;
 
-    //! The tolerance in pixels for detecting a mouse click.
-    const int click_tolerance = 5;
+	//! The tolerance in pixels for detecting a mouse click.
+	const int click_tolerance = 5;
 
-    /**
+	/**
      * \brief Handles the click event.
      * \param eventData The event data containing information about the mouse click.
      * 
      * This method processes the mouse click event and triggers the corresponding button action.
      */
-    void handle_click(const SDLContext::EventData &eventData);
+	void handle_click(const SDLContext::EventData & eventData);
 
-    /**
+	/**
      * \brief Handles the mouse movement event.
      * \param eventData The event data containing information about the mouse movement.
      * 
      * This method processes the mouse movement event and updates the button hover state.
      */
-    void handle_move(const SDLContext::EventData &eventData);
+	void handle_move(const SDLContext::EventData & eventData);
 
-    /**
+	/**
      * \brief Finds the transform component associated with a button.
      * \param button The button to find the associated transform for.
      * \param transforms A list of transforms to search through.
      * \return A pointer to the transform of the button, or nullptr if not found.
      */
-    Transform* find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms);
+	Transform *
+	find_transform_for_button(Button & button,
+							  std::vector<std::reference_wrapper<Transform>> & transforms);
 
-    /**
+	/**
      * \brief Checks if the mouse position is inside the bounds of the button.
      * \param eventData The event data containing the mouse position.
      * \param button The button to check.
      * \param transform The transform component of the button.
      * \return True if the mouse is inside the button, false otherwise.
      */
-    bool is_mouse_inside_button(const SDLContext::EventData &eventData, const Button &button, const Transform &transform);
+	bool is_mouse_inside_button(const SDLContext::EventData & eventData, const Button & button,
+								const Transform & transform);
 
-    /**
+	/**
      * \brief Handles the button press event, calling the on_click callback if necessary.
      * \param button The button being pressed.
      * 
      * This method triggers the on_click action for the button when it is pressed.
      */
-    void handle_button_press(Button &button);
+	void handle_button_press(Button & button);
 };
 
 } // namespace crepe
diff --git a/src/example/gameloop.cpp b/src/example/gameloop.cpp
index d45b3ce..b8ee9d8 100644
--- a/src/example/gameloop.cpp
+++ b/src/example/gameloop.cpp
@@ -1,17 +1,16 @@
-#include <iostream>
 #include "crepe/api/LoopManager.h"
 #include <crepe/api/EventManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/IKeyListener.h>
 #include <crepe/api/IMouseListener.h>
+#include <iostream>
 using namespace crepe;
 class TestKeyListener : public IKeyListener {
 public:
 	bool on_key_pressed(const KeyPressEvent & event) override {
 		std::cout << "TestKeyListener: Key Pressed - Code: " << static_cast<int>(event.key)
 				  << std::endl;
-		if(event.key == Keycode::ESCAPE){
-			
+		if (event.key == Keycode::ESCAPE) {
 		}
 		return false;
 	}
@@ -21,20 +20,19 @@ public:
 		return false;
 	}
 };
-bool on_key_pressed(const KeyPressEvent & event){
-		std::cout << "TestKeyListener: Key Pressed - Code: " << static_cast<int>(event.key)
-				  << std::endl;
-		if(event.key == Keycode::ESCAPE){
-			return true;
-		}
-		return false;
+bool on_key_pressed(const KeyPressEvent & event) {
+	std::cout << "TestKeyListener: Key Pressed - Code: " << static_cast<int>(event.key)
+			  << std::endl;
+	if (event.key == Keycode::ESCAPE) {
+		return true;
 	}
+	return false;
+}
 int main() {
 	LoopManager gameloop;
 	TestKeyListener key_listener;
 	EventManager::get_instance().subscribe<KeyPressEvent>(on_key_pressed);
 	gameloop.start();
-	
-	
+
 	return 1;
 }
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index 4af0830..c75bcc1 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -154,44 +154,44 @@ TEST_F(EventManagerTest, EventManagerTest_callback_propagation) {
 }
 
 TEST_F(EventManagerTest, EventManagerTest_queue_dispatch) {
-    EventManager & event_manager = EventManager::get_instance();
-    bool triggered1 = false;
-    bool triggered2 = false;
-    int test_channel = 1;
-    
-    // Adjusted to use KeyPressEvent with repeat as the first variable
-    EventHandler<KeyPressEvent> key_handler1 = [&](const KeyPressEvent & e) {
-        triggered1 = true;
-        EXPECT_EQ(e.repeat, false);  // Expecting repeat to be false
-        EXPECT_EQ(e.key, Keycode::A);   // Adjust expected key code
-        return false; // Allows propagation
-    };
-    
-    EventHandler<KeyPressEvent> key_handler2 = [&](const KeyPressEvent & e) {
-        triggered2 = true;
-        EXPECT_EQ(e.repeat, false);  // Expecting repeat to be false
-        EXPECT_EQ(e.key, Keycode::A);   // Adjust expected key code
-        return false; // Allows propagation
-    };
-
-    // Subscribe handlers to KeyPressEvent
-    event_manager.subscribe<KeyPressEvent>(key_handler1);
-    event_manager.subscribe<KeyPressEvent>(key_handler2, test_channel);
-
-    // Queue a KeyPressEvent instead of KeyDownEvent
-    event_manager.queue_event<KeyPressEvent>(
-        KeyPressEvent{.repeat = false, .key = Keycode::A});  // Adjust event with repeat flag first
-    
-    event_manager.queue_event<KeyPressEvent>(
-        KeyPressEvent{.repeat = false, .key = Keycode::A},  // Adjust event for second subscription
-        test_channel);
-
-    event_manager.dispatch_events();
-    
-    EXPECT_TRUE(triggered1);
-    EXPECT_TRUE(triggered2);
-}
+	EventManager & event_manager = EventManager::get_instance();
+	bool triggered1 = false;
+	bool triggered2 = false;
+	int test_channel = 1;
 
+	// Adjusted to use KeyPressEvent with repeat as the first variable
+	EventHandler<KeyPressEvent> key_handler1 = [&](const KeyPressEvent & e) {
+		triggered1 = true;
+		EXPECT_EQ(e.repeat, false); // Expecting repeat to be false
+		EXPECT_EQ(e.key, Keycode::A); // Adjust expected key code
+		return false; // Allows propagation
+	};
+
+	EventHandler<KeyPressEvent> key_handler2 = [&](const KeyPressEvent & e) {
+		triggered2 = true;
+		EXPECT_EQ(e.repeat, false); // Expecting repeat to be false
+		EXPECT_EQ(e.key, Keycode::A); // Adjust expected key code
+		return false; // Allows propagation
+	};
+
+	// Subscribe handlers to KeyPressEvent
+	event_manager.subscribe<KeyPressEvent>(key_handler1);
+	event_manager.subscribe<KeyPressEvent>(key_handler2, test_channel);
+
+	// Queue a KeyPressEvent instead of KeyDownEvent
+	event_manager.queue_event<KeyPressEvent>(KeyPressEvent{
+		.repeat = false, .key = Keycode::A}); // Adjust event with repeat flag first
+
+	event_manager.queue_event<KeyPressEvent>(
+		KeyPressEvent{.repeat = false,
+					  .key = Keycode::A}, // Adjust event for second subscription
+		test_channel);
+
+	event_manager.dispatch_events();
+
+	EXPECT_TRUE(triggered1);
+	EXPECT_TRUE(triggered2);
+}
 
 TEST_F(EventManagerTest, EventManagerTest_unsubscribe) {
 	EventManager & event_manager = EventManager::get_instance();
diff --git a/src/test/inputTest.cpp b/src/test/inputTest.cpp
index 8f3eb48..3a9d341 100644
--- a/src/test/inputTest.cpp
+++ b/src/test/inputTest.cpp
@@ -1,18 +1,17 @@
 #include <gtest/gtest.h>
 #define protected public
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_keycode.h>
-#include "system/InputSystem.h"
-#include <crepe/ComponentManager.h>
 #include "api/EventManager.h"
 #include "api/KeyCodes.h"
-#include <gmock/gmock.h>
+#include "system/InputSystem.h"
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_keycode.h>
 #include <crepe/ComponentManager.h>
+#include <crepe/api/Button.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
-#include <crepe/api/Button.h>
+#include <gmock/gmock.h>
 
 using namespace std;
 using namespace std::chrono_literals;
@@ -20,77 +19,75 @@ using namespace crepe;
 
 class InputTest : public ::testing::Test {
 public:
-    ComponentManager mgr{};
-    InputSystem input_system{mgr};
+	ComponentManager mgr{};
+	InputSystem input_system{mgr};
 
-    EventManager& event_manager = EventManager::get_instance();
+	EventManager & event_manager = EventManager::get_instance();
 
 protected:
-    void SetUp() override {
-        event_manager.clear();
-    }
-
-    void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
-        SDL_Event event;
-
-        // Simulate Mouse Button Down event
-        SDL_zero(event);
-        event.type = SDL_MOUSEBUTTONDOWN;
-        event.button.x = mouse_x;
-        event.button.y = mouse_y;
-        event.button.button = mouse_button;
-        SDL_PushEvent(&event);
-        SDL_zero(event);
-        event.type = SDL_MOUSEBUTTONUP;
-        event.button.x = mouse_x;
-        event.button.y = mouse_y;
-        event.button.button = mouse_button;
-        SDL_PushEvent(&event);
-    }
+	void SetUp() override { event_manager.clear(); }
+
+	void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
+		SDL_Event event;
+
+		// Simulate Mouse Button Down event
+		SDL_zero(event);
+		event.type = SDL_MOUSEBUTTONDOWN;
+		event.button.x = mouse_x;
+		event.button.y = mouse_y;
+		event.button.button = mouse_button;
+		SDL_PushEvent(&event);
+		SDL_zero(event);
+		event.type = SDL_MOUSEBUTTONUP;
+		event.button.x = mouse_x;
+		event.button.y = mouse_y;
+		event.button.button = mouse_button;
+		SDL_PushEvent(&event);
+	}
 };
 
 TEST_F(InputTest, MouseDown) {
-    bool mouse_triggered = false;
-    EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent& event) {
-        mouse_triggered = true;
-        EXPECT_EQ(event.mouse_x, 10);
-        EXPECT_EQ(event.mouse_y, 10);
-        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
-        return false;
-    };
-    event_manager.subscribe<MousePressEvent>(on_mouse_down);
-	
-    SDL_Event event;
-    SDL_zero(event);
-    event.type = SDL_MOUSEBUTTONDOWN;
-    event.button.x = 10;
-    event.button.y = 10;
-    event.button.button = SDL_BUTTON_LEFT;
-    SDL_PushEvent(&event);
+	bool mouse_triggered = false;
+	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
+		mouse_triggered = true;
+		EXPECT_EQ(event.mouse_x, 10);
+		EXPECT_EQ(event.mouse_y, 10);
+		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
+		return false;
+	};
+	event_manager.subscribe<MousePressEvent>(on_mouse_down);
+
+	SDL_Event event;
+	SDL_zero(event);
+	event.type = SDL_MOUSEBUTTONDOWN;
+	event.button.x = 10;
+	event.button.y = 10;
+	event.button.button = SDL_BUTTON_LEFT;
+	SDL_PushEvent(&event);
 	input_system.update();
 	event_manager.dispatch_events();
-    EXPECT_TRUE(mouse_triggered);
+	EXPECT_TRUE(mouse_triggered);
 }
 
 TEST_F(InputTest, MouseUp) {
 	bool function_triggered = false;
-    EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent& e) {
-        // Handle the mouse click event here
+	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
+		// Handle the mouse click event here
 		function_triggered = true;
-        EXPECT_EQ(e.mouse_x, 10);
-        EXPECT_EQ(e.mouse_y, 10);
-        EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
-        return false;
-    };
-    event_manager.subscribe<MouseReleaseEvent>(on_mouse_release);
-	
-    SDL_Event event;
-    SDL_zero(event);
-    event.type = SDL_MOUSEBUTTONUP;
-    event.button.x = 10;
-    event.button.y = 10;
-    event.button.button = SDL_BUTTON_LEFT;
-    SDL_PushEvent(&event);
+		EXPECT_EQ(e.mouse_x, 10);
+		EXPECT_EQ(e.mouse_y, 10);
+		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
+		return false;
+	};
+	event_manager.subscribe<MouseReleaseEvent>(on_mouse_release);
+
+	SDL_Event event;
+	SDL_zero(event);
+	event.type = SDL_MOUSEBUTTONUP;
+	event.button.x = 10;
+	event.button.y = 10;
+	event.button.button = SDL_BUTTON_LEFT;
+	SDL_PushEvent(&event);
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
@@ -98,150 +95,148 @@ TEST_F(InputTest, MouseUp) {
 
 TEST_F(InputTest, MouseMove) {
 	bool function_triggered = false;
-    EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent& e) {
-        // Handle the mouse click event here
+	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
+		// Handle the mouse click event here
 		function_triggered = true;
-        EXPECT_EQ(e.mouse_x, 10);
-        EXPECT_EQ(e.mouse_y, 10);
+		EXPECT_EQ(e.mouse_x, 10);
+		EXPECT_EQ(e.mouse_y, 10);
 		EXPECT_EQ(e.rel_x, 10);
-        EXPECT_EQ(e.rel_y, 10);
-        return false;
-    };
-    event_manager.subscribe<MouseMoveEvent>(on_mouse_move);
-	
-    SDL_Event event;
-    SDL_zero(event);
-    event.type = SDL_MOUSEMOTION;
-    event.motion.x = 10;
-    event.motion.y = 10;
+		EXPECT_EQ(e.rel_y, 10);
+		return false;
+	};
+	event_manager.subscribe<MouseMoveEvent>(on_mouse_move);
+
+	SDL_Event event;
+	SDL_zero(event);
+	event.type = SDL_MOUSEMOTION;
+	event.motion.x = 10;
+	event.motion.y = 10;
 	event.motion.xrel = 10;
 	event.motion.yrel = 10;
-    SDL_PushEvent(&event);
+	SDL_PushEvent(&event);
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
 }
 
 TEST_F(InputTest, KeyDown) {
-    bool function_triggered = false;
-
-    // Define event handler for KeyPressEvent
-    EventHandler<KeyPressEvent> on_key_press = [&](const KeyPressEvent& event) {
-        function_triggered = true;
-        EXPECT_EQ(event.key, Keycode::B); // Validate the key is 'B'
-        EXPECT_EQ(event.repeat, true);   // Validate repeat flag
-        return false;
-    };
-
-    event_manager.subscribe<KeyPressEvent>(on_key_press);
-
-    // Simulate SDL_KEYDOWN event
-    SDL_Event test_event;
-    SDL_zero(test_event);
-    test_event.type = SDL_KEYDOWN;                      // Key down event
-    test_event.key.keysym.scancode = SDL_SCANCODE_B;    // Set scancode for 'B'
-    test_event.key.repeat = 1;                          // Set repeat flag
-    SDL_PushEvent(&test_event);
-
-    input_system.update();             // Process the event
-    event_manager.dispatch_events();   // Dispatch events to handlers
-
-    EXPECT_TRUE(function_triggered);  // Check if the handler was triggered
+	bool function_triggered = false;
+
+	// Define event handler for KeyPressEvent
+	EventHandler<KeyPressEvent> on_key_press = [&](const KeyPressEvent & event) {
+		function_triggered = true;
+		EXPECT_EQ(event.key, Keycode::B); // Validate the key is 'B'
+		EXPECT_EQ(event.repeat, true); // Validate repeat flag
+		return false;
+	};
+
+	event_manager.subscribe<KeyPressEvent>(on_key_press);
+
+	// Simulate SDL_KEYDOWN event
+	SDL_Event test_event;
+	SDL_zero(test_event);
+	test_event.type = SDL_KEYDOWN; // Key down event
+	test_event.key.keysym.scancode = SDL_SCANCODE_B; // Set scancode for 'B'
+	test_event.key.repeat = 1; // Set repeat flag
+	SDL_PushEvent(&test_event);
+
+	input_system.update(); // Process the event
+	event_manager.dispatch_events(); // Dispatch events to handlers
+
+	EXPECT_TRUE(function_triggered); // Check if the handler was triggered
 }
 
 TEST_F(InputTest, KeyUp) {
 	bool function_triggered = false;
-    EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent& event) {
-        function_triggered = true;
-        EXPECT_EQ(event.key, Keycode::B);
-        return false;
-    };
-    event_manager.subscribe<KeyReleaseEvent>(on_key_release);
-	
-    SDL_Event event;
-    SDL_zero(event);
-    event.type = SDL_KEYUP;
-    event.key.keysym.scancode = SDL_SCANCODE_B;
-    SDL_PushEvent(&event);
+	EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent & event) {
+		function_triggered = true;
+		EXPECT_EQ(event.key, Keycode::B);
+		return false;
+	};
+	event_manager.subscribe<KeyReleaseEvent>(on_key_release);
+
+	SDL_Event event;
+	SDL_zero(event);
+	event.type = SDL_KEYUP;
+	event.key.keysym.scancode = SDL_SCANCODE_B;
+	SDL_PushEvent(&event);
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
 }
 
 TEST_F(InputTest, MouseClick) {
-    bool on_click_triggered = false;
-    EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent& event) {
-        on_click_triggered = true;
-        EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
-        EXPECT_EQ(event.mouse_x, 10);
-        EXPECT_EQ(event.mouse_y, 10);
-        return false;
-    };
-    event_manager.subscribe<MouseClickEvent>(on_mouse_click);
-	
-	this->simulate_mouse_click(10,10,SDL_BUTTON_LEFT);
+	bool on_click_triggered = false;
+	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
+		on_click_triggered = true;
+		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
+		EXPECT_EQ(event.mouse_x, 10);
+		EXPECT_EQ(event.mouse_y, 10);
+		return false;
+	};
+	event_manager.subscribe<MouseClickEvent>(on_mouse_click);
+
+	this->simulate_mouse_click(10, 10, SDL_BUTTON_LEFT);
 	input_system.update();
 	event_manager.dispatch_events();
-    EXPECT_TRUE(on_click_triggered);
+	EXPECT_TRUE(on_click_triggered);
 }
 
 TEST_F(InputTest, testButtonClick) {
-    GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-    auto& button = obj.add_component<Button>();
+	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
+	auto & button = obj.add_component<Button>();
 	bool button_clicked = false;
 	bool hover = false;
-    button.active = true;
+	button.active = true;
 	button.interactable = true;
-    button.width = 100;
-    button.height = 100;
-    std::function<void()> on_click = [&]() {
-        button_clicked = true;
-    };
+	button.width = 100;
+	button.height = 100;
+	std::function<void()> on_click = [&]() { button_clicked = true; };
 	button.on_click = on_click;
-    button.is_pressed = false;
-    button.is_toggle = false;
-    this->simulate_mouse_click(101,101, SDL_BUTTON_LEFT);
+	button.is_pressed = false;
+	button.is_toggle = false;
+	this->simulate_mouse_click(101, 101, SDL_BUTTON_LEFT);
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_FALSE(button_clicked);
-	this->simulate_mouse_click(10,10, SDL_BUTTON_LEFT);
+	this->simulate_mouse_click(10, 10, SDL_BUTTON_LEFT);
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(button_clicked);
 }
 
 TEST_F(InputTest, testButtonHover) {
-    GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-    auto& button = obj.add_component<Button>();
+	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
+	auto & button = obj.add_component<Button>();
 	bool button_clicked = false;
-    button.active = true;
+	button.active = true;
 	button.interactable = true;
-    button.width = 100;
-    button.height = 100;
-    button.is_pressed = false;
-    button.is_toggle = false;
+	button.width = 100;
+	button.height = 100;
+	button.is_pressed = false;
+	button.is_toggle = false;
 	//mouse not on button
 	SDL_Event event;
-    SDL_zero(event);
-    event.type = SDL_MOUSEMOTION;
-    event.motion.x = 200;
-    event.motion.y = 200;
+	SDL_zero(event);
+	event.type = SDL_MOUSEMOTION;
+	event.motion.x = 200;
+	event.motion.y = 200;
 	event.motion.xrel = 10;
 	event.motion.yrel = 10;
-    SDL_PushEvent(&event);
+	SDL_PushEvent(&event);
 
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_FALSE(button.hover);
 	//mouse on button
 	SDL_Event hover_event;
-    SDL_zero(hover_event);
-    hover_event.type = SDL_MOUSEMOTION;
-    hover_event.motion.x = 10;
-    hover_event.motion.y = 10;
+	SDL_zero(hover_event);
+	hover_event.type = SDL_MOUSEMOTION;
+	hover_event.motion.x = 10;
+	hover_event.motion.y = 10;
 	hover_event.motion.xrel = 10;
 	hover_event.motion.yrel = 10;
-    SDL_PushEvent(&hover_event);
+	SDL_PushEvent(&hover_event);
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(button.hover);
diff --git a/src/test/loopTimerTest.cpp b/src/test/loopTimerTest.cpp
index a3b1646..327e577 100644
--- a/src/test/loopTimerTest.cpp
+++ b/src/test/loopTimerTest.cpp
@@ -1,7 +1,7 @@
 #define private public
 #define protected public
-#include "api/LoopManager.h"
 #include "api/LoopTimer.h"
+#include "api/LoopManager.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -11,22 +11,19 @@ using namespace crepe;
 
 class LoopTimerTest : public ::testing::Test {
 public:
-LoopTimer loop_timer = LoopTimer::get_instance();
+	LoopTimer loop_timer = LoopTimer::get_instance();
+
 protected:
-	void SetUp() override {
-		loop_timer.start();
-	}
+	void SetUp() override { loop_timer.start(); }
 
-	void TearDown() override {
-		
-	}
+	void TearDown() override {}
 };
 TEST_F(LoopTimerTest, TestDeltaTime) {
-    auto start_time = std::chrono::steady_clock::now();
-    
-    loop_timer.update();  
-    double delta_time = loop_timer.get_delta_time();
+	auto start_time = std::chrono::steady_clock::now();
+
+	loop_timer.update();
+	double delta_time = loop_timer.get_delta_time();
 
-    auto elapsed_time = std::chrono::steady_clock::now() - start_time;
-    EXPECT_LE(delta_time, std::chrono::duration<double>(elapsed_time).count());
+	auto elapsed_time = std::chrono::steady_clock::now() - start_time;
+	EXPECT_LE(delta_time, std::chrono::duration<double>(elapsed_time).count());
 }
-- 
cgit v1.2.3


From 6f32b8f2141d13ea8416d9ac2ef6d69453712274 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 25 Nov 2024 12:13:01 +0100
Subject: removed gameLoop example

---
 src/crepe/api/Event.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index 2018d52..778ba63 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -123,8 +123,6 @@ public:
 /**
  * \brief Event triggered to indicate the application is shutting down.
  */
-class ShutDownEvent : public Event {
-public:
-};
+class ShutDownEvent : public Event {};
 
 } // namespace crepe
-- 
cgit v1.2.3


From 9e847e8d4a737ddc182cc905902a16f8776007a5 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Mon, 25 Nov 2024 12:14:44 +0100
Subject: added doxygen comment

---
 src/crepe/api/Event.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index 778ba63..b13abc1 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -104,6 +104,7 @@ public:
 
 	//! Y-coordinate of the mouse position at the time of the event.
 	int scroll_y = 0;
+	//! scroll direction (-1 = down, 1 = up)
 	int direction = 0;
 };
 /**
-- 
cgit v1.2.3


From 7070f22d86057eafca3b82321d4146958c14a33e Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 27 Nov 2024 14:25:32 +0100
Subject: pr feedback

---
 src/crepe/api/Button.cpp         |  7 ++++--
 src/crepe/api/Button.h           | 52 +++++++++++++++++++++++++++++-----------
 src/crepe/api/Event.h            |  7 ++++--
 src/crepe/api/UiObject.cpp       |  2 +-
 src/crepe/api/UiObject.h         |  2 +-
 src/crepe/facade/SDLContext.h    | 14 ++++-------
 src/crepe/system/InputSystem.cpp | 46 +++++++++++++++++------------------
 src/crepe/system/InputSystem.h   |  7 ++++--
 src/test/inputTest.cpp           | 45 +++++++++++++++++++---------------
 9 files changed, 109 insertions(+), 73 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index 547c0fc..077a5e7 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -1,5 +1,8 @@
 #include "Button.h"
 
-using namespace crepe;
+namespace crepe {
 
-Button::Button(game_object_id_t id) : UiObject(id) {}
+Button::Button(game_object_id_t id, int width, int height, bool is_toggle, std::function<void()> on_click)
+    : UiObject(id, width, height), is_toggle(is_toggle), is_pressed(false), hover(false), on_click(on_click) {}
+
+} // namespace crepe
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 0056238..df6f1e0 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <functional>
-
 #include "UiObject.h"
 
 namespace crepe {
@@ -9,34 +8,59 @@ namespace crepe {
 /**
  * \class Button
  * \brief Represents a clickable UI button, derived from the UiObject class.
+ * 
+ * This class provides functionality for a button in the UI, including toggle state,
+ * click handling, and mouse hover detection. A callback function can be provided to
+ * handle button clicks.
  */
 class Button : public UiObject {
 public:
 	/**
-     * \brief Constructs a Button with the specified game object ID.
+     * \brief Constructs a Button with the specified game object ID and dimensions.
+     * 
      * \param id The unique ID of the game object associated with this button.
+     * \param width The width of the button.
+     * \param height The height of the button.
+     * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
+     * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id);
-
-	//! Indicates if the button is interactable (can be clicked).
-	bool interactable = true;
+	Button(game_object_id_t id, int width, int height, bool is_toggle = false, std::function<void()> on_click = nullptr);
 
-	//! Indicates if the button is a toggle button (can be pressed and released).
-	bool is_toggle = false;
+	/**
+     * \brief Indicates if the button is a toggle button (can be pressed and released).
+     * 
+     * A toggle button allows for a pressed/released state, whereas a regular button
+     * typically only has an on-click state.
+     */
+	bool is_toggle;
 
-	//! Indicates whether the button is currently pressed.
-	bool is_pressed = false;
+	/**
+     * \brief Indicates whether the button is currently pressed.
+     * 
+     * This state is true when the button is actively pressed and false otherwise.
+     */
+	bool is_pressed;
 
-	//! Indicates whether the mouse is currently hovering over the button.
-	bool hover = false;
+	/**
+     * \brief Indicates whether the mouse is currently hovering over the button.
+     * 
+     * This is set to true when the mouse is over the button and false otherwise.
+     */
+	bool hover;
 
-	//! The callback function to be executed when the button is clicked.
+	/**
+     * \brief The callback function to be executed when the button is clicked.
+     * 
+     * This function is invoked whenever the button is clicked. It can be set to any
+     * function that matches the signature `void()`. Defaults to nullptr.
+     */
 	std::function<void()> on_click;
 
 public:
 	/**
      * \brief Retrieves the maximum number of instances allowed for this button type.
-     * \return Always returns 1, as only a single instance is allowed.
+     * 
+     * \return Always returns 1, as only a single instance of this type is allowed.
      */
 	virtual int get_instances_max() const override { return 1; }
 };
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index b13abc1..a7d5511 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -88,10 +88,12 @@ public:
 
 	//! Y-coordinate of the mouse position at the time of the event.
 	int mouse_y = 0;
+
 	// Relative movement in x
-	int rel_x;
+	int rel_x = 0;
+
 	// Relative movement in y
-	int rel_y;
+	int rel_y = 0;
 };
 
 /**
@@ -104,6 +106,7 @@ public:
 
 	//! Y-coordinate of the mouse position at the time of the event.
 	int scroll_y = 0;
+
 	//! scroll direction (-1 = down, 1 = up)
 	int direction = 0;
 };
diff --git a/src/crepe/api/UiObject.cpp b/src/crepe/api/UiObject.cpp
index 1c11fc3..987fc06 100644
--- a/src/crepe/api/UiObject.cpp
+++ b/src/crepe/api/UiObject.cpp
@@ -2,4 +2,4 @@
 
 using namespace crepe;
 
-UiObject::UiObject(game_object_id_t id) : Component(id){};
+UiObject::UiObject(game_object_id_t id,int width,int height) : Component(id),width(width),height(height){};
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index 7bd1c2e..6b0323e 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -14,7 +14,7 @@ public:
      * \brief Constructs a UiObject with the specified game object ID.
      * \param id The unique ID of the game object associated with this UI object.
      */
-	UiObject(game_object_id_t id);
+	UiObject(game_object_id_t id,int width,int height);
 
 	//! The width of the UI object.
 	int width = 0;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 3e0b073..9f18728 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -11,20 +11,16 @@
 #include <string>
 #include <utility>
 
-#include "../api/Event.h"
-#include "../api/KeyCodes.h"
-#include "../api/Sprite.h"
-#include "../api/Transform.h"
-#include "../api/Vector2.h"
+#include "api/Event.h"
+#include "api/KeyCodes.h"
+#include "api/Sprite.h"
+#include "api/Transform.h"
 #include "api/Camera.h"
 
 #include "types.h"
 
 namespace crepe {
 
-// TODO: SDL_Keycode is defined in a header not distributed with crepe, which means this
-// typedef is unusable when crepe is packaged. Wouter will fix this later.
-//typedef SDL_Keycode CREPE_KEYCODES;
 class LoopManager;
 class InputSystem;
 /**
@@ -93,7 +89,7 @@ private:
 	 * @param sdlKey The SDL key code to convert.
 	 * @return The corresponding `Keycode` value.
 	 */
-	Keycode sdl_to_keycode(SDL_Keycode sdlKey);
+	Keycode sdl_to_keycode(SDL_Keycode sdl_key);
 
 	/**
 	 * @brief Converts an SDL mouse button code to the custom MouseButton type.
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 9690fec..590be8d 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,8 +1,8 @@
-#include "../api/Button.h"
-#include "../api/EventManager.h"
+#include "api/Button.h"
+#include "api/EventManager.h"
 #include "ComponentManager.h"
 
-#include "system/InputSystem.h"
+#include "InputSystem.h"
 
 using namespace crepe;
 
@@ -36,17 +36,15 @@ void InputSystem::update() {
 				break;
 			}
 			case SDLContext::EventType::MOUSEUP: {
-				MouseReleaseEvent mouse_release_event = MouseReleaseEvent{
+				event_mgr.queue_event<MouseReleaseEvent>(MouseReleaseEvent{
 					.mouse_x = event.mouse_position.first,
 					.mouse_y = event.mouse_position.second,
 					.button = event.mouse_button,
-				};
-				event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event);
+				});
 
-				// Calculate deltas for click detection
 				int delta_x = event.mouse_position.first - last_mouse_down_position.first;
 				int delta_y = event.mouse_position.second - last_mouse_down_position.second;
-
+		
 				if (last_mouse_button == event.mouse_button
 					&& std::abs(delta_x) <= click_tolerance
 					&& std::abs(delta_y) <= click_tolerance) {
@@ -96,10 +94,10 @@ void InputSystem::handle_move(const SDLContext::EventData & event_data) {
 		= mgr.get_components_by_type<Transform>();
 
 	for (Button & button : buttons) {
-		Transform * transform = find_transform_for_button(button, transforms);
+		OptionalRef<Transform> transform = find_transform_for_button(button, transforms);
 		if (!transform) continue;
 
-		if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
+		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
 			button.hover = true;
 		} else {
 			button.hover = false;
@@ -111,29 +109,31 @@ void InputSystem::handle_click(const SDLContext::EventData & event_data) {
 	ComponentManager & mgr = this->component_manager;
 
 	std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>();
-	std::vector<std::reference_wrapper<Transform>> transforms
-		= mgr.get_components_by_type<Transform>();
+	std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>();
 
 	for (Button & button : buttons) {
-		Transform * transform = find_transform_for_button(button, transforms);
-		if (!transform) continue;
+		OptionalRef<Transform> transform_ref = find_transform_for_button(button, transforms);
 
-		if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) {
+		if (button.active && is_mouse_inside_button(event_data, button, transform_ref)) {
 			handle_button_press(button);
 		}
 	}
 }
 
-Transform * InputSystem::find_transform_for_button(
-	Button & button, std::vector<std::reference_wrapper<Transform>> & transforms) {
-	for (Transform & transform : transforms) {
-		if (button.game_object_id == transform.game_object_id) {
-			return &transform;
-		}
-	}
-	return nullptr;
+
+OptionalRef<Transform> InputSystem::find_transform_for_button(
+    Button & button, std::vector<std::reference_wrapper<Transform>> & transforms) {
+    
+    for (auto& transform : transforms) {
+        if (button.game_object_id == transform.get().game_object_id) {
+            return OptionalRef<Transform>(transform);
+        }
+    }
+
+    return OptionalRef<Transform>();
 }
 
+
 bool InputSystem::is_mouse_inside_button(const SDLContext::EventData & event_data,
 										 const Button & button, const Transform & transform) {
 	return event_data.mouse_position.first >= transform.position.x
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index cd7ca77..8b47e49 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -1,11 +1,14 @@
 #pragma once
 
+#include "facade/SDLContext.h"
+#include "util/OptionalRef.h"
+
 #include "System.h"
-#include "../facade/SDLContext.h"
 
 namespace crepe {
 
 class Button;
+
 class Transform;
 /**
  * \class InputSystem
@@ -57,7 +60,7 @@ private:
      * \param transforms A list of transforms to search through.
      * \return A pointer to the transform of the button, or nullptr if not found.
      */
-	Transform *
+	OptionalRef<Transform>
 	find_transform_for_button(Button & button,
 							  std::vector<std::reference_wrapper<Transform>> & transforms);
 
diff --git a/src/test/inputTest.cpp b/src/test/inputTest.cpp
index 3a9d341..0e3e097 100644
--- a/src/test/inputTest.cpp
+++ b/src/test/inputTest.cpp
@@ -20,12 +20,14 @@ using namespace crepe;
 class InputTest : public ::testing::Test {
 public:
 	ComponentManager mgr{};
-	InputSystem input_system{mgr};
+	InputSystem input_system{mgr};  // Initializes the InputSystem with the ComponentManager
 
-	EventManager & event_manager = EventManager::get_instance();
+	EventManager& event_manager = EventManager::get_instance();
 
 protected:
-	void SetUp() override { event_manager.clear(); }
+	void SetUp() override { 
+		event_manager.clear(); 
+	}
 
 	void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
 		SDL_Event event;
@@ -37,6 +39,8 @@ protected:
 		event.button.y = mouse_y;
 		event.button.button = mouse_button;
 		SDL_PushEvent(&event);
+
+		// Simulate Mouse Button Up event
 		SDL_zero(event);
 		event.type = SDL_MOUSEBUTTONUP;
 		event.button.x = mouse_x;
@@ -48,7 +52,7 @@ protected:
 
 TEST_F(InputTest, MouseDown) {
 	bool mouse_triggered = false;
-	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
+	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent& event) {
 		mouse_triggered = true;
 		EXPECT_EQ(event.mouse_x, 10);
 		EXPECT_EQ(event.mouse_y, 10);
@@ -64,6 +68,7 @@ TEST_F(InputTest, MouseDown) {
 	event.button.y = 10;
 	event.button.button = SDL_BUTTON_LEFT;
 	SDL_PushEvent(&event);
+
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(mouse_triggered);
@@ -71,8 +76,7 @@ TEST_F(InputTest, MouseDown) {
 
 TEST_F(InputTest, MouseUp) {
 	bool function_triggered = false;
-	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
-		// Handle the mouse click event here
+	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent& e) {
 		function_triggered = true;
 		EXPECT_EQ(e.mouse_x, 10);
 		EXPECT_EQ(e.mouse_y, 10);
@@ -88,6 +92,7 @@ TEST_F(InputTest, MouseUp) {
 	event.button.y = 10;
 	event.button.button = SDL_BUTTON_LEFT;
 	SDL_PushEvent(&event);
+
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
@@ -95,8 +100,7 @@ TEST_F(InputTest, MouseUp) {
 
 TEST_F(InputTest, MouseMove) {
 	bool function_triggered = false;
-	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
-		// Handle the mouse click event here
+	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent& e) {
 		function_triggered = true;
 		EXPECT_EQ(e.mouse_x, 10);
 		EXPECT_EQ(e.mouse_y, 10);
@@ -114,6 +118,7 @@ TEST_F(InputTest, MouseMove) {
 	event.motion.xrel = 10;
 	event.motion.yrel = 10;
 	SDL_PushEvent(&event);
+
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
@@ -123,7 +128,7 @@ TEST_F(InputTest, KeyDown) {
 	bool function_triggered = false;
 
 	// Define event handler for KeyPressEvent
-	EventHandler<KeyPressEvent> on_key_press = [&](const KeyPressEvent & event) {
+	EventHandler<KeyPressEvent> on_key_press = [&](const KeyPressEvent& event) {
 		function_triggered = true;
 		EXPECT_EQ(event.key, Keycode::B); // Validate the key is 'B'
 		EXPECT_EQ(event.repeat, true); // Validate repeat flag
@@ -148,7 +153,7 @@ TEST_F(InputTest, KeyDown) {
 
 TEST_F(InputTest, KeyUp) {
 	bool function_triggered = false;
-	EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent & event) {
+	EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent& event) {
 		function_triggered = true;
 		EXPECT_EQ(event.key, Keycode::B);
 		return false;
@@ -160,6 +165,7 @@ TEST_F(InputTest, KeyUp) {
 	event.type = SDL_KEYUP;
 	event.key.keysym.scancode = SDL_SCANCODE_B;
 	SDL_PushEvent(&event);
+
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
@@ -167,7 +173,7 @@ TEST_F(InputTest, KeyUp) {
 
 TEST_F(InputTest, MouseClick) {
 	bool on_click_triggered = false;
-	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
+	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent& event) {
 		on_click_triggered = true;
 		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
 		EXPECT_EQ(event.mouse_x, 10);
@@ -184,13 +190,11 @@ TEST_F(InputTest, MouseClick) {
 
 TEST_F(InputTest, testButtonClick) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	auto & button = obj.add_component<Button>();
+	
+	auto& button = obj.add_component<Button>(100,100);
 	bool button_clicked = false;
 	bool hover = false;
 	button.active = true;
-	button.interactable = true;
-	button.width = 100;
-	button.height = 100;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
 	button.on_click = on_click;
 	button.is_pressed = false;
@@ -199,6 +203,7 @@ TEST_F(InputTest, testButtonClick) {
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_FALSE(button_clicked);
+
 	this->simulate_mouse_click(10, 10, SDL_BUTTON_LEFT);
 	input_system.update();
 	event_manager.dispatch_events();
@@ -207,15 +212,15 @@ TEST_F(InputTest, testButtonClick) {
 
 TEST_F(InputTest, testButtonHover) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	auto & button = obj.add_component<Button>();
+	auto& button = obj.add_component<Button>(100,100);
 	bool button_clicked = false;
 	button.active = true;
-	button.interactable = true;
 	button.width = 100;
 	button.height = 100;
 	button.is_pressed = false;
 	button.is_toggle = false;
-	//mouse not on button
+
+	// Mouse not on button
 	SDL_Event event;
 	SDL_zero(event);
 	event.type = SDL_MOUSEMOTION;
@@ -228,7 +233,8 @@ TEST_F(InputTest, testButtonHover) {
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_FALSE(button.hover);
-	//mouse on button
+
+	// Mouse on button
 	SDL_Event hover_event;
 	SDL_zero(hover_event);
 	hover_event.type = SDL_MOUSEMOTION;
@@ -237,6 +243,7 @@ TEST_F(InputTest, testButtonHover) {
 	hover_event.motion.xrel = 10;
 	hover_event.motion.yrel = 10;
 	SDL_PushEvent(&hover_event);
+
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(button.hover);
-- 
cgit v1.2.3


From 9d60b7b70abd832dc229c59114e465d457fcd0a3 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 27 Nov 2024 14:59:03 +0100
Subject: make format

---
 src/crepe/api/Button.cpp         |  9 +++--
 src/crepe/api/Button.h           |  5 +--
 src/crepe/api/UiObject.cpp       |  5 ++-
 src/crepe/api/UiObject.h         |  2 +-
 src/crepe/facade/SDLContext.h    |  2 +-
 src/crepe/system/InputSystem.cpp | 25 ++++++--------
 src/crepe/system/InputSystem.h   |  6 ++--
 src/test/EventTest.cpp           | 74 ++++++++++++++++++++--------------------
 src/test/InputTest.cpp           | 26 +++++++-------
 9 files changed, 79 insertions(+), 75 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index 077a5e7..c0ff5a8 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,7 +2,12 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, int width, int height, bool is_toggle, std::function<void()> on_click)
-    : UiObject(id, width, height), is_toggle(is_toggle), is_pressed(false), hover(false), on_click(on_click) {}
+Button::Button(game_object_id_t id, int width, int height, bool is_toggle,
+			   std::function<void()> on_click)
+	: UiObject(id, width, height),
+	  is_toggle(is_toggle),
+	  is_pressed(false),
+	  hover(false),
+	  on_click(on_click) {}
 
 } // namespace crepe
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index df6f1e0..2fa94ae 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <functional>
 #include "UiObject.h"
+#include <functional>
 
 namespace crepe {
 
@@ -24,7 +24,8 @@ public:
      * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
      * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id, int width, int height, bool is_toggle = false, std::function<void()> on_click = nullptr);
+	Button(game_object_id_t id, int width, int height, bool is_toggle = false,
+		   std::function<void()> on_click = nullptr);
 
 	/**
      * \brief Indicates if the button is a toggle button (can be pressed and released).
diff --git a/src/crepe/api/UiObject.cpp b/src/crepe/api/UiObject.cpp
index 987fc06..7859a90 100644
--- a/src/crepe/api/UiObject.cpp
+++ b/src/crepe/api/UiObject.cpp
@@ -2,4 +2,7 @@
 
 using namespace crepe;
 
-UiObject::UiObject(game_object_id_t id,int width,int height) : Component(id),width(width),height(height){};
+UiObject::UiObject(game_object_id_t id, int width, int height)
+	: Component(id),
+	  width(width),
+	  height(height){};
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index 6b0323e..c056877 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -14,7 +14,7 @@ public:
      * \brief Constructs a UiObject with the specified game object ID.
      * \param id The unique ID of the game object associated with this UI object.
      */
-	UiObject(game_object_id_t id,int width,int height);
+	UiObject(game_object_id_t id, int width, int height);
 
 	//! The width of the UI object.
 	int width = 0;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 9f18728..886dda8 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -11,11 +11,11 @@
 #include <string>
 #include <utility>
 
+#include "api/Camera.h"
 #include "api/Event.h"
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
 #include "api/Transform.h"
-#include "api/Camera.h"
 
 #include "types.h"
 
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index bb67e5f..070f804 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,6 +1,6 @@
+#include "ComponentManager.h"
 #include "api/Button.h"
 #include "api/EventManager.h"
-#include "ComponentManager.h"
 
 #include "InputSystem.h"
 
@@ -41,7 +41,7 @@ void InputSystem::update() {
 
 				int delta_x = event.mouse_position.first - last_mouse_down_position.first;
 				int delta_y = event.mouse_position.second - last_mouse_down_position.second;
-		
+
 				if (last_mouse_button == event.mouse_button
 					&& std::abs(delta_x) <= click_tolerance
 					&& std::abs(delta_y) <= click_tolerance) {
@@ -53,8 +53,7 @@ void InputSystem::update() {
 
 					handle_click(event);
 				}
-			}
-			break;
+			} break;
 			case SDLContext::EventType::MOUSEMOVE:
 				event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
 					.mouse_x = event.mouse_position.first,
@@ -113,20 +112,18 @@ void InputSystem::handle_click(const SDLContext::EventData & event_data) {
 	}
 }
 
+OptionalRef<Transform>
+InputSystem::find_transform_for_button(Button & button, RefVector<Transform> & transforms) {
 
-OptionalRef<Transform> InputSystem::find_transform_for_button(
-    Button & button, RefVector<Transform>& transforms) {
-    
-    for (auto& transform : transforms) {
-        if (button.game_object_id == transform.get().game_object_id) {
-            return OptionalRef<Transform>(transform);
-        }
-    }
+	for (auto & transform : transforms) {
+		if (button.game_object_id == transform.get().game_object_id) {
+			return OptionalRef<Transform>(transform);
+		}
+	}
 
-    return OptionalRef<Transform>();
+	return OptionalRef<Transform>();
 }
 
-
 bool InputSystem::is_mouse_inside_button(const SDLContext::EventData & event_data,
 										 const Button & button, const Transform & transform) {
 	return event_data.mouse_position.first >= transform.position.x
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 13c3fc1..b648144 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "facade/SDLContext.h"
-#include "util/OptionalRef.h"
 #include "types.h"
+#include "util/OptionalRef.h"
 
 #include "System.h"
 
@@ -61,8 +61,8 @@ private:
      * \param transforms A list of transforms to search through.
      * \return A pointer to the transform of the button, or nullptr if not found.
      */
-	OptionalRef<Transform>
-	find_transform_for_button(Button & button, RefVector<Transform>& transforms);
+	OptionalRef<Transform> find_transform_for_button(Button & button,
+													 RefVector<Transform> & transforms);
 
 	/**
      * \brief Checks if the mouse position is inside the bounds of the button.
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index 4af0830..c75bcc1 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -154,44 +154,44 @@ TEST_F(EventManagerTest, EventManagerTest_callback_propagation) {
 }
 
 TEST_F(EventManagerTest, EventManagerTest_queue_dispatch) {
-    EventManager & event_manager = EventManager::get_instance();
-    bool triggered1 = false;
-    bool triggered2 = false;
-    int test_channel = 1;
-    
-    // Adjusted to use KeyPressEvent with repeat as the first variable
-    EventHandler<KeyPressEvent> key_handler1 = [&](const KeyPressEvent & e) {
-        triggered1 = true;
-        EXPECT_EQ(e.repeat, false);  // Expecting repeat to be false
-        EXPECT_EQ(e.key, Keycode::A);   // Adjust expected key code
-        return false; // Allows propagation
-    };
-    
-    EventHandler<KeyPressEvent> key_handler2 = [&](const KeyPressEvent & e) {
-        triggered2 = true;
-        EXPECT_EQ(e.repeat, false);  // Expecting repeat to be false
-        EXPECT_EQ(e.key, Keycode::A);   // Adjust expected key code
-        return false; // Allows propagation
-    };
-
-    // Subscribe handlers to KeyPressEvent
-    event_manager.subscribe<KeyPressEvent>(key_handler1);
-    event_manager.subscribe<KeyPressEvent>(key_handler2, test_channel);
-
-    // Queue a KeyPressEvent instead of KeyDownEvent
-    event_manager.queue_event<KeyPressEvent>(
-        KeyPressEvent{.repeat = false, .key = Keycode::A});  // Adjust event with repeat flag first
-    
-    event_manager.queue_event<KeyPressEvent>(
-        KeyPressEvent{.repeat = false, .key = Keycode::A},  // Adjust event for second subscription
-        test_channel);
-
-    event_manager.dispatch_events();
-    
-    EXPECT_TRUE(triggered1);
-    EXPECT_TRUE(triggered2);
-}
+	EventManager & event_manager = EventManager::get_instance();
+	bool triggered1 = false;
+	bool triggered2 = false;
+	int test_channel = 1;
 
+	// Adjusted to use KeyPressEvent with repeat as the first variable
+	EventHandler<KeyPressEvent> key_handler1 = [&](const KeyPressEvent & e) {
+		triggered1 = true;
+		EXPECT_EQ(e.repeat, false); // Expecting repeat to be false
+		EXPECT_EQ(e.key, Keycode::A); // Adjust expected key code
+		return false; // Allows propagation
+	};
+
+	EventHandler<KeyPressEvent> key_handler2 = [&](const KeyPressEvent & e) {
+		triggered2 = true;
+		EXPECT_EQ(e.repeat, false); // Expecting repeat to be false
+		EXPECT_EQ(e.key, Keycode::A); // Adjust expected key code
+		return false; // Allows propagation
+	};
+
+	// Subscribe handlers to KeyPressEvent
+	event_manager.subscribe<KeyPressEvent>(key_handler1);
+	event_manager.subscribe<KeyPressEvent>(key_handler2, test_channel);
+
+	// Queue a KeyPressEvent instead of KeyDownEvent
+	event_manager.queue_event<KeyPressEvent>(KeyPressEvent{
+		.repeat = false, .key = Keycode::A}); // Adjust event with repeat flag first
+
+	event_manager.queue_event<KeyPressEvent>(
+		KeyPressEvent{.repeat = false,
+					  .key = Keycode::A}, // Adjust event for second subscription
+		test_channel);
+
+	event_manager.dispatch_events();
+
+	EXPECT_TRUE(triggered1);
+	EXPECT_TRUE(triggered2);
+}
 
 TEST_F(EventManagerTest, EventManagerTest_unsubscribe) {
 	EventManager & event_manager = EventManager::get_instance();
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 0e3e097..d6ebb6f 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -20,14 +20,12 @@ using namespace crepe;
 class InputTest : public ::testing::Test {
 public:
 	ComponentManager mgr{};
-	InputSystem input_system{mgr};  // Initializes the InputSystem with the ComponentManager
+	InputSystem input_system{mgr}; // Initializes the InputSystem with the ComponentManager
 
-	EventManager& event_manager = EventManager::get_instance();
+	EventManager & event_manager = EventManager::get_instance();
 
 protected:
-	void SetUp() override { 
-		event_manager.clear(); 
-	}
+	void SetUp() override { event_manager.clear(); }
 
 	void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
 		SDL_Event event;
@@ -52,7 +50,7 @@ protected:
 
 TEST_F(InputTest, MouseDown) {
 	bool mouse_triggered = false;
-	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent& event) {
+	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
 		mouse_triggered = true;
 		EXPECT_EQ(event.mouse_x, 10);
 		EXPECT_EQ(event.mouse_y, 10);
@@ -76,7 +74,7 @@ TEST_F(InputTest, MouseDown) {
 
 TEST_F(InputTest, MouseUp) {
 	bool function_triggered = false;
-	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent& e) {
+	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
 		function_triggered = true;
 		EXPECT_EQ(e.mouse_x, 10);
 		EXPECT_EQ(e.mouse_y, 10);
@@ -100,7 +98,7 @@ TEST_F(InputTest, MouseUp) {
 
 TEST_F(InputTest, MouseMove) {
 	bool function_triggered = false;
-	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent& e) {
+	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
 		function_triggered = true;
 		EXPECT_EQ(e.mouse_x, 10);
 		EXPECT_EQ(e.mouse_y, 10);
@@ -128,7 +126,7 @@ TEST_F(InputTest, KeyDown) {
 	bool function_triggered = false;
 
 	// Define event handler for KeyPressEvent
-	EventHandler<KeyPressEvent> on_key_press = [&](const KeyPressEvent& event) {
+	EventHandler<KeyPressEvent> on_key_press = [&](const KeyPressEvent & event) {
 		function_triggered = true;
 		EXPECT_EQ(event.key, Keycode::B); // Validate the key is 'B'
 		EXPECT_EQ(event.repeat, true); // Validate repeat flag
@@ -153,7 +151,7 @@ TEST_F(InputTest, KeyDown) {
 
 TEST_F(InputTest, KeyUp) {
 	bool function_triggered = false;
-	EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent& event) {
+	EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent & event) {
 		function_triggered = true;
 		EXPECT_EQ(event.key, Keycode::B);
 		return false;
@@ -173,7 +171,7 @@ TEST_F(InputTest, KeyUp) {
 
 TEST_F(InputTest, MouseClick) {
 	bool on_click_triggered = false;
-	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent& event) {
+	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
 		on_click_triggered = true;
 		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
 		EXPECT_EQ(event.mouse_x, 10);
@@ -190,8 +188,8 @@ TEST_F(InputTest, MouseClick) {
 
 TEST_F(InputTest, testButtonClick) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	
-	auto& button = obj.add_component<Button>(100,100);
+
+	auto & button = obj.add_component<Button>(100, 100);
 	bool button_clicked = false;
 	bool hover = false;
 	button.active = true;
@@ -212,7 +210,7 @@ TEST_F(InputTest, testButtonClick) {
 
 TEST_F(InputTest, testButtonHover) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	auto& button = obj.add_component<Button>(100,100);
+	auto & button = obj.add_component<Button>(100, 100);
 	bool button_clicked = false;
 	button.active = true;
 	button.width = 100;
-- 
cgit v1.2.3


From 570acb7e9258edcd6a06fff4dd2ce0ff12a3e873 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 28 Nov 2024 09:01:37 +0100
Subject: added on_enter and on_hover

---
 src/crepe/api/Button.cpp         |  6 ++--
 src/crepe/api/Button.h           | 42 ++++++++++++++++++--------
 src/crepe/api/Event.h            |  4 +--
 src/crepe/facade/SDLContext.h    |  2 +-
 src/crepe/system/InputSystem.cpp | 64 +++++++++++++++++++++-------------------
 src/crepe/system/InputSystem.h   | 10 -------
 src/test/InputTest.cpp           | 12 ++++----
 7 files changed, 75 insertions(+), 65 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index c0ff5a8..a27ff53 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,12 +2,10 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, int width, int height, bool is_toggle,
-			   std::function<void()> on_click)
+Button::Button(game_object_id_t id, int width, int height, std::function<void()> on_click, bool is_toggle
+			   )
 	: UiObject(id, width, height),
 	  is_toggle(is_toggle),
-	  is_pressed(false),
-	  hover(false),
 	  on_click(on_click) {}
 
 } // namespace crepe
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 2fa94ae..1410529 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -24,8 +24,7 @@ public:
      * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
      * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id, int width, int height, bool is_toggle = false,
-		   std::function<void()> on_click = nullptr);
+	Button(game_object_id_t id, int width, int height, std::function<void()> on_click, bool is_toggle = false);
 
 	/**
      * \brief Indicates if the button is a toggle button (can be pressed and released).
@@ -33,29 +32,46 @@ public:
      * A toggle button allows for a pressed/released state, whereas a regular button
      * typically only has an on-click state.
      */
-	bool is_toggle;
+	bool is_toggle = false;
 
 	/**
-     * \brief Indicates whether the button is currently pressed.
+     * \brief The callback function to be executed when the button is clicked.
      * 
-     * This state is true when the button is actively pressed and false otherwise.
+     * This function is invoked whenever the button is clicked. It can be set to any
+     * function that matches the signature `void()`.
      */
-	bool is_pressed;
+	std::function<void()> on_click;
+	
+	/**
+	 * \brief Callback function to be executed when the mouse enters the button's boundaries.
+	 *
+	 * This function is triggered when the mouse cursor moves over the button, allowing
+	 * custom actions like visual effects, highlighting, or sound effects.
+	 */
+	std::function<void()> on_enter;
 
 	/**
-     * \brief Indicates whether the mouse is currently hovering over the button.
+	 * \brief Callback function to be executed when the mouse exits the button's boundaries.
+	 *
+	 * This function is triggered when the mouse cursor moves out of the button's area,
+	 * allowing custom actions like resetting visual effects or playing exit-related effects.
+	 */
+	std::function<void()> on_exit;
+	private:
+	friend class InputSystem;
+	/**
+     * \brief Indicates whether the button is currently pressed.
      * 
-     * This is set to true when the mouse is over the button and false otherwise.
+     * This state is true when the button is actively pressed and false otherwise.
      */
-	bool hover;
+	bool is_pressed = false;
 
 	/**
-     * \brief The callback function to be executed when the button is clicked.
+     * \brief Indicates whether the mouse is currently hovering over the button.
      * 
-     * This function is invoked whenever the button is clicked. It can be set to any
-     * function that matches the signature `void()`. Defaults to nullptr.
+     * This is set to true when the mouse is over the button and false otherwise.
      */
-	std::function<void()> on_click;
+	bool hover = false;
 
 public:
 	/**
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index a7d5511..91a30b5 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -89,10 +89,10 @@ public:
 	//! Y-coordinate of the mouse position at the time of the event.
 	int mouse_y = 0;
 
-	// Relative movement in x
+	// Movement since last event in x
 	int rel_x = 0;
 
-	// Relative movement in y
+	// Movement since last event in y
 	int rel_y = 0;
 };
 
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 886dda8..546e3fe 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -86,7 +86,7 @@ private:
 	 * This method maps an SDL key code to the corresponding `Keycode` enum value,
 	 * which is used internally by the system to identify the keys.
 	 * 
-	 * @param sdlKey The SDL key code to convert.
+	 * @param sdl_key The SDL key code to convert.
 	 * @return The corresponding `Keycode` value.
 	 */
 	Keycode sdl_to_keycode(SDL_Keycode sdl_key);
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 070f804..4695620 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -80,50 +80,54 @@ void InputSystem::update() {
 }
 
 void InputSystem::handle_move(const SDLContext::EventData & event_data) {
-	ComponentManager & mgr = this->component_manager;
-
-	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-	RefVector<Transform> transforms = mgr.get_components_by_type<Transform>();
-
-	for (Button & button : buttons) {
-		OptionalRef<Transform> transform = find_transform_for_button(button, transforms);
-		if (!transform) continue;
-
-		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
-			button.hover = true;
-		} else {
-			button.hover = false;
-		}
-	}
+    ComponentManager & mgr = this->component_manager;
+
+    RefVector<Button> buttons = mgr.get_components_by_type<Button>();
+    
+
+    for (Button & button : buttons) {
+        RefVector<Transform> transform_vec =  mgr.get_components_by_id<Transform>(button.game_object_id);
+		OptionalRef<Transform> transform(transform_vec.front().get());
+        if (!transform) continue;
+
+        bool was_hovering = button.hover; // Store previous hover state
+
+        // Check if the mouse is inside the button
+        if (button.active && is_mouse_inside_button(event_data, button, transform)) {
+            button.hover = true;
+
+            // Trigger the on_enter callback if the hover state just changed to true
+            if (!was_hovering && button.on_enter) {
+                button.on_enter();
+            }
+        } else {
+            button.hover = false;
+
+            // Trigger the on_exit callback if the hover state just changed to false
+            if (was_hovering && button.on_exit) {
+                button.on_exit();
+            }
+        }
+    }
 }
 
+
 void InputSystem::handle_click(const SDLContext::EventData & event_data) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-	RefVector<Transform> transforms = mgr.get_components_by_type<Transform>();
+	
 
 	for (Button & button : buttons) {
-		OptionalRef<Transform> transform_ref = find_transform_for_button(button, transforms);
+		RefVector<Transform> transform_vec =  mgr.get_components_by_id<Transform>(button.game_object_id);
+		OptionalRef<Transform> transform(transform_vec.front().get());
 
-		if (button.active && is_mouse_inside_button(event_data, button, transform_ref)) {
+		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
 			handle_button_press(button);
 		}
 	}
 }
 
-OptionalRef<Transform>
-InputSystem::find_transform_for_button(Button & button, RefVector<Transform> & transforms) {
-
-	for (auto & transform : transforms) {
-		if (button.game_object_id == transform.get().game_object_id) {
-			return OptionalRef<Transform>(transform);
-		}
-	}
-
-	return OptionalRef<Transform>();
-}
-
 bool InputSystem::is_mouse_inside_button(const SDLContext::EventData & event_data,
 										 const Button & button, const Transform & transform) {
 	return event_data.mouse_position.first >= transform.position.x
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index b648144..c6ca114 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -54,16 +54,6 @@ private:
      * This method processes the mouse movement event and updates the button hover state.
      */
 	void handle_move(const SDLContext::EventData & eventData);
-
-	/**
-     * \brief Finds the transform component associated with a button.
-     * \param button The button to find the associated transform for.
-     * \param transforms A list of transforms to search through.
-     * \return A pointer to the transform of the button, or nullptr if not found.
-     */
-	OptionalRef<Transform> find_transform_for_button(Button & button,
-													 RefVector<Transform> & transforms);
-
 	/**
      * \brief Checks if the mouse position is inside the bounds of the button.
      * \param eventData The event data containing the mouse position.
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index d6ebb6f..2467839 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #define protected public
+#define private public
 #include "api/EventManager.h"
 #include "api/KeyCodes.h"
 #include "system/InputSystem.h"
@@ -188,13 +189,13 @@ TEST_F(InputTest, MouseClick) {
 
 TEST_F(InputTest, testButtonClick) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-
-	auto & button = obj.add_component<Button>(100, 100);
 	bool button_clicked = false;
+	std::function<void()> on_click = [&]() { button_clicked = true; };
+	auto & button = obj.add_component<Button>(100, 100,on_click,false);
+	
 	bool hover = false;
 	button.active = true;
-	std::function<void()> on_click = [&]() { button_clicked = true; };
-	button.on_click = on_click;
+	
 	button.is_pressed = false;
 	button.is_toggle = false;
 	this->simulate_mouse_click(101, 101, SDL_BUTTON_LEFT);
@@ -210,8 +211,9 @@ TEST_F(InputTest, testButtonClick) {
 
 TEST_F(InputTest, testButtonHover) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	auto & button = obj.add_component<Button>(100, 100);
 	bool button_clicked = false;
+	std::function<void()> on_click = [&]() { button_clicked = true; };
+	auto & button = obj.add_component<Button>(100, 100,on_click,false);
 	button.active = true;
 	button.width = 100;
 	button.height = 100;
-- 
cgit v1.2.3


From 34218886689a57004576486976038027732d8bcc Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 28 Nov 2024 09:02:02 +0100
Subject: make format

---
 src/crepe/api/Button.cpp         |  4 +--
 src/crepe/api/Button.h           |  8 +++---
 src/crepe/system/InputSystem.cpp | 57 ++++++++++++++++++++--------------------
 src/test/InputTest.cpp           |  8 +++---
 4 files changed, 39 insertions(+), 38 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index a27ff53..d325014 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,8 +2,8 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, int width, int height, std::function<void()> on_click, bool is_toggle
-			   )
+Button::Button(game_object_id_t id, int width, int height, std::function<void()> on_click,
+			   bool is_toggle)
 	: UiObject(id, width, height),
 	  is_toggle(is_toggle),
 	  on_click(on_click) {}
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 1410529..18f3def 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -24,7 +24,8 @@ public:
      * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
      * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id, int width, int height, std::function<void()> on_click, bool is_toggle = false);
+	Button(game_object_id_t id, int width, int height, std::function<void()> on_click,
+		   bool is_toggle = false);
 
 	/**
      * \brief Indicates if the button is a toggle button (can be pressed and released).
@@ -41,7 +42,7 @@ public:
      * function that matches the signature `void()`.
      */
 	std::function<void()> on_click;
-	
+
 	/**
 	 * \brief Callback function to be executed when the mouse enters the button's boundaries.
 	 *
@@ -57,7 +58,8 @@ public:
 	 * allowing custom actions like resetting visual effects or playing exit-related effects.
 	 */
 	std::function<void()> on_exit;
-	private:
+
+private:
 	friend class InputSystem;
 	/**
      * \brief Indicates whether the button is currently pressed.
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 4695620..beeef87 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -80,46 +80,45 @@ void InputSystem::update() {
 }
 
 void InputSystem::handle_move(const SDLContext::EventData & event_data) {
-    ComponentManager & mgr = this->component_manager;
+	ComponentManager & mgr = this->component_manager;
 
-    RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-    
+	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 
-    for (Button & button : buttons) {
-        RefVector<Transform> transform_vec =  mgr.get_components_by_id<Transform>(button.game_object_id);
+	for (Button & button : buttons) {
+		RefVector<Transform> transform_vec
+			= mgr.get_components_by_id<Transform>(button.game_object_id);
 		OptionalRef<Transform> transform(transform_vec.front().get());
-        if (!transform) continue;
-
-        bool was_hovering = button.hover; // Store previous hover state
-
-        // Check if the mouse is inside the button
-        if (button.active && is_mouse_inside_button(event_data, button, transform)) {
-            button.hover = true;
-
-            // Trigger the on_enter callback if the hover state just changed to true
-            if (!was_hovering && button.on_enter) {
-                button.on_enter();
-            }
-        } else {
-            button.hover = false;
-
-            // Trigger the on_exit callback if the hover state just changed to false
-            if (was_hovering && button.on_exit) {
-                button.on_exit();
-            }
-        }
-    }
-}
+		if (!transform) continue;
+
+		bool was_hovering = button.hover; // Store previous hover state
 
+		// Check if the mouse is inside the button
+		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
+			button.hover = true;
+
+			// Trigger the on_enter callback if the hover state just changed to true
+			if (!was_hovering && button.on_enter) {
+				button.on_enter();
+			}
+		} else {
+			button.hover = false;
+
+			// Trigger the on_exit callback if the hover state just changed to false
+			if (was_hovering && button.on_exit) {
+				button.on_exit();
+			}
+		}
+	}
+}
 
 void InputSystem::handle_click(const SDLContext::EventData & event_data) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-	
 
 	for (Button & button : buttons) {
-		RefVector<Transform> transform_vec =  mgr.get_components_by_id<Transform>(button.game_object_id);
+		RefVector<Transform> transform_vec
+			= mgr.get_components_by_id<Transform>(button.game_object_id);
 		OptionalRef<Transform> transform(transform_vec.front().get());
 
 		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 2467839..4f6077b 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -191,11 +191,11 @@ TEST_F(InputTest, testButtonClick) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = obj.add_component<Button>(100, 100,on_click,false);
-	
+	auto & button = obj.add_component<Button>(100, 100, on_click, false);
+
 	bool hover = false;
 	button.active = true;
-	
+
 	button.is_pressed = false;
 	button.is_toggle = false;
 	this->simulate_mouse_click(101, 101, SDL_BUTTON_LEFT);
@@ -213,7 +213,7 @@ TEST_F(InputTest, testButtonHover) {
 	GameObject obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = obj.add_component<Button>(100, 100,on_click,false);
+	auto & button = obj.add_component<Button>(100, 100, on_click, false);
 	button.active = true;
 	button.width = 100;
 	button.height = 100;
-- 
cgit v1.2.3


From 6fd7cec7d4bbf5aeb361b3f1337671bb0f9af61b Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 28 Nov 2024 10:13:11 +0100
Subject: manager mediator refactor

---
 src/crepe/CMakeLists.txt               |   4 +-
 src/crepe/ComponentManager.cpp         |  60 ------------
 src/crepe/ComponentManager.h           | 159 ------------------------------
 src/crepe/ComponentManager.hpp         | 161 ------------------------------
 src/crepe/api/BehaviorScript.cpp       |   6 +-
 src/crepe/api/BehaviorScript.h         |   9 +-
 src/crepe/api/BehaviorScript.hpp       |   4 +-
 src/crepe/api/CMakeLists.txt           |   8 --
 src/crepe/api/EventManager.cpp         |  46 ---------
 src/crepe/api/EventManager.h           | 161 ------------------------------
 src/crepe/api/EventManager.hpp         |  36 -------
 src/crepe/api/GameObject.hpp           |   2 +-
 src/crepe/api/IKeyListener.h           |   3 +-
 src/crepe/api/IMouseListener.h         |   3 +-
 src/crepe/api/LoopManager.cpp          |  25 ++---
 src/crepe/api/LoopManager.h            |  19 +++-
 src/crepe/api/LoopManager.hpp          |   7 +-
 src/crepe/api/SaveManager.cpp          | 173 ---------------------------------
 src/crepe/api/SaveManager.h            | 114 ----------------------
 src/crepe/api/Scene.h                  |   7 +-
 src/crepe/api/SceneManager.cpp         |  34 -------
 src/crepe/api/SceneManager.h           |  53 ----------
 src/crepe/api/SceneManager.hpp         |  25 -----
 src/crepe/api/Script.cpp               |  17 +++-
 src/crepe/api/Script.h                 |  16 +--
 src/crepe/api/Script.hpp               |   8 +-
 src/crepe/manager/CMakeLists.txt       |  20 ++++
 src/crepe/manager/ComponentManager.cpp |  63 ++++++++++++
 src/crepe/manager/ComponentManager.h   | 161 ++++++++++++++++++++++++++++++
 src/crepe/manager/ComponentManager.hpp | 161 ++++++++++++++++++++++++++++++
 src/crepe/manager/EventManager.cpp     |  46 +++++++++
 src/crepe/manager/EventManager.h       | 161 ++++++++++++++++++++++++++++++
 src/crepe/manager/EventManager.hpp     |  36 +++++++
 src/crepe/manager/Manager.cpp          |   6 ++
 src/crepe/manager/Manager.h            |  17 ++++
 src/crepe/manager/Mediator.h           |  29 ++++++
 src/crepe/manager/SaveManager.cpp      | 173 +++++++++++++++++++++++++++++++++
 src/crepe/manager/SaveManager.h        | 114 ++++++++++++++++++++++
 src/crepe/manager/SceneManager.cpp     |  35 +++++++
 src/crepe/manager/SceneManager.h       |  52 ++++++++++
 src/crepe/manager/SceneManager.hpp     |  25 +++++
 src/crepe/system/AnimatorSystem.cpp    |   6 +-
 src/crepe/system/ParticleSystem.cpp    |   6 +-
 src/crepe/system/PhysicsSystem.cpp     |   2 +-
 src/crepe/system/RenderSystem.cpp      |   3 +-
 src/crepe/system/ScriptSystem.cpp      |   2 +-
 src/crepe/system/System.cpp            |   2 +-
 src/crepe/system/System.h              |   4 +-
 src/test/DBTest.cpp                    |   3 +-
 src/test/ECSTest.cpp                   |   5 +-
 src/test/EventTest.cpp                 |  11 ++-
 src/test/ParticleTest.cpp              |   8 +-
 src/test/PhysicsTest.cpp               |   7 +-
 src/test/RenderSystemTest.cpp          |   9 +-
 src/test/SceneManagerTest.cpp          |  23 +++--
 src/test/ScriptTest.cpp                |  11 ++-
 56 files changed, 1240 insertions(+), 1121 deletions(-)
 delete mode 100644 src/crepe/ComponentManager.cpp
 delete mode 100644 src/crepe/ComponentManager.h
 delete mode 100644 src/crepe/ComponentManager.hpp
 delete mode 100644 src/crepe/api/EventManager.cpp
 delete mode 100644 src/crepe/api/EventManager.h
 delete mode 100644 src/crepe/api/EventManager.hpp
 delete mode 100644 src/crepe/api/SaveManager.cpp
 delete mode 100644 src/crepe/api/SaveManager.h
 delete mode 100644 src/crepe/api/SceneManager.cpp
 delete mode 100644 src/crepe/api/SceneManager.h
 delete mode 100644 src/crepe/api/SceneManager.hpp
 create mode 100644 src/crepe/manager/CMakeLists.txt
 create mode 100644 src/crepe/manager/ComponentManager.cpp
 create mode 100644 src/crepe/manager/ComponentManager.h
 create mode 100644 src/crepe/manager/ComponentManager.hpp
 create mode 100644 src/crepe/manager/EventManager.cpp
 create mode 100644 src/crepe/manager/EventManager.h
 create mode 100644 src/crepe/manager/EventManager.hpp
 create mode 100644 src/crepe/manager/Manager.cpp
 create mode 100644 src/crepe/manager/Manager.h
 create mode 100644 src/crepe/manager/Mediator.h
 create mode 100644 src/crepe/manager/SaveManager.cpp
 create mode 100644 src/crepe/manager/SaveManager.h
 create mode 100644 src/crepe/manager/SceneManager.cpp
 create mode 100644 src/crepe/manager/SceneManager.h
 create mode 100644 src/crepe/manager/SceneManager.hpp

(limited to 'src/crepe/api')

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 7e176e7..da9d492 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -1,13 +1,10 @@
 target_sources(crepe PUBLIC
 	Particle.cpp
-	ComponentManager.cpp
 	Component.cpp
 	Collider.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
-	ComponentManager.h
-	ComponentManager.hpp
 	Component.h
 	Collider.h
 	ValueBroker.h
@@ -16,6 +13,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 
 add_subdirectory(api)
 add_subdirectory(facade)
+add_subdirectory(manager)
 add_subdirectory(system)
 add_subdirectory(util)
 
diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
deleted file mode 100644
index 5b73009..0000000
--- a/src/crepe/ComponentManager.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "api/GameObject.h"
-#include "util/Log.h"
-
-#include "ComponentManager.h"
-#include "types.h"
-
-using namespace crepe;
-using namespace std;
-
-ComponentManager::ComponentManager() { dbg_trace(); }
-ComponentManager::~ComponentManager() { dbg_trace(); }
-
-void ComponentManager::delete_all_components_of_id(game_object_id_t id) {
-	// Do not delete persistent objects
-	if (this->persistent[id]) {
-		return;
-	}
-
-	// Loop through all the types (in the unordered_map<>)
-	for (auto & [type, component_array] : this->components) {
-		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-		if (id < component_array.size()) {
-			// Clear the components at this specific id
-			component_array[id].clear();
-		}
-	}
-}
-
-void ComponentManager::delete_all_components() {
-	// Loop through all the types (in the unordered_map<>)
-	for (auto & [type, component_array] : this->components) {
-		// Loop through all the ids (in the vector<>)
-		for (game_object_id_t id = 0; id < component_array.size(); id++) {
-			// Do not delete persistent objects
-			if (!this->persistent[id]) {
-				// Clear the components at this specific id
-				component_array[id].clear();
-			}
-		}
-	}
-
-	this->next_id = 0;
-}
-
-GameObject ComponentManager::new_object(const string & name, const string & tag,
-										const vec2 & position, double rotation, double scale) {
-	// Find the first available id (taking persistent objects into account)
-	while (this->persistent[this->next_id]) {
-		this->next_id++;
-	}
-
-	GameObject object{*this, this->next_id, name, tag, position, rotation, scale};
-	this->next_id++;
-
-	return object;
-}
-
-void ComponentManager::set_persistent(game_object_id_t id, bool persistent) {
-	this->persistent[id] = persistent;
-}
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
deleted file mode 100644
index 480124f..0000000
--- a/src/crepe/ComponentManager.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <typeindex>
-#include <unordered_map>
-#include <vector>
-
-#include "Component.h"
-#include "types.h"
-
-namespace crepe {
-
-class GameObject;
-
-/**
- * \brief Manages all components
- * 
- * This class manages all components. It provides methods to add, delete and get components.
- */
-class ComponentManager {
-	// TODO: This relation should be removed! I (loek) believe that the scene manager should
-	// create/destroy components because the GameObject's are stored in concrete Scene classes,
-	// which will in turn call GameObject's destructor, which will in turn call
-	// ComponentManager::delete_components_by_id or something. This is a pretty major change, so
-	// here is a comment and temporary fix instead :tada:
-	friend class SceneManager;
-
-public:
-	ComponentManager(); // dbg_trace
-	~ComponentManager(); // dbg_trace
-
-	/**
-	 * \brief Create a new game object using the component manager
-	 *
-	 * \param name Metadata::name (required)
-	 * \param tag Metadata::tag (optional, empty by default)
-	 * \param position Transform::position (optional, origin by default)
-	 * \param rotation Transform::rotation (optional, 0 by default)
-	 * \param scale Transform::scale (optional, 1 by default)
-	 *
-	 * \returns GameObject interface
-	 *
-	 * \note This method automatically assigns a new entity ID
-	 */
-	GameObject new_object(const std::string & name, const std::string & tag = "",
-						  const vec2 & position = {0, 0}, double rotation = 0,
-						  double scale = 1);
-
-protected:
-	/**
-	 * GameObject is used as an interface to add/remove components, and the game programmer is
-	 * supposed to use it instead of interfacing with the component manager directly.
-	 */
-	friend class GameObject;
-	/**
-	 * \brief Add a component to the ComponentManager
-	 * 
-	 * This method adds a component to the ComponentManager. The component is created with the
-	 * given arguments and added to the ComponentManager.
-	 * 
-	 * \tparam T The type of the component
-	 * \tparam Args The types of the arguments
-	 * \param id The id of the GameObject this component belongs to
-	 * \param args The arguments to create the component
-	 * \return The created component
-	 */
-	template <typename T, typename... Args>
-	T & add_component(game_object_id_t id, Args &&... args);
-	/**
-	 * \brief Delete all components of a specific type and id
-	 * 
-	 * This method deletes all components of a specific type and id.
-	 * 
-	 * \tparam T The type of the component
-	 * \param id The id of the GameObject this component belongs to
-	 */
-	template <typename T>
-	void delete_components_by_id(game_object_id_t id);
-	/**
-	 * \brief Delete all components of a specific type
-	 * 
-	 * This method deletes all components of a specific type.
-	 * 
-	 * \tparam T The type of the component
-	 */
-	template <typename T>
-	void delete_components();
-	/**
-	 * \brief Delete all components of a specific id
-	 * 
-	 * This method deletes all components of a specific id.
-	 * 
-	 * \param id The id of the GameObject this component belongs to
-	 */
-	void delete_all_components_of_id(game_object_id_t id);
-	/**
-	 * \brief Delete all components
-	 * 
-	 * This method deletes all components.
-	 */
-	void delete_all_components();
-	/**
-	 * \brief Set a GameObject as persistent
-	 *
-	 * This method sets a GameObject as persistent. If a GameObject is persistent, its
-	 * components will not be deleted.
-	 *
-	 * \param id The id of the GameObject to set as persistent
-	 * \param persistent The persistent flag
-	 */
-	void set_persistent(game_object_id_t id, bool persistent);
-
-public:
-	/**
-	 * \brief Get all components of a specific type and id
-	 * 
-	 * This method gets all components of a specific type and id.
-	 * 
-	 * \tparam T The type of the component
-	 * \param id The id of the GameObject this component belongs to
-	 * \return A vector of all components of the specific type and id
-	 */
-	template <typename T>
-	RefVector<T> get_components_by_id(game_object_id_t id) const;
-	/**
-	 * \brief Get all components of a specific type
-	 * 
-	 * This method gets all components of a specific type.
-	 * 
-	 * \tparam T The type of the component
-	 * \return A vector of all components of the specific type
-	 */
-	template <typename T>
-	RefVector<T> get_components_by_type() const;
-
-private:
-	/**
-	 * \brief The components
-	 * 
-	 * This unordered_map stores all components. The key is the type of the component and the
-	 * value is a vector of vectors of unique pointers to the components.
-	 *
-	 * Every component type has its own vector of vectors of unique pointers to the components.
-	 * The first vector is for the ids of the GameObjects and the second vector is for the
-	 * components (because a GameObject might have multiple components).
-	 */
-	std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>>
-		components;
-
-	//! Persistent flag for each GameObject
-	std::unordered_map<game_object_id_t, bool> persistent;
-
-	//! ID of next GameObject allocated by \c ComponentManager::new_object
-	game_object_id_t next_id = 0;
-};
-
-} // namespace crepe
-
-#include "ComponentManager.hpp"
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
deleted file mode 100644
index ffb38ec..0000000
--- a/src/crepe/ComponentManager.hpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#pragma once
-
-#include <type_traits>
-
-#include "ComponentManager.h"
-#include "types.h"
-
-namespace crepe {
-
-template <class T, typename... Args>
-T & ComponentManager::add_component(game_object_id_t id, Args &&... args) {
-	using namespace std;
-
-	static_assert(is_base_of<Component, T>::value,
-				  "add_component must recieve a derivative class of Component");
-
-	// Determine the type of T (this is used as the key of the unordered_map<>)
-	type_index type = typeid(T);
-
-	// Check if this component type is already in the unordered_map<>
-	if (this->components.find(type) == this->components.end()) {
-		//If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
-		this->components[type] = vector<vector<unique_ptr<Component>>>();
-	}
-
-	// Resize the vector<> if the id is greater than the current size
-	if (id >= this->components[type].size()) {
-		// Initialize new slots to nullptr (resize does automatically init to nullptr)
-		this->components[type].resize(id + 1);
-	}
-
-	// Create a new component of type T (arguments directly forwarded). The
-	// constructor must be called by ComponentManager.
-	T * instance_ptr = new T(id, forward<Args>(args)...);
-	if (instance_ptr == nullptr) throw std::bad_alloc();
-
-	T & instance_ref = *instance_ptr;
-	unique_ptr<T> instance = unique_ptr<T>(instance_ptr);
-
-	// Check if the vector size is not greater than get_instances_max
-	int max_instances = instance->get_instances_max();
-	if (max_instances != -1 && components[type][id].size() >= max_instances) {
-		throw std::runtime_error(
-			"Exceeded maximum number of instances for this component type");
-	}
-
-	// store its unique_ptr in the vector<>
-	this->components[type][id].push_back(std::move(instance));
-
-	return instance_ref;
-}
-
-template <typename T>
-void ComponentManager::delete_components_by_id(game_object_id_t id) {
-	using namespace std;
-
-	// Do not delete persistent objects
-	if (this->persistent[id]) {
-		return;
-	}
-
-	// Determine the type of T (this is used as the key of the unordered_map<>)
-	type_index type = typeid(T);
-
-	// Find the type (in the unordered_map<>)
-	if (this->components.find(type) != this->components.end()) {
-		// Get the correct vector<>
-		vector<vector<unique_ptr<Component>>> & component_array = this->components[type];
-
-		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-		if (id < component_array.size()) {
-			// Clear the whole vector<> of this specific type and id
-			component_array[id].clear();
-		}
-	}
-}
-
-template <typename T>
-void ComponentManager::delete_components() {
-	// Determine the type of T (this is used as the key of the unordered_map<>)
-	std::type_index type = typeid(T);
-
-	if (this->components.find(type) == this->components.end()) return;
-
-	// Loop through the whole vector<> of this specific type
-	for (game_object_id_t i = 0; i < this->components[type].size(); ++i) {
-		// Do not delete persistent objects
-		if (!this->persistent[i]) {
-			this->components[type][i].clear();
-		}
-	}
-}
-
-template <typename T>
-RefVector<T> ComponentManager::get_components_by_id(game_object_id_t id) const {
-	using namespace std;
-
-	// Determine the type of T (this is used as the key of the unordered_map<>)
-	type_index type = typeid(T);
-
-	// Create an empty vector<>
-	RefVector<T> component_vector;
-
-	if (this->components.find(type) == this->components.end()) return component_vector;
-
-	// Get the correct vector<>
-	const vector<vector<unique_ptr<Component>>> & component_array = this->components.at(type);
-
-	// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-	if (id >= component_array.size()) return component_vector;
-
-	// Loop trough the whole vector<>
-	for (const unique_ptr<Component> & component_ptr : component_array[id]) {
-		// Cast the unique_ptr to a raw pointer
-		T * casted_component = static_cast<T *>(component_ptr.get());
-
-		if (casted_component == nullptr) continue;
-
-		// Add the dereferenced raw pointer to the vector<>
-		component_vector.push_back(*casted_component);
-	}
-
-	return component_vector;
-}
-
-template <typename T>
-RefVector<T> ComponentManager::get_components_by_type() const {
-	using namespace std;
-
-	// Determine the type of T (this is used as the key of the unordered_map<>)
-	type_index type = typeid(T);
-
-	// Create an empty vector<>
-	RefVector<T> component_vector;
-
-	// Find the type (in the unordered_map<>)
-	if (this->components.find(type) == this->components.end()) return component_vector;
-
-	// Get the correct vector<>
-	const vector<vector<unique_ptr<Component>>> & component_array = this->components.at(type);
-
-	// Loop through the whole vector<>
-	for (const vector<unique_ptr<Component>> & component : component_array) {
-		// Loop trough the whole vector<>
-		for (const unique_ptr<Component> & component_ptr : component) {
-			// Cast the unique_ptr to a raw pointer
-			T * casted_component = static_cast<T *>(component_ptr.get());
-
-			// Ensure that the cast was successful
-			if (casted_component == nullptr) continue;
-
-			// Add the dereferenced raw pointer to the vector<>
-			component_vector.emplace_back(ref(*casted_component));
-		}
-	}
-
-	// Return the vector<>
-	return component_vector;
-}
-
-} // namespace crepe
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 7bbace0..d22afdf 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -4,12 +4,12 @@
 
 using namespace crepe;
 
-BehaviorScript::BehaviorScript(game_object_id_t id, ComponentManager & mgr)
+BehaviorScript::BehaviorScript(game_object_id_t id, Mediator & mediator)
 	: Component(id),
-	  component_manager(mgr) {}
+	  mediator(mediator) {}
 
 template <>
 BehaviorScript & GameObject::add_component<BehaviorScript>() {
 	ComponentManager & mgr = this->component_manager;
-	return mgr.add_component<BehaviorScript>(this->id, mgr);
+	return mgr.add_component<BehaviorScript>(this->id, mgr.mediator);
 }
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index d556fe5..3909b96 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -23,14 +23,13 @@ class BehaviorScript : public Component {
 protected:
 	/**
 	 * \param id Parent \c GameObject id
-	 * \param component_manager Reference to component manager (passed through to \c Script
-	 * instance)
+	 * \param mediator Mediator reference
 	 *
 	 * \note Calls to this constructor (should) always pass through \c GameObject::add_component,
 	 * which has an exception for this specific component type. This was done so the user does
 	 * not have to pass references used within \c Script to each \c BehaviorScript instance.
 	 */
-	BehaviorScript(game_object_id_t id, ComponentManager & component_manager);
+	BehaviorScript(game_object_id_t id, Mediator & mediator);
 	//! Only ComponentManager is allowed to instantiate BehaviorScript
 	friend class ComponentManager;
 
@@ -55,8 +54,8 @@ protected:
 	friend class ScriptSystem;
 
 protected:
-	//! Reference to component manager (passed to Script)
-	ComponentManager & component_manager;
+	//! Reference mediator
+	Mediator & mediator;
 };
 
 /**
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index bd59337..6de0157 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -14,11 +14,11 @@ BehaviorScript & BehaviorScript::set_script(Args &&... args) {
 	dbg_trace();
 	static_assert(std::is_base_of<Script, T>::value);
 	Script * s = new T(std::forward<Args>(args)...);
+	Mediator & mediator = this->mediator;
 
 	s->game_object_id = this->game_object_id;
 	s->active = this->active;
-	s->component_manager = this->component_manager;
-	s->event_manager = EventManager::get_instance();
+	s->mediator = mediator;
 
 	this->script = std::unique_ptr<Script>(s);
 	return *this;
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 50c51ed..7da9dca 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -9,13 +9,10 @@ target_sources(crepe PUBLIC
 	Texture.cpp
 	AssetManager.cpp
 	Sprite.cpp
-	SaveManager.cpp
 	Config.cpp
 	Metadata.cpp
-	SceneManager.cpp
 	Camera.cpp
 	Animator.cpp
-	EventManager.cpp
 	IKeyListener.cpp
 	IMouseListener.cpp
 	LoopManager.cpp
@@ -41,15 +38,10 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Texture.h 
 	AssetManager.h 
 	AssetManager.hpp
-	SaveManager.h
 	Scene.h
 	Metadata.h
-	SceneManager.h
-	SceneManager.hpp
 	Camera.h
 	Animator.h
-	EventManager.h
-	EventManager.hpp
 	EventHandler.h
 	EventHandler.hpp
 	Event.h
diff --git a/src/crepe/api/EventManager.cpp b/src/crepe/api/EventManager.cpp
deleted file mode 100644
index 20f0dd3..0000000
--- a/src/crepe/api/EventManager.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "EventManager.h"
-
-using namespace crepe;
-using namespace std;
-
-EventManager & EventManager::get_instance() {
-	static EventManager instance;
-	return instance;
-}
-
-void EventManager::dispatch_events() {
-	for (auto & event : this->events_queue) {
-		this->handle_event(event.type, event.channel, *event.event.get());
-	}
-	this->events_queue.clear();
-}
-
-void EventManager::handle_event(type_index type, event_channel_t channel, const Event & data) {
-	auto handlers_it = this->subscribers.find(type);
-	if (handlers_it == this->subscribers.end()) return;
-
-	vector<CallbackEntry> & handlers = handlers_it->second;
-	for (auto & handler : handlers) {
-		bool check_channel = handler.channel != CHANNEL_ALL || channel != CHANNEL_ALL;
-		if (check_channel && handler.channel != channel) continue;
-
-		bool handled = handler.callback->exec(data);
-		if (handled) return;
-	}
-}
-
-void EventManager::clear() {
-	this->subscribers.clear();
-	this->events_queue.clear();
-}
-
-void EventManager::unsubscribe(subscription_t id) {
-	for (auto & [event_type, handlers] : this->subscribers) {
-		for (auto it = handlers.begin(); it != handlers.end(); it++) {
-			// find listener with subscription id
-			if ((*it).id != id) continue;
-			it = handlers.erase(it);
-			return;
-		}
-	}
-}
diff --git a/src/crepe/api/EventManager.h b/src/crepe/api/EventManager.h
deleted file mode 100644
index 1a33023..0000000
--- a/src/crepe/api/EventManager.h
+++ /dev/null
@@ -1,161 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <typeindex>
-#include <unordered_map>
-#include <vector>
-
-#include "Event.h"
-#include "EventHandler.h"
-
-namespace crepe {
-
-//! Event listener unique ID
-typedef size_t subscription_t;
-
-/**
- * \brief Event channel
- *
- * Events can be sent to a specific channel, which prevents listeners on other channels from
- * being called. The default channel is EventManager::CHANNEL_ALL, which calls all listeners.
- */
-typedef size_t event_channel_t;
-
-/**
- * \class EventManager
- * \brief Manages event subscriptions, triggers, and queues, enabling decoupled event handling.
- * 
- * The `EventManager` acts as a centralized event system. It allows for registering callbacks
- * for specific event types, triggering events synchronously, queueing events for later
- * processing, and managing subscriptions via unique identifiers.
- */
-class EventManager {
-public:
-	static constexpr const event_channel_t CHANNEL_ALL = -1;
-
-	/**
-	 * \brief Get the singleton instance of the EventManager.
-	 * 
-	 * This method returns the unique instance of the EventManager, creating it if it
-	 * doesn't already exist. Ensures only one instance is active in the program.
-	 * 
-	 * \return Reference to the singleton instance of the EventManager.
-	 */
-	static EventManager & get_instance();
-
-	/**
-	 * \brief Subscribe to a specific event type.
-	 * 
-	 * Registers a callback for a given event type and optional channel. Each callback
-	 * is assigned a unique subscription ID that can be used for later unsubscription.
-	 * 
-	 * \tparam EventType The type of the event to subscribe to.
-	 * \param callback The callback function to be invoked when the event is triggered.
-	 * \param channel The channel number to subscribe to (default is CHANNEL_ALL, which listens to all channels).
-	 * \return A unique subscription ID associated with the registered callback.
-	 */
-	template <typename EventType>
-	subscription_t subscribe(const EventHandler<EventType> & callback,
-							 event_channel_t channel = CHANNEL_ALL);
-
-	/**
-	 * \brief Unsubscribe a previously registered callback.
-	 * 
-	 * Removes a callback from the subscription list based on its unique subscription ID.
-	 * 
-	 * \param event_id The unique subscription ID of the callback to remove.
-	 */
-	void unsubscribe(subscription_t event_id);
-
-	/**
-	 * \brief Trigger an event immediately.
-	 * 
-	 * Synchronously invokes all registered callbacks for the given event type on the specified channel.
-	 * 
-	 * \tparam EventType The type of the event to trigger.
-	 * \param event The event instance to pass to the callbacks.
-	 * \param channel The channel to trigger the event on (default is CHANNEL_ALL, which triggers on all channels).
-	 */
-	template <typename EventType>
-	void trigger_event(const EventType & event = {}, event_channel_t channel = CHANNEL_ALL);
-
-	/**
-	 * \brief Queue an event for later processing.
-	 * 
-	 * Adds an event to the event queue to be processed during the next call to `dispatch_events`.
-	 * 
-	 * \tparam EventType The type of the event to queue.
-	 * \param event The event instance to queue.
-	 * \param channel The channel to associate with the event (default is CHANNEL_ALL).
-	 */
-	template <typename EventType>
-	void queue_event(const EventType & event = {}, event_channel_t channel = CHANNEL_ALL);
-
-	/**
-	 * \brief Process all queued events.
-	 * 
-	 * Iterates through the event queue and triggers callbacks for each queued event.
-	 * Events are removed from the queue once processed.
-	 */
-	void dispatch_events();
-
-	/**
-	 * \brief Clear all subscriptions.
-	 * 
-	 * Removes all registered event handlers and clears the subscription list.
-	 */
-	void clear();
-
-private:
-	/**
-	 * \brief Default constructor for the EventManager.
-	 * 
-	 * Constructor is private to enforce the singleton pattern.
-	 */
-	EventManager() = default;
-
-	/**
-	 * \struct QueueEntry
-	 * \brief Represents an entry in the event queue.
-	 */
-	struct QueueEntry {
-		std::unique_ptr<Event> event; ///< The event instance.
-		event_channel_t channel = CHANNEL_ALL; ///< The channel associated with the event.
-		std::type_index type; ///< The type of the event.
-	};
-
-	/**
-	 * \brief Internal event handler
-	 *
-	 * This function processes a single event, and is used to process events both during
-	 * EventManager::dispatch_events and inside EventManager::trigger_event
-	 *
-	 * \param type \c typeid of concrete Event class
-	 * \param channel Event channel
-	 * \param data Event data
-	 */
-	void handle_event(std::type_index type, event_channel_t channel, const Event & data);
-
-	/**
-	 * \struct CallbackEntry
-	 * \brief Represents a registered event handler callback.
-	 */
-	struct CallbackEntry {
-		std::unique_ptr<IEventHandlerWrapper> callback; ///< The callback function wrapper.
-		event_channel_t channel = CHANNEL_ALL; ///< The channel this callback listens to.
-		subscription_t id = -1; ///< Unique subscription ID.
-	};
-
-	//! The queue of events to be processed during dispatch.
-	std::vector<QueueEntry> events_queue;
-
-	//! A map of event type to registered callbacks.
-	std::unordered_map<std::type_index, std::vector<CallbackEntry>> subscribers;
-
-	//! Counter to generate unique subscription IDs.
-	subscription_t subscription_counter = 0;
-};
-
-} // namespace crepe
-
-#include "EventManager.hpp"
diff --git a/src/crepe/api/EventManager.hpp b/src/crepe/api/EventManager.hpp
deleted file mode 100644
index a5f4556..0000000
--- a/src/crepe/api/EventManager.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "EventManager.h"
-
-namespace crepe {
-
-template <typename EventType>
-subscription_t EventManager::subscribe(const EventHandler<EventType> & callback,
-									   event_channel_t channel) {
-	subscription_counter++;
-	std::type_index event_type = typeid(EventType);
-	std::unique_ptr<EventHandlerWrapper<EventType>> handler
-		= std::make_unique<EventHandlerWrapper<EventType>>(callback);
-	std::vector<CallbackEntry> & handlers = this->subscribers[event_type];
-	handlers.emplace_back(CallbackEntry{
-		.callback = std::move(handler), .channel = channel, .id = subscription_counter});
-	return subscription_counter;
-}
-
-template <typename EventType>
-void EventManager::queue_event(const EventType & event, event_channel_t channel) {
-	static_assert(std::is_base_of<Event, EventType>::value,
-				  "EventType must derive from Event");
-	this->events_queue.push_back(QueueEntry{
-		.event = std::make_unique<EventType>(event),
-		.channel = channel,
-		.type = typeid(EventType),
-	});
-}
-
-template <typename EventType>
-void EventManager::trigger_event(const EventType & event, event_channel_t channel) {
-	this->handle_event(typeid(EventType), channel, event);
-}
-
-} // namespace crepe
diff --git a/src/crepe/api/GameObject.hpp b/src/crepe/api/GameObject.hpp
index 17b17d7..a6b45b0 100644
--- a/src/crepe/api/GameObject.hpp
+++ b/src/crepe/api/GameObject.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../ComponentManager.h"
+#include "../manager/ComponentManager.h"
 
 #include "GameObject.h"
 
diff --git a/src/crepe/api/IKeyListener.h b/src/crepe/api/IKeyListener.h
index 328a4c2..6ded107 100644
--- a/src/crepe/api/IKeyListener.h
+++ b/src/crepe/api/IKeyListener.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "../manager/EventManager.h"
+
 #include "Event.h"
 #include "EventHandler.h"
-#include "EventManager.h"
 
 namespace crepe {
 
diff --git a/src/crepe/api/IMouseListener.h b/src/crepe/api/IMouseListener.h
index 15e1619..9e4fdf7 100644
--- a/src/crepe/api/IMouseListener.h
+++ b/src/crepe/api/IMouseListener.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "../manager/EventManager.h"
+
 #include "Event.h"
 #include "EventHandler.h"
-#include "EventManager.h"
 
 namespace crepe {
 
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 7edf4d1..b277185 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -1,5 +1,3 @@
-#include "../facade/SDLContext.h"
-
 #include "../system/AnimatorSystem.h"
 #include "../system/CollisionSystem.h"
 #include "../system/ParticleSystem.h"
@@ -8,12 +6,14 @@
 #include "../system/ScriptSystem.h"
 
 #include "LoopManager.h"
-#include "LoopTimer.h"
 
 using namespace crepe;
 using namespace std;
 
 LoopManager::LoopManager() {
+	this->mediator.component_manager = this->component_manager;
+	this->mediator.scene_manager = this->scene_manager;
+
 	this->load_system<AnimatorSystem>();
 	this->load_system<CollisionSystem>();
 	this->load_system<ParticleSystem>();
@@ -23,7 +23,7 @@ LoopManager::LoopManager() {
 }
 
 void LoopManager::process_input() {
-	SDLContext::get_instance().handle_events(this->game_running);
+	this->sdl_context.handle_events(this->game_running);
 }
 
 void LoopManager::start() {
@@ -35,7 +35,7 @@ void LoopManager::set_running(bool running) { this->game_running = running; }
 void LoopManager::fixed_update() {}
 
 void LoopManager::loop() {
-	LoopTimer & timer = LoopTimer::get_instance();
+	LoopTimer & timer = this->loop_timer;
 	timer.start();
 
 	while (game_running) {
@@ -55,15 +55,18 @@ void LoopManager::loop() {
 }
 
 void LoopManager::setup() {
+	LoopTimer & timer = this->loop_timer;
+
 	this->game_running = true;
-	LoopTimer::get_instance().start();
-	LoopTimer::get_instance().set_fps(200);
+	timer.start();
+	timer.set_fps(200);
 }
 
 void LoopManager::render() {
-	if (this->game_running) {
-		this->get_system<RenderSystem>().update();
-	}
+	if (!this->game_running) return;
+
+	this->get_system<RenderSystem>().update();
 }
 
-void LoopManager::update() { LoopTimer & timer = LoopTimer::get_instance(); }
+void LoopManager::update() {}
+
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 13e6dac..6ea5ccc 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -2,9 +2,12 @@
 
 #include <memory>
 
-#include "../ComponentManager.h"
+#include "../manager/ComponentManager.h"
+#include "../manager/SceneManager.h"
 #include "../system/System.h"
-#include "api/SceneManager.h"
+#include "../facade/SDLContext.h"
+
+#include "LoopTimer.h"
 
 namespace crepe {
 
@@ -85,10 +88,18 @@ private:
 	bool game_running = false;
 
 private:
+	//! Global context
+	Mediator mediator;
+
 	//! Component manager instance
-	ComponentManager component_manager{};
+	ComponentManager component_manager{mediator};
 	//! Scene manager instance
-	SceneManager scene_manager{component_manager};
+	SceneManager scene_manager{mediator};
+
+	//! SDL context \todo no more singletons!
+	SDLContext & sdl_context = SDLContext::get_instance();
+	//! Loop timer \todo no more singletons!
+	LoopTimer & loop_timer = LoopTimer::get_instance();
 
 private:
 	/**
diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
index 9cf470b..cd6bd02 100644
--- a/src/crepe/api/LoopManager.hpp
+++ b/src/crepe/api/LoopManager.hpp
@@ -38,8 +38,11 @@ void LoopManager::load_system() {
 	static_assert(is_base_of<System, T>::value,
 				  "load_system must recieve a derivative class of System");
 
-	System * system = new T(this->component_manager);
-	this->systems[typeid(T)] = unique_ptr<System>(system);
+	System * system = new T(this->mediator);
+	const type_info & type = typeid(T);
+	if (this->systems.contains(type))
+		throw runtime_error(format("LoopManager: {} is already initialized", type.name()));
+	this->systems[type] = unique_ptr<System>(system);
 }
 
 } // namespace crepe
diff --git a/src/crepe/api/SaveManager.cpp b/src/crepe/api/SaveManager.cpp
deleted file mode 100644
index c5f43ea..0000000
--- a/src/crepe/api/SaveManager.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "../facade/DB.h"
-#include "../util/Log.h"
-
-#include "Config.h"
-#include "SaveManager.h"
-#include "ValueBroker.h"
-
-using namespace std;
-using namespace crepe;
-
-template <>
-string SaveManager::serialize(const string & value) const noexcept {
-	return value;
-}
-template <typename T>
-string SaveManager::serialize(const T & value) const noexcept {
-	return to_string(value);
-}
-template string SaveManager::serialize(const uint8_t &) const noexcept;
-template string SaveManager::serialize(const int8_t &) const noexcept;
-template string SaveManager::serialize(const uint16_t &) const noexcept;
-template string SaveManager::serialize(const int16_t &) const noexcept;
-template string SaveManager::serialize(const uint32_t &) const noexcept;
-template string SaveManager::serialize(const int32_t &) const noexcept;
-template string SaveManager::serialize(const uint64_t &) const noexcept;
-template string SaveManager::serialize(const int64_t &) const noexcept;
-template string SaveManager::serialize(const float &) const noexcept;
-template string SaveManager::serialize(const double &) const noexcept;
-
-template <>
-uint64_t SaveManager::deserialize(const string & value) const noexcept {
-	try {
-		return stoul(value);
-	} catch (std::invalid_argument &) {
-		return 0;
-	}
-}
-template <>
-int64_t SaveManager::deserialize(const string & value) const noexcept {
-	try {
-		return stol(value);
-	} catch (std::invalid_argument &) {
-		return 0;
-	}
-}
-template <>
-float SaveManager::deserialize(const string & value) const noexcept {
-	try {
-		return stof(value);
-	} catch (std::invalid_argument &) {
-		return 0;
-	}
-	return stof(value);
-}
-template <>
-double SaveManager::deserialize(const string & value) const noexcept {
-	try {
-		return stod(value);
-	} catch (std::invalid_argument &) {
-		return 0;
-	}
-}
-template <>
-string SaveManager::deserialize(const string & value) const noexcept {
-	return value;
-}
-
-template <>
-uint8_t SaveManager::deserialize(const string & value) const noexcept {
-	return deserialize<uint64_t>(value);
-}
-template <>
-int8_t SaveManager::deserialize(const string & value) const noexcept {
-	return deserialize<int64_t>(value);
-}
-template <>
-uint16_t SaveManager::deserialize(const string & value) const noexcept {
-	return deserialize<uint64_t>(value);
-}
-template <>
-int16_t SaveManager::deserialize(const string & value) const noexcept {
-	return deserialize<int64_t>(value);
-}
-template <>
-uint32_t SaveManager::deserialize(const string & value) const noexcept {
-	return deserialize<uint64_t>(value);
-}
-template <>
-int32_t SaveManager::deserialize(const string & value) const noexcept {
-	return deserialize<int64_t>(value);
-}
-
-SaveManager::SaveManager() { dbg_trace(); }
-
-SaveManager & SaveManager::get_instance() {
-	dbg_trace();
-	static SaveManager instance;
-	return instance;
-}
-
-DB & SaveManager::get_db() {
-	Config & cfg = Config::get_instance();
-	// TODO: make this path relative to XDG_DATA_HOME on Linux and whatever the
-	// default equivalent is on Windows using some third party library
-	static DB db(cfg.savemgr.location);
-	return db;
-}
-
-bool SaveManager::has(const string & key) {
-	DB & db = this->get_db();
-	return db.has(key);
-}
-
-template <>
-void SaveManager::set(const string & key, const string & value) {
-	DB & db = this->get_db();
-	db.set(key, value);
-}
-template <typename T>
-void SaveManager::set(const string & key, const T & value) {
-	DB & db = this->get_db();
-	db.set(key, std::to_string(value));
-}
-template void SaveManager::set(const string &, const uint8_t &);
-template void SaveManager::set(const string &, const int8_t &);
-template void SaveManager::set(const string &, const uint16_t &);
-template void SaveManager::set(const string &, const int16_t &);
-template void SaveManager::set(const string &, const uint32_t &);
-template void SaveManager::set(const string &, const int32_t &);
-template void SaveManager::set(const string &, const uint64_t &);
-template void SaveManager::set(const string &, const int64_t &);
-template void SaveManager::set(const string &, const float &);
-template void SaveManager::set(const string &, const double &);
-
-template <typename T>
-ValueBroker<T> SaveManager::get(const string & key, const T & default_value) {
-	if (!this->has(key)) this->set<T>(key, default_value);
-	return this->get<T>(key);
-}
-template ValueBroker<uint8_t> SaveManager::get(const string &, const uint8_t &);
-template ValueBroker<int8_t> SaveManager::get(const string &, const int8_t &);
-template ValueBroker<uint16_t> SaveManager::get(const string &, const uint16_t &);
-template ValueBroker<int16_t> SaveManager::get(const string &, const int16_t &);
-template ValueBroker<uint32_t> SaveManager::get(const string &, const uint32_t &);
-template ValueBroker<int32_t> SaveManager::get(const string &, const int32_t &);
-template ValueBroker<uint64_t> SaveManager::get(const string &, const uint64_t &);
-template ValueBroker<int64_t> SaveManager::get(const string &, const int64_t &);
-template ValueBroker<float> SaveManager::get(const string &, const float &);
-template ValueBroker<double> SaveManager::get(const string &, const double &);
-template ValueBroker<string> SaveManager::get(const string &, const string &);
-
-template <typename T>
-ValueBroker<T> SaveManager::get(const string & key) {
-	T value;
-	return {
-		[this, key](const T & target) { this->set<T>(key, target); },
-		[this, key, value]() mutable -> const T & {
-			value = this->deserialize<T>(this->get_db().get(key));
-			return value;
-		},
-	};
-}
-template ValueBroker<uint8_t> SaveManager::get(const string &);
-template ValueBroker<int8_t> SaveManager::get(const string &);
-template ValueBroker<uint16_t> SaveManager::get(const string &);
-template ValueBroker<int16_t> SaveManager::get(const string &);
-template ValueBroker<uint32_t> SaveManager::get(const string &);
-template ValueBroker<int32_t> SaveManager::get(const string &);
-template ValueBroker<uint64_t> SaveManager::get(const string &);
-template ValueBroker<int64_t> SaveManager::get(const string &);
-template ValueBroker<float> SaveManager::get(const string &);
-template ValueBroker<double> SaveManager::get(const string &);
-template ValueBroker<string> SaveManager::get(const string &);
diff --git a/src/crepe/api/SaveManager.h b/src/crepe/api/SaveManager.h
deleted file mode 100644
index 3d8c852..0000000
--- a/src/crepe/api/SaveManager.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include "../ValueBroker.h"
-
-namespace crepe {
-
-class DB;
-
-/**
- * \brief Save data manager
- *
- * This class provides access to a simple key-value store that stores
- * - integers (8-64 bit, signed or unsigned)
- * - real numbers (float or double)
- * - string (std::string)
- *
- * The underlying database is a key-value store.
- */
-class SaveManager {
-public:
-	/**
-	 * \brief Get a read/write reference to a value and initialize it if it does not yet exist
-	 *
-	 * \param key  The value key
-	 * \param default_value  Value to initialize \c key with if it does not already exist in the
-	 * database
-	 *
-	 * \return Read/write reference to the value
-	 */
-	template <typename T>
-	ValueBroker<T> get(const std::string & key, const T & default_value);
-
-	/**
-	 * \brief Get a read/write reference to a value
-	 *
-	 * \param key  The value key
-	 *
-	 * \return Read/write reference to the value
-	 *
-	 * \note Attempting to read this value before it is initialized (i.e. set) will result in an
-	 * exception
-	 */
-	template <typename T>
-	ValueBroker<T> get(const std::string & key);
-
-	/**
-	 * \brief Set a value directly
-	 *
-	 * \param key  The value key
-	 * \param value  The value to store
-	 */
-	template <typename T>
-	void set(const std::string & key, const T & value);
-
-	/**
-	 * \brief Check if the save file has a value for this \c key
-	 *
-	 * \param key  The value key
-	 *
-	 * \returns True if the key exists, or false if it does not
-	 */
-	bool has(const std::string & key);
-
-private:
-	SaveManager();
-	virtual ~SaveManager() = default;
-
-private:
-	/**
-	 * \brief Serialize an arbitrary value to STL string
-	 *
-	 * \tparam T  Type of arbitrary value
-	 *
-	 * \returns String representation of value
-	 */
-	template <typename T>
-	std::string serialize(const T &) const noexcept;
-
-	/**
-	 * \brief Deserialize an STL string back to type \c T
-	 *
-	 * \tparam T  Type of value
-	 * \param value  Serialized value
-	 *
-	 * \returns Deserialized value
-	 */
-	template <typename T>
-	T deserialize(const std::string & value) const noexcept;
-
-public:
-	// singleton
-	static SaveManager & get_instance();
-	SaveManager(const SaveManager &) = delete;
-	SaveManager(SaveManager &&) = delete;
-	SaveManager & operator=(const SaveManager &) = delete;
-	SaveManager & operator=(SaveManager &&) = delete;
-
-private:
-	/**
-	 * \brief Create an instance of DB and return its reference
-	 *
-	 * \returns DB instance
-	 *
-	 * This function exists because DB is a facade class, which can't directly be used in the API
-	 * without workarounds
-	 *
-	 * TODO: better solution
-	 */
-	static DB & get_db();
-};
-
-} // namespace crepe
diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h
index f6fdb2a..66dad17 100644
--- a/src/crepe/api/Scene.h
+++ b/src/crepe/api/Scene.h
@@ -3,6 +3,7 @@
 #include <string>
 
 #include "../util/OptionalRef.h"
+#include "../manager/Mediator.h"
 
 namespace crepe {
 
@@ -34,6 +35,8 @@ public:
 	 */
 	virtual std::string get_name() const = 0;
 
+	// TODO: Late references should ALWAYS be private! This is currently kept as-is so unit tests
+	// keep passing, but this reference should not be directly accessible by the user!!!
 protected:
 	/**
 	 * \name Late references
@@ -46,8 +49,8 @@ protected:
 	 *
 	 * \{
 	 */
-	//! Reference to the ComponentManager
-	OptionalRef<ComponentManager> component_manager;
+	//! Mediator reference
+	OptionalRef<Mediator> mediator;
 	//! \}
 };
 
diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp
deleted file mode 100644
index 1f783ad..0000000
--- a/src/crepe/api/SceneManager.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <algorithm>
-#include <memory>
-
-#include "../ComponentManager.h"
-
-#include "SceneManager.h"
-
-using namespace crepe;
-using namespace std;
-
-SceneManager::SceneManager(ComponentManager & mgr) : component_manager(mgr) {}
-
-void SceneManager::set_next_scene(const string & name) { next_scene = name; }
-
-void SceneManager::load_next_scene() {
-	// next scene not set
-	if (this->next_scene.empty()) return;
-
-	auto it = find_if(this->scenes.begin(), this->scenes.end(),
-					  [&next_scene = this->next_scene](unique_ptr<Scene> & scene) {
-						  return scene.get()->get_name() == next_scene;
-					  });
-
-	// next scene not found
-	if (it == this->scenes.end()) return;
-	unique_ptr<Scene> & scene = *it;
-
-	// Delete all components of the current scene
-	ComponentManager & mgr = this->component_manager;
-	mgr.delete_all_components();
-
-	// Load the new scene
-	scene->load_scene();
-}
diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h
deleted file mode 100644
index f6f62cd..0000000
--- a/src/crepe/api/SceneManager.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "Scene.h"
-
-namespace crepe {
-
-class ComponentManager;
-
-/**
- * \brief Manages scenes
- *
- * This class manages scenes. It can add new scenes and load them. It also manages the current scene
- * and the next scene.
- */
-class SceneManager {
-public:
-	//! \param mgr  Reference to the ComponentManager
-	SceneManager(ComponentManager & mgr);
-
-public:
-	/**
-	 * \brief Add a new concrete scene to the scene manager
-	 *
-	 * \tparam T  Type of concrete scene
-	 */
-	template <typename T, typename... Args>
-	void add_scene(Args &&... args);
-	/**
-	 * \brief Set the next scene
-	 *
-	 * This scene will be loaded at the end of the frame
-	 *
-	 * \param name  Name of the next scene
-	 */
-	void set_next_scene(const std::string & name);
-	//! Load a new scene (if there is one)
-	void load_next_scene();
-
-private:
-	//! Vector of concrete scenes (added by add_scene())
-	std::vector<std::unique_ptr<Scene>> scenes;
-	//! Next scene to load
-	std::string next_scene;
-	//! Reference to the ComponentManager
-	ComponentManager & component_manager;
-};
-
-} // namespace crepe
-
-#include "SceneManager.hpp"
diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp
deleted file mode 100644
index 5c8e417..0000000
--- a/src/crepe/api/SceneManager.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "SceneManager.h"
-
-namespace crepe {
-
-template <typename T, typename... Args>
-void SceneManager::add_scene(Args &&... args) {
-	using namespace std;
-	static_assert(is_base_of<Scene, T>::value, "T must be derived from Scene");
-
-	Scene * scene = new T(std::forward<Args>(args)...);
-	unique_ptr<Scene> unique_scene(scene);
-
-	unique_scene->component_manager = this->component_manager;
-
-	this->scenes.emplace_back(std::move(unique_scene));
-
-	// The first scene added, is the one that will be loaded at the beginning
-	if (next_scene.empty()) {
-		next_scene = scene->get_name();
-	}
-}
-
-} // namespace crepe
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index fcbe4c7..a27838e 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -1,11 +1,17 @@
+#include <string>
+
+#include "../manager/SceneManager.h"
+
 #include "Script.h"
 
 using namespace crepe;
+using namespace std;
 
 Script::~Script() {
-	EventManager & evmgr = this->event_manager;
+	Mediator & mediator = this->mediator;
+	EventManager & mgr = mediator.event_manager;
 	for (auto id : this->listeners) {
-		evmgr.unsubscribe(id);
+		mgr.unsubscribe(id);
 	}
 }
 
@@ -13,3 +19,10 @@ template <>
 void Script::subscribe(const EventHandler<CollisionEvent> & callback) {
 	this->subscribe_internal(callback, this->game_object_id);
 }
+
+void Script::set_next_scene(const string & name) {
+	Mediator & mediator = this->mediator;
+	SceneManager & mgr = mediator.scene_manager;
+	mgr.set_next_scene(name);
+}
+
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index a0870cb..e1f86b2 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -4,8 +4,8 @@
 
 #include "../types.h"
 #include "../util/OptionalRef.h"
-
-#include "EventManager.h"
+#include "../manager/Mediator.h"
+#include "../manager/EventManager.h"
 
 namespace crepe {
 
@@ -106,6 +106,12 @@ protected:
 	template <typename EventType>
 	void subscribe(const EventHandler<EventType> & callback);
 
+	/**
+	 * \brief Set the next scene using SceneManager
+	 * \see SceneManager::set_next_scene
+	 */
+	void set_next_scene(const std::string & name);
+
 	//! \}
 
 private:
@@ -160,10 +166,8 @@ private:
 	game_object_id_t game_object_id;
 	//! Reference to parent component
 	OptionalRef<bool> active;
-	//! Reference to component manager instance
-	OptionalRef<ComponentManager> component_manager;
-	//! Reference to event manager instance
-	OptionalRef<EventManager> event_manager;
+	//! Mediator reference
+	OptionalRef<Mediator> mediator;
 	//! \}
 
 private:
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index a2463bf..45f1ff1 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../ComponentManager.h"
+#include "../manager/ComponentManager.h"
 
 #include "BehaviorScript.h"
 #include "Script.h"
@@ -20,7 +20,8 @@ T & Script::get_component() const {
 
 template <typename T>
 RefVector<T> Script::get_components() const {
-	ComponentManager & mgr = this->component_manager;
+	Mediator & mediator = this->mediator;
+	ComponentManager & mgr = mediator.component_manager;
 
 	return mgr.get_components_by_id<T>(this->game_object_id);
 }
@@ -33,7 +34,8 @@ void Script::logf(Args &&... args) {
 template <typename EventType>
 void Script::subscribe_internal(const EventHandler<EventType> & callback,
 								event_channel_t channel) {
-	EventManager & mgr = this->event_manager;
+	Mediator & mediator = this->mediator;
+	EventManager & mgr = mediator.event_manager;
 	subscription_t listener = mgr.subscribe<EventType>(
 		[this, callback](const EventType & data) -> bool {
 			bool & active = this->active;
diff --git a/src/crepe/manager/CMakeLists.txt b/src/crepe/manager/CMakeLists.txt
new file mode 100644
index 0000000..517b8a2
--- /dev/null
+++ b/src/crepe/manager/CMakeLists.txt
@@ -0,0 +1,20 @@
+target_sources(crepe PUBLIC
+	ComponentManager.cpp
+	EventManager.cpp
+	Manager.cpp
+	SaveManager.cpp
+	SceneManager.cpp
+)
+
+target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+	ComponentManager.h
+	ComponentManager.hpp
+	EventManager.h
+	EventManager.hpp
+	Manager.h
+	Mediator.h
+	SaveManager.h
+	SceneManager.h
+	SceneManager.hpp
+)
+
diff --git a/src/crepe/manager/ComponentManager.cpp b/src/crepe/manager/ComponentManager.cpp
new file mode 100644
index 0000000..5a96158
--- /dev/null
+++ b/src/crepe/manager/ComponentManager.cpp
@@ -0,0 +1,63 @@
+#include "../api/GameObject.h"
+#include "../util/Log.h"
+#include "../types.h"
+
+#include "ComponentManager.h"
+
+using namespace crepe;
+using namespace std;
+
+ComponentManager::ComponentManager(Mediator & mediator) : Manager(mediator) {
+	mediator.component_manager = *this;
+	dbg_trace();
+}
+ComponentManager::~ComponentManager() { dbg_trace(); }
+
+void ComponentManager::delete_all_components_of_id(game_object_id_t id) {
+	// Do not delete persistent objects
+	if (this->persistent[id]) {
+		return;
+	}
+
+	// Loop through all the types (in the unordered_map<>)
+	for (auto & [type, component_array] : this->components) {
+		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		if (id < component_array.size()) {
+			// Clear the components at this specific id
+			component_array[id].clear();
+		}
+	}
+}
+
+void ComponentManager::delete_all_components() {
+	// Loop through all the types (in the unordered_map<>)
+	for (auto & [type, component_array] : this->components) {
+		// Loop through all the ids (in the vector<>)
+		for (game_object_id_t id = 0; id < component_array.size(); id++) {
+			// Do not delete persistent objects
+			if (!this->persistent[id]) {
+				// Clear the components at this specific id
+				component_array[id].clear();
+			}
+		}
+	}
+
+	this->next_id = 0;
+}
+
+GameObject ComponentManager::new_object(const string & name, const string & tag,
+										const vec2 & position, double rotation, double scale) {
+	// Find the first available id (taking persistent objects into account)
+	while (this->persistent[this->next_id]) {
+		this->next_id++;
+	}
+
+	GameObject object{*this, this->next_id, name, tag, position, rotation, scale};
+	this->next_id++;
+
+	return object;
+}
+
+void ComponentManager::set_persistent(game_object_id_t id, bool persistent) {
+	this->persistent[id] = persistent;
+}
diff --git a/src/crepe/manager/ComponentManager.h b/src/crepe/manager/ComponentManager.h
new file mode 100644
index 0000000..ad37586
--- /dev/null
+++ b/src/crepe/manager/ComponentManager.h
@@ -0,0 +1,161 @@
+#pragma once
+
+#include <memory>
+#include <typeindex>
+#include <unordered_map>
+#include <vector>
+
+#include "../Component.h"
+#include "../types.h"
+
+#include "Manager.h"
+
+namespace crepe {
+
+class GameObject;
+
+/**
+ * \brief Manages all components
+ * 
+ * This class manages all components. It provides methods to add, delete and get components.
+ */
+class ComponentManager : public Manager {
+	// TODO: This relation should be removed! I (loek) believe that the scene manager should
+	// create/destroy components because the GameObject's are stored in concrete Scene classes,
+	// which will in turn call GameObject's destructor, which will in turn call
+	// ComponentManager::delete_components_by_id or something. This is a pretty major change, so
+	// here is a comment and temporary fix instead :tada:
+	friend class SceneManager;
+
+public:
+	ComponentManager(Mediator & mediator);
+	~ComponentManager(); // dbg_trace
+
+	/**
+	 * \brief Create a new game object using the component manager
+	 *
+	 * \param name Metadata::name (required)
+	 * \param tag Metadata::tag (optional, empty by default)
+	 * \param position Transform::position (optional, origin by default)
+	 * \param rotation Transform::rotation (optional, 0 by default)
+	 * \param scale Transform::scale (optional, 1 by default)
+	 *
+	 * \returns GameObject interface
+	 *
+	 * \note This method automatically assigns a new entity ID
+	 */
+	GameObject new_object(const std::string & name, const std::string & tag = "",
+						  const vec2 & position = {0, 0}, double rotation = 0,
+						  double scale = 1);
+
+protected:
+	/**
+	 * GameObject is used as an interface to add/remove components, and the game programmer is
+	 * supposed to use it instead of interfacing with the component manager directly.
+	 */
+	friend class GameObject;
+	/**
+	 * \brief Add a component to the ComponentManager
+	 * 
+	 * This method adds a component to the ComponentManager. The component is created with the
+	 * given arguments and added to the ComponentManager.
+	 * 
+	 * \tparam T The type of the component
+	 * \tparam Args The types of the arguments
+	 * \param id The id of the GameObject this component belongs to
+	 * \param args The arguments to create the component
+	 * \return The created component
+	 */
+	template <typename T, typename... Args>
+	T & add_component(game_object_id_t id, Args &&... args);
+	/**
+	 * \brief Delete all components of a specific type and id
+	 * 
+	 * This method deletes all components of a specific type and id.
+	 * 
+	 * \tparam T The type of the component
+	 * \param id The id of the GameObject this component belongs to
+	 */
+	template <typename T>
+	void delete_components_by_id(game_object_id_t id);
+	/**
+	 * \brief Delete all components of a specific type
+	 * 
+	 * This method deletes all components of a specific type.
+	 * 
+	 * \tparam T The type of the component
+	 */
+	template <typename T>
+	void delete_components();
+	/**
+	 * \brief Delete all components of a specific id
+	 * 
+	 * This method deletes all components of a specific id.
+	 * 
+	 * \param id The id of the GameObject this component belongs to
+	 */
+	void delete_all_components_of_id(game_object_id_t id);
+	/**
+	 * \brief Delete all components
+	 * 
+	 * This method deletes all components.
+	 */
+	void delete_all_components();
+	/**
+	 * \brief Set a GameObject as persistent
+	 *
+	 * This method sets a GameObject as persistent. If a GameObject is persistent, its
+	 * components will not be deleted.
+	 *
+	 * \param id The id of the GameObject to set as persistent
+	 * \param persistent The persistent flag
+	 */
+	void set_persistent(game_object_id_t id, bool persistent);
+
+public:
+	/**
+	 * \brief Get all components of a specific type and id
+	 * 
+	 * This method gets all components of a specific type and id.
+	 * 
+	 * \tparam T The type of the component
+	 * \param id The id of the GameObject this component belongs to
+	 * \return A vector of all components of the specific type and id
+	 */
+	template <typename T>
+	RefVector<T> get_components_by_id(game_object_id_t id) const;
+	/**
+	 * \brief Get all components of a specific type
+	 * 
+	 * This method gets all components of a specific type.
+	 * 
+	 * \tparam T The type of the component
+	 * \return A vector of all components of the specific type
+	 */
+	template <typename T>
+	RefVector<T> get_components_by_type() const;
+
+private:
+	/**
+	 * \brief The components
+	 * 
+	 * This unordered_map stores all components. The key is the type of the component and the
+	 * value is a vector of vectors of unique pointers to the components.
+	 *
+	 * Every component type has its own vector of vectors of unique pointers to the components.
+	 * The first vector is for the ids of the GameObjects and the second vector is for the
+	 * components (because a GameObject might have multiple components).
+	 */
+	std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>>
+		components;
+
+	//! Persistent flag for each GameObject
+	std::unordered_map<game_object_id_t, bool> persistent;
+
+	//! ID of next GameObject allocated by \c ComponentManager::new_object
+	game_object_id_t next_id = 0;
+};
+
+} // namespace crepe
+
+#include "ComponentManager.hpp"
diff --git a/src/crepe/manager/ComponentManager.hpp b/src/crepe/manager/ComponentManager.hpp
new file mode 100644
index 0000000..ffb38ec
--- /dev/null
+++ b/src/crepe/manager/ComponentManager.hpp
@@ -0,0 +1,161 @@
+#pragma once
+
+#include <type_traits>
+
+#include "ComponentManager.h"
+#include "types.h"
+
+namespace crepe {
+
+template <class T, typename... Args>
+T & ComponentManager::add_component(game_object_id_t id, Args &&... args) {
+	using namespace std;
+
+	static_assert(is_base_of<Component, T>::value,
+				  "add_component must recieve a derivative class of Component");
+
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	type_index type = typeid(T);
+
+	// Check if this component type is already in the unordered_map<>
+	if (this->components.find(type) == this->components.end()) {
+		//If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
+		this->components[type] = vector<vector<unique_ptr<Component>>>();
+	}
+
+	// Resize the vector<> if the id is greater than the current size
+	if (id >= this->components[type].size()) {
+		// Initialize new slots to nullptr (resize does automatically init to nullptr)
+		this->components[type].resize(id + 1);
+	}
+
+	// Create a new component of type T (arguments directly forwarded). The
+	// constructor must be called by ComponentManager.
+	T * instance_ptr = new T(id, forward<Args>(args)...);
+	if (instance_ptr == nullptr) throw std::bad_alloc();
+
+	T & instance_ref = *instance_ptr;
+	unique_ptr<T> instance = unique_ptr<T>(instance_ptr);
+
+	// Check if the vector size is not greater than get_instances_max
+	int max_instances = instance->get_instances_max();
+	if (max_instances != -1 && components[type][id].size() >= max_instances) {
+		throw std::runtime_error(
+			"Exceeded maximum number of instances for this component type");
+	}
+
+	// store its unique_ptr in the vector<>
+	this->components[type][id].push_back(std::move(instance));
+
+	return instance_ref;
+}
+
+template <typename T>
+void ComponentManager::delete_components_by_id(game_object_id_t id) {
+	using namespace std;
+
+	// Do not delete persistent objects
+	if (this->persistent[id]) {
+		return;
+	}
+
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	type_index type = typeid(T);
+
+	// Find the type (in the unordered_map<>)
+	if (this->components.find(type) != this->components.end()) {
+		// Get the correct vector<>
+		vector<vector<unique_ptr<Component>>> & component_array = this->components[type];
+
+		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		if (id < component_array.size()) {
+			// Clear the whole vector<> of this specific type and id
+			component_array[id].clear();
+		}
+	}
+}
+
+template <typename T>
+void ComponentManager::delete_components() {
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
+
+	if (this->components.find(type) == this->components.end()) return;
+
+	// Loop through the whole vector<> of this specific type
+	for (game_object_id_t i = 0; i < this->components[type].size(); ++i) {
+		// Do not delete persistent objects
+		if (!this->persistent[i]) {
+			this->components[type][i].clear();
+		}
+	}
+}
+
+template <typename T>
+RefVector<T> ComponentManager::get_components_by_id(game_object_id_t id) const {
+	using namespace std;
+
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	type_index type = typeid(T);
+
+	// Create an empty vector<>
+	RefVector<T> component_vector;
+
+	if (this->components.find(type) == this->components.end()) return component_vector;
+
+	// Get the correct vector<>
+	const vector<vector<unique_ptr<Component>>> & component_array = this->components.at(type);
+
+	// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+	if (id >= component_array.size()) return component_vector;
+
+	// Loop trough the whole vector<>
+	for (const unique_ptr<Component> & component_ptr : component_array[id]) {
+		// Cast the unique_ptr to a raw pointer
+		T * casted_component = static_cast<T *>(component_ptr.get());
+
+		if (casted_component == nullptr) continue;
+
+		// Add the dereferenced raw pointer to the vector<>
+		component_vector.push_back(*casted_component);
+	}
+
+	return component_vector;
+}
+
+template <typename T>
+RefVector<T> ComponentManager::get_components_by_type() const {
+	using namespace std;
+
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	type_index type = typeid(T);
+
+	// Create an empty vector<>
+	RefVector<T> component_vector;
+
+	// Find the type (in the unordered_map<>)
+	if (this->components.find(type) == this->components.end()) return component_vector;
+
+	// Get the correct vector<>
+	const vector<vector<unique_ptr<Component>>> & component_array = this->components.at(type);
+
+	// Loop through the whole vector<>
+	for (const vector<unique_ptr<Component>> & component : component_array) {
+		// Loop trough the whole vector<>
+		for (const unique_ptr<Component> & component_ptr : component) {
+			// Cast the unique_ptr to a raw pointer
+			T * casted_component = static_cast<T *>(component_ptr.get());
+
+			// Ensure that the cast was successful
+			if (casted_component == nullptr) continue;
+
+			// Add the dereferenced raw pointer to the vector<>
+			component_vector.emplace_back(ref(*casted_component));
+		}
+	}
+
+	// Return the vector<>
+	return component_vector;
+}
+
+} // namespace crepe
diff --git a/src/crepe/manager/EventManager.cpp b/src/crepe/manager/EventManager.cpp
new file mode 100644
index 0000000..20f0dd3
--- /dev/null
+++ b/src/crepe/manager/EventManager.cpp
@@ -0,0 +1,46 @@
+#include "EventManager.h"
+
+using namespace crepe;
+using namespace std;
+
+EventManager & EventManager::get_instance() {
+	static EventManager instance;
+	return instance;
+}
+
+void EventManager::dispatch_events() {
+	for (auto & event : this->events_queue) {
+		this->handle_event(event.type, event.channel, *event.event.get());
+	}
+	this->events_queue.clear();
+}
+
+void EventManager::handle_event(type_index type, event_channel_t channel, const Event & data) {
+	auto handlers_it = this->subscribers.find(type);
+	if (handlers_it == this->subscribers.end()) return;
+
+	vector<CallbackEntry> & handlers = handlers_it->second;
+	for (auto & handler : handlers) {
+		bool check_channel = handler.channel != CHANNEL_ALL || channel != CHANNEL_ALL;
+		if (check_channel && handler.channel != channel) continue;
+
+		bool handled = handler.callback->exec(data);
+		if (handled) return;
+	}
+}
+
+void EventManager::clear() {
+	this->subscribers.clear();
+	this->events_queue.clear();
+}
+
+void EventManager::unsubscribe(subscription_t id) {
+	for (auto & [event_type, handlers] : this->subscribers) {
+		for (auto it = handlers.begin(); it != handlers.end(); it++) {
+			// find listener with subscription id
+			if ((*it).id != id) continue;
+			it = handlers.erase(it);
+			return;
+		}
+	}
+}
diff --git a/src/crepe/manager/EventManager.h b/src/crepe/manager/EventManager.h
new file mode 100644
index 0000000..d634f54
--- /dev/null
+++ b/src/crepe/manager/EventManager.h
@@ -0,0 +1,161 @@
+#pragma once
+
+#include <memory>
+#include <typeindex>
+#include <unordered_map>
+#include <vector>
+
+#include "../api/Event.h"
+#include "../api/EventHandler.h"
+
+namespace crepe {
+
+//! Event listener unique ID
+typedef size_t subscription_t;
+
+/**
+ * \brief Event channel
+ *
+ * Events can be sent to a specific channel, which prevents listeners on other channels from
+ * being called. The default channel is EventManager::CHANNEL_ALL, which calls all listeners.
+ */
+typedef size_t event_channel_t;
+
+/**
+ * \class EventManager
+ * \brief Manages event subscriptions, triggers, and queues, enabling decoupled event handling.
+ * 
+ * The `EventManager` acts as a centralized event system. It allows for registering callbacks
+ * for specific event types, triggering events synchronously, queueing events for later
+ * processing, and managing subscriptions via unique identifiers.
+ */
+class EventManager {
+public:
+	static constexpr const event_channel_t CHANNEL_ALL = -1;
+
+	/**
+	 * \brief Get the singleton instance of the EventManager.
+	 * 
+	 * This method returns the unique instance of the EventManager, creating it if it
+	 * doesn't already exist. Ensures only one instance is active in the program.
+	 * 
+	 * \return Reference to the singleton instance of the EventManager.
+	 */
+	static EventManager & get_instance();
+
+	/**
+	 * \brief Subscribe to a specific event type.
+	 * 
+	 * Registers a callback for a given event type and optional channel. Each callback
+	 * is assigned a unique subscription ID that can be used for later unsubscription.
+	 * 
+	 * \tparam EventType The type of the event to subscribe to.
+	 * \param callback The callback function to be invoked when the event is triggered.
+	 * \param channel The channel number to subscribe to (default is CHANNEL_ALL, which listens to all channels).
+	 * \return A unique subscription ID associated with the registered callback.
+	 */
+	template <typename EventType>
+	subscription_t subscribe(const EventHandler<EventType> & callback,
+							 event_channel_t channel = CHANNEL_ALL);
+
+	/**
+	 * \brief Unsubscribe a previously registered callback.
+	 * 
+	 * Removes a callback from the subscription list based on its unique subscription ID.
+	 * 
+	 * \param event_id The unique subscription ID of the callback to remove.
+	 */
+	void unsubscribe(subscription_t event_id);
+
+	/**
+	 * \brief Trigger an event immediately.
+	 * 
+	 * Synchronously invokes all registered callbacks for the given event type on the specified channel.
+	 * 
+	 * \tparam EventType The type of the event to trigger.
+	 * \param event The event instance to pass to the callbacks.
+	 * \param channel The channel to trigger the event on (default is CHANNEL_ALL, which triggers on all channels).
+	 */
+	template <typename EventType>
+	void trigger_event(const EventType & event = {}, event_channel_t channel = CHANNEL_ALL);
+
+	/**
+	 * \brief Queue an event for later processing.
+	 * 
+	 * Adds an event to the event queue to be processed during the next call to `dispatch_events`.
+	 * 
+	 * \tparam EventType The type of the event to queue.
+	 * \param event The event instance to queue.
+	 * \param channel The channel to associate with the event (default is CHANNEL_ALL).
+	 */
+	template <typename EventType>
+	void queue_event(const EventType & event = {}, event_channel_t channel = CHANNEL_ALL);
+
+	/**
+	 * \brief Process all queued events.
+	 * 
+	 * Iterates through the event queue and triggers callbacks for each queued event.
+	 * Events are removed from the queue once processed.
+	 */
+	void dispatch_events();
+
+	/**
+	 * \brief Clear all subscriptions.
+	 * 
+	 * Removes all registered event handlers and clears the subscription list.
+	 */
+	void clear();
+
+private:
+	/**
+	 * \brief Default constructor for the EventManager.
+	 * 
+	 * Constructor is private to enforce the singleton pattern.
+	 */
+	EventManager() = default;
+
+	/**
+	 * \struct QueueEntry
+	 * \brief Represents an entry in the event queue.
+	 */
+	struct QueueEntry {
+		std::unique_ptr<Event> event; ///< The event instance.
+		event_channel_t channel = CHANNEL_ALL; ///< The channel associated with the event.
+		std::type_index type; ///< The type of the event.
+	};
+
+	/**
+	 * \brief Internal event handler
+	 *
+	 * This function processes a single event, and is used to process events both during
+	 * EventManager::dispatch_events and inside EventManager::trigger_event
+	 *
+	 * \param type \c typeid of concrete Event class
+	 * \param channel Event channel
+	 * \param data Event data
+	 */
+	void handle_event(std::type_index type, event_channel_t channel, const Event & data);
+
+	/**
+	 * \struct CallbackEntry
+	 * \brief Represents a registered event handler callback.
+	 */
+	struct CallbackEntry {
+		std::unique_ptr<IEventHandlerWrapper> callback; ///< The callback function wrapper.
+		event_channel_t channel = CHANNEL_ALL; ///< The channel this callback listens to.
+		subscription_t id = -1; ///< Unique subscription ID.
+	};
+
+	//! The queue of events to be processed during dispatch.
+	std::vector<QueueEntry> events_queue;
+
+	//! A map of event type to registered callbacks.
+	std::unordered_map<std::type_index, std::vector<CallbackEntry>> subscribers;
+
+	//! Counter to generate unique subscription IDs.
+	subscription_t subscription_counter = 0;
+};
+
+} // namespace crepe
+
+#include "EventManager.hpp"
diff --git a/src/crepe/manager/EventManager.hpp b/src/crepe/manager/EventManager.hpp
new file mode 100644
index 0000000..a5f4556
--- /dev/null
+++ b/src/crepe/manager/EventManager.hpp
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "EventManager.h"
+
+namespace crepe {
+
+template <typename EventType>
+subscription_t EventManager::subscribe(const EventHandler<EventType> & callback,
+									   event_channel_t channel) {
+	subscription_counter++;
+	std::type_index event_type = typeid(EventType);
+	std::unique_ptr<EventHandlerWrapper<EventType>> handler
+		= std::make_unique<EventHandlerWrapper<EventType>>(callback);
+	std::vector<CallbackEntry> & handlers = this->subscribers[event_type];
+	handlers.emplace_back(CallbackEntry{
+		.callback = std::move(handler), .channel = channel, .id = subscription_counter});
+	return subscription_counter;
+}
+
+template <typename EventType>
+void EventManager::queue_event(const EventType & event, event_channel_t channel) {
+	static_assert(std::is_base_of<Event, EventType>::value,
+				  "EventType must derive from Event");
+	this->events_queue.push_back(QueueEntry{
+		.event = std::make_unique<EventType>(event),
+		.channel = channel,
+		.type = typeid(EventType),
+	});
+}
+
+template <typename EventType>
+void EventManager::trigger_event(const EventType & event, event_channel_t channel) {
+	this->handle_event(typeid(EventType), channel, event);
+}
+
+} // namespace crepe
diff --git a/src/crepe/manager/Manager.cpp b/src/crepe/manager/Manager.cpp
new file mode 100644
index 0000000..fe7c936
--- /dev/null
+++ b/src/crepe/manager/Manager.cpp
@@ -0,0 +1,6 @@
+#include "Manager.h"
+
+using namespace crepe;
+
+Manager::Manager(Mediator & mediator) : mediator(mediator) { }
+
diff --git a/src/crepe/manager/Manager.h b/src/crepe/manager/Manager.h
new file mode 100644
index 0000000..9adfd0b
--- /dev/null
+++ b/src/crepe/manager/Manager.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "Mediator.h"
+
+namespace crepe {
+
+class Manager {
+public:
+	Manager(Mediator & mediator);
+	virtual ~Manager() = default;
+
+protected:
+	Mediator & mediator;
+};
+
+}
+
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
new file mode 100644
index 0000000..ce35d5c
--- /dev/null
+++ b/src/crepe/manager/Mediator.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "../util/OptionalRef.h"
+
+// TODO: remove these singletons:
+#include "SaveManager.h"
+#include "EventManager.h"
+
+namespace crepe {
+
+class ComponentManager;
+class SceneManager;
+
+/**
+ * Struct to pass references to classes that would otherwise need to be singletons down to
+ * other classes within the engine hierarchy. Made to prevent constant changes to subclasses to
+ * pass specific references through dependency injection. All references on this struct
+ * *should* be explicitly checked for availability as this struct does not guarantee anything.
+ *
+ * \todo Find better solution
+ */
+struct Mediator {
+	OptionalRef<ComponentManager> component_manager;
+	OptionalRef<SceneManager> scene_manager;
+	OptionalRef<SaveManager> save_manager = SaveManager::get_instance();
+	OptionalRef<EventManager> event_manager = EventManager::get_instance();
+};
+
+}
diff --git a/src/crepe/manager/SaveManager.cpp b/src/crepe/manager/SaveManager.cpp
new file mode 100644
index 0000000..121d017
--- /dev/null
+++ b/src/crepe/manager/SaveManager.cpp
@@ -0,0 +1,173 @@
+#include "../facade/DB.h"
+#include "../util/Log.h"
+#include "../api/Config.h"
+#include "../ValueBroker.h"
+
+#include "SaveManager.h"
+
+using namespace std;
+using namespace crepe;
+
+template <>
+string SaveManager::serialize(const string & value) const noexcept {
+	return value;
+}
+template <typename T>
+string SaveManager::serialize(const T & value) const noexcept {
+	return to_string(value);
+}
+template string SaveManager::serialize(const uint8_t &) const noexcept;
+template string SaveManager::serialize(const int8_t &) const noexcept;
+template string SaveManager::serialize(const uint16_t &) const noexcept;
+template string SaveManager::serialize(const int16_t &) const noexcept;
+template string SaveManager::serialize(const uint32_t &) const noexcept;
+template string SaveManager::serialize(const int32_t &) const noexcept;
+template string SaveManager::serialize(const uint64_t &) const noexcept;
+template string SaveManager::serialize(const int64_t &) const noexcept;
+template string SaveManager::serialize(const float &) const noexcept;
+template string SaveManager::serialize(const double &) const noexcept;
+
+template <>
+uint64_t SaveManager::deserialize(const string & value) const noexcept {
+	try {
+		return stoul(value);
+	} catch (std::invalid_argument &) {
+		return 0;
+	}
+}
+template <>
+int64_t SaveManager::deserialize(const string & value) const noexcept {
+	try {
+		return stol(value);
+	} catch (std::invalid_argument &) {
+		return 0;
+	}
+}
+template <>
+float SaveManager::deserialize(const string & value) const noexcept {
+	try {
+		return stof(value);
+	} catch (std::invalid_argument &) {
+		return 0;
+	}
+	return stof(value);
+}
+template <>
+double SaveManager::deserialize(const string & value) const noexcept {
+	try {
+		return stod(value);
+	} catch (std::invalid_argument &) {
+		return 0;
+	}
+}
+template <>
+string SaveManager::deserialize(const string & value) const noexcept {
+	return value;
+}
+
+template <>
+uint8_t SaveManager::deserialize(const string & value) const noexcept {
+	return deserialize<uint64_t>(value);
+}
+template <>
+int8_t SaveManager::deserialize(const string & value) const noexcept {
+	return deserialize<int64_t>(value);
+}
+template <>
+uint16_t SaveManager::deserialize(const string & value) const noexcept {
+	return deserialize<uint64_t>(value);
+}
+template <>
+int16_t SaveManager::deserialize(const string & value) const noexcept {
+	return deserialize<int64_t>(value);
+}
+template <>
+uint32_t SaveManager::deserialize(const string & value) const noexcept {
+	return deserialize<uint64_t>(value);
+}
+template <>
+int32_t SaveManager::deserialize(const string & value) const noexcept {
+	return deserialize<int64_t>(value);
+}
+
+SaveManager::SaveManager() { dbg_trace(); }
+
+SaveManager & SaveManager::get_instance() {
+	dbg_trace();
+	static SaveManager instance;
+	return instance;
+}
+
+DB & SaveManager::get_db() {
+	Config & cfg = Config::get_instance();
+	// TODO: make this path relative to XDG_DATA_HOME on Linux and whatever the
+	// default equivalent is on Windows using some third party library
+	static DB db(cfg.savemgr.location);
+	return db;
+}
+
+bool SaveManager::has(const string & key) {
+	DB & db = this->get_db();
+	return db.has(key);
+}
+
+template <>
+void SaveManager::set(const string & key, const string & value) {
+	DB & db = this->get_db();
+	db.set(key, value);
+}
+template <typename T>
+void SaveManager::set(const string & key, const T & value) {
+	DB & db = this->get_db();
+	db.set(key, std::to_string(value));
+}
+template void SaveManager::set(const string &, const uint8_t &);
+template void SaveManager::set(const string &, const int8_t &);
+template void SaveManager::set(const string &, const uint16_t &);
+template void SaveManager::set(const string &, const int16_t &);
+template void SaveManager::set(const string &, const uint32_t &);
+template void SaveManager::set(const string &, const int32_t &);
+template void SaveManager::set(const string &, const uint64_t &);
+template void SaveManager::set(const string &, const int64_t &);
+template void SaveManager::set(const string &, const float &);
+template void SaveManager::set(const string &, const double &);
+
+template <typename T>
+ValueBroker<T> SaveManager::get(const string & key, const T & default_value) {
+	if (!this->has(key)) this->set<T>(key, default_value);
+	return this->get<T>(key);
+}
+template ValueBroker<uint8_t> SaveManager::get(const string &, const uint8_t &);
+template ValueBroker<int8_t> SaveManager::get(const string &, const int8_t &);
+template ValueBroker<uint16_t> SaveManager::get(const string &, const uint16_t &);
+template ValueBroker<int16_t> SaveManager::get(const string &, const int16_t &);
+template ValueBroker<uint32_t> SaveManager::get(const string &, const uint32_t &);
+template ValueBroker<int32_t> SaveManager::get(const string &, const int32_t &);
+template ValueBroker<uint64_t> SaveManager::get(const string &, const uint64_t &);
+template ValueBroker<int64_t> SaveManager::get(const string &, const int64_t &);
+template ValueBroker<float> SaveManager::get(const string &, const float &);
+template ValueBroker<double> SaveManager::get(const string &, const double &);
+template ValueBroker<string> SaveManager::get(const string &, const string &);
+
+template <typename T>
+ValueBroker<T> SaveManager::get(const string & key) {
+	T value;
+	return {
+		[this, key](const T & target) { this->set<T>(key, target); },
+		[this, key, value]() mutable -> const T & {
+			value = this->deserialize<T>(this->get_db().get(key));
+			return value;
+		},
+	};
+}
+template ValueBroker<uint8_t> SaveManager::get(const string &);
+template ValueBroker<int8_t> SaveManager::get(const string &);
+template ValueBroker<uint16_t> SaveManager::get(const string &);
+template ValueBroker<int16_t> SaveManager::get(const string &);
+template ValueBroker<uint32_t> SaveManager::get(const string &);
+template ValueBroker<int32_t> SaveManager::get(const string &);
+template ValueBroker<uint64_t> SaveManager::get(const string &);
+template ValueBroker<int64_t> SaveManager::get(const string &);
+template ValueBroker<float> SaveManager::get(const string &);
+template ValueBroker<double> SaveManager::get(const string &);
+template ValueBroker<string> SaveManager::get(const string &);
diff --git a/src/crepe/manager/SaveManager.h b/src/crepe/manager/SaveManager.h
new file mode 100644
index 0000000..3d8c852
--- /dev/null
+++ b/src/crepe/manager/SaveManager.h
@@ -0,0 +1,114 @@
+#pragma once
+
+#include <memory>
+
+#include "../ValueBroker.h"
+
+namespace crepe {
+
+class DB;
+
+/**
+ * \brief Save data manager
+ *
+ * This class provides access to a simple key-value store that stores
+ * - integers (8-64 bit, signed or unsigned)
+ * - real numbers (float or double)
+ * - string (std::string)
+ *
+ * The underlying database is a key-value store.
+ */
+class SaveManager {
+public:
+	/**
+	 * \brief Get a read/write reference to a value and initialize it if it does not yet exist
+	 *
+	 * \param key  The value key
+	 * \param default_value  Value to initialize \c key with if it does not already exist in the
+	 * database
+	 *
+	 * \return Read/write reference to the value
+	 */
+	template <typename T>
+	ValueBroker<T> get(const std::string & key, const T & default_value);
+
+	/**
+	 * \brief Get a read/write reference to a value
+	 *
+	 * \param key  The value key
+	 *
+	 * \return Read/write reference to the value
+	 *
+	 * \note Attempting to read this value before it is initialized (i.e. set) will result in an
+	 * exception
+	 */
+	template <typename T>
+	ValueBroker<T> get(const std::string & key);
+
+	/**
+	 * \brief Set a value directly
+	 *
+	 * \param key  The value key
+	 * \param value  The value to store
+	 */
+	template <typename T>
+	void set(const std::string & key, const T & value);
+
+	/**
+	 * \brief Check if the save file has a value for this \c key
+	 *
+	 * \param key  The value key
+	 *
+	 * \returns True if the key exists, or false if it does not
+	 */
+	bool has(const std::string & key);
+
+private:
+	SaveManager();
+	virtual ~SaveManager() = default;
+
+private:
+	/**
+	 * \brief Serialize an arbitrary value to STL string
+	 *
+	 * \tparam T  Type of arbitrary value
+	 *
+	 * \returns String representation of value
+	 */
+	template <typename T>
+	std::string serialize(const T &) const noexcept;
+
+	/**
+	 * \brief Deserialize an STL string back to type \c T
+	 *
+	 * \tparam T  Type of value
+	 * \param value  Serialized value
+	 *
+	 * \returns Deserialized value
+	 */
+	template <typename T>
+	T deserialize(const std::string & value) const noexcept;
+
+public:
+	// singleton
+	static SaveManager & get_instance();
+	SaveManager(const SaveManager &) = delete;
+	SaveManager(SaveManager &&) = delete;
+	SaveManager & operator=(const SaveManager &) = delete;
+	SaveManager & operator=(SaveManager &&) = delete;
+
+private:
+	/**
+	 * \brief Create an instance of DB and return its reference
+	 *
+	 * \returns DB instance
+	 *
+	 * This function exists because DB is a facade class, which can't directly be used in the API
+	 * without workarounds
+	 *
+	 * TODO: better solution
+	 */
+	static DB & get_db();
+};
+
+} // namespace crepe
diff --git a/src/crepe/manager/SceneManager.cpp b/src/crepe/manager/SceneManager.cpp
new file mode 100644
index 0000000..50a9fbb
--- /dev/null
+++ b/src/crepe/manager/SceneManager.cpp
@@ -0,0 +1,35 @@
+#include <algorithm>
+#include <memory>
+
+#include "ComponentManager.h"
+#include "SceneManager.h"
+
+using namespace crepe;
+using namespace std;
+
+SceneManager::SceneManager(Mediator & mediator) : Manager(mediator) {
+	mediator.scene_manager = *this;
+}
+
+void SceneManager::set_next_scene(const string & name) { next_scene = name; }
+
+void SceneManager::load_next_scene() {
+	// next scene not set
+	if (this->next_scene.empty()) return;
+
+	auto it = find_if(this->scenes.begin(), this->scenes.end(),
+					  [&next_scene = this->next_scene](unique_ptr<Scene> & scene) {
+						  return scene.get()->get_name() == next_scene;
+					  });
+
+	// next scene not found
+	if (it == this->scenes.end()) return;
+	unique_ptr<Scene> & scene = *it;
+
+	// Delete all components of the current scene
+	ComponentManager & mgr = this->mediator.component_manager;
+	mgr.delete_all_components();
+
+	// Load the new scene
+	scene->load_scene();
+}
diff --git a/src/crepe/manager/SceneManager.h b/src/crepe/manager/SceneManager.h
new file mode 100644
index 0000000..e0955c2
--- /dev/null
+++ b/src/crepe/manager/SceneManager.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include "../api/Scene.h"
+
+#include "Manager.h"
+
+namespace crepe {
+
+class ComponentManager;
+
+/**
+ * \brief Manages scenes
+ *
+ * This class manages scenes. It can add new scenes and load them. It also manages the current scene
+ * and the next scene.
+ */
+class SceneManager : public Manager {
+public:
+	SceneManager(Mediator & mediator);
+
+public:
+	/**
+	 * \brief Add a new concrete scene to the scene manager
+	 *
+	 * \tparam T  Type of concrete scene
+	 */
+	template <typename T, typename... Args>
+	void add_scene(Args &&... args);
+	/**
+	 * \brief Set the next scene
+	 *
+	 * This scene will be loaded at the end of the frame
+	 *
+	 * \param name  Name of the next scene
+	 */
+	void set_next_scene(const std::string & name);
+	//! Load a new scene (if there is one)
+	void load_next_scene();
+
+private:
+	//! Vector of concrete scenes (added by add_scene())
+	std::vector<std::unique_ptr<Scene>> scenes;
+	//! Next scene to load
+	std::string next_scene;
+};
+
+} // namespace crepe
+
+#include "SceneManager.hpp"
diff --git a/src/crepe/manager/SceneManager.hpp b/src/crepe/manager/SceneManager.hpp
new file mode 100644
index 0000000..dff4e51
--- /dev/null
+++ b/src/crepe/manager/SceneManager.hpp
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "SceneManager.h"
+
+namespace crepe {
+
+template <typename T, typename... Args>
+void SceneManager::add_scene(Args &&... args) {
+	using namespace std;
+	static_assert(is_base_of<Scene, T>::value, "T must be derived from Scene");
+
+	Scene * scene = new T(std::forward<Args>(args)...);
+	unique_ptr<Scene> unique_scene(scene);
+
+	unique_scene->mediator = this->mediator;
+
+	this->scenes.emplace_back(std::move(unique_scene));
+
+	// The first scene added, is the one that will be loaded at the beginning
+	if (next_scene.empty()) {
+		next_scene = scene->get_name();
+	}
+}
+
+} // namespace crepe
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 676e485..cdeac57 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -1,10 +1,10 @@
 #include <cstdint>
 
-#include "api/Animator.h"
-#include "facade/SDLContext.h"
+#include "../api/Animator.h"
+#include "../facade/SDLContext.h"
+#include "../manager/ComponentManager.h"
 
 #include "AnimatorSystem.h"
-#include "ComponentManager.h"
 
 using namespace crepe;
 
diff --git a/src/crepe/system/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp
index 0e62a57..ebae56b 100644
--- a/src/crepe/system/ParticleSystem.cpp
+++ b/src/crepe/system/ParticleSystem.cpp
@@ -2,10 +2,10 @@
 #include <cstdlib>
 #include <ctime>
 
-#include "api/ParticleEmitter.h"
-#include "api/Transform.h"
+#include "../api/ParticleEmitter.h"
+#include "../api/Transform.h"
+#include "../manager/ComponentManager.h"
 
-#include "ComponentManager.h"
 #include "ParticleSystem.h"
 
 using namespace crepe;
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index 514a4b3..071ca21 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 
-#include "../ComponentManager.h"
+#include "../manager/ComponentManager.h"
 #include "../api/Config.h"
 #include "../api/Rigidbody.h"
 #include "../api/Transform.h"
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index ad510f5..6c65e10 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -2,11 +2,10 @@
 #include <cassert>
 #include <cmath>
 #include <functional>
-#include <iostream>
 #include <stdexcept>
 #include <vector>
 
-#include "../ComponentManager.h"
+#include "../manager/ComponentManager.h"
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 20a83f7..7ecbe78 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -1,4 +1,4 @@
-#include "../ComponentManager.h"
+#include "../manager/ComponentManager.h"
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
 
diff --git a/src/crepe/system/System.cpp b/src/crepe/system/System.cpp
index 937a423..392d920 100644
--- a/src/crepe/system/System.cpp
+++ b/src/crepe/system/System.cpp
@@ -4,4 +4,4 @@
 
 using namespace crepe;
 
-System::System(ComponentManager & mgr) : component_manager(mgr) { dbg_trace(); }
+System::System(const Mediator & mediator) : component_manager(mediator.component_manager) { dbg_trace(); }
diff --git a/src/crepe/system/System.h b/src/crepe/system/System.h
index 28ea20e..92bfd50 100644
--- a/src/crepe/system/System.h
+++ b/src/crepe/system/System.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../manager/Mediator.h"
+
 namespace crepe {
 
 class ComponentManager;
@@ -19,7 +21,7 @@ public:
 	virtual void update() = 0;
 
 public:
-	System(ComponentManager &);
+	System(const Mediator & m);
 	virtual ~System() = default;
 
 protected:
diff --git a/src/test/DBTest.cpp b/src/test/DBTest.cpp
index e80814c..99dedff 100644
--- a/src/test/DBTest.cpp
+++ b/src/test/DBTest.cpp
@@ -1,6 +1,7 @@
-#include <crepe/facade/DB.h>
 #include <gtest/gtest.h>
 
+#include <crepe/facade/DB.h>
+
 using namespace std;
 using namespace crepe;
 using namespace testing;
diff --git a/src/test/ECSTest.cpp b/src/test/ECSTest.cpp
index af9d6f2..22c4fe7 100644
--- a/src/test/ECSTest.cpp
+++ b/src/test/ECSTest.cpp
@@ -2,7 +2,7 @@
 
 #define protected public
 
-#include <crepe/ComponentManager.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Transform.h>
@@ -12,8 +12,9 @@ using namespace std;
 using namespace crepe;
 
 class ECSTest : public ::testing::Test {
+	Mediator m;
 public:
-	ComponentManager mgr{};
+	ComponentManager mgr{m};
 };
 
 TEST_F(ECSTest, createGameObject) {
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index b0e6c9c..f232027 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -1,10 +1,11 @@
-
-#include "api/Event.h"
-#include "api/EventManager.h"
-#include "api/IKeyListener.h"
-#include "api/IMouseListener.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+
+#include <crepe/api/Event.h>
+#include <crepe/manager/EventManager.h>
+#include <crepe/api/IKeyListener.h>
+#include <crepe/api/IMouseListener.h>
+
 using namespace std;
 using namespace std::chrono_literals;
 using namespace crepe;
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index 8b81e74..cf43e35 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -1,5 +1,4 @@
-#include "api/Vector2.h"
-#include <crepe/ComponentManager.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/Particle.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
@@ -16,9 +15,10 @@ using namespace std::chrono_literals;
 using namespace crepe;
 
 class ParticlesTest : public ::testing::Test {
+	Mediator m;
 public:
-	ComponentManager component_manager;
-	ParticleSystem particle_system{component_manager};
+	ComponentManager component_manager{m};
+	ParticleSystem particle_system{m};
 
 	void SetUp() override {
 		ComponentManager & mgr = this->component_manager;
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 33b6020..01b7c51 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -1,4 +1,4 @@
-#include <crepe/ComponentManager.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Rigidbody.h>
@@ -11,9 +11,10 @@ using namespace std::chrono_literals;
 using namespace crepe;
 
 class PhysicsTest : public ::testing::Test {
+	Mediator m;
 public:
-	ComponentManager component_manager;
-	PhysicsSystem system{component_manager};
+	ComponentManager component_manager{m};
+	PhysicsSystem system{m};
 
 	void SetUp() override {
 		ComponentManager & mgr = this->component_manager;
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index f37fb56..f479443 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -1,4 +1,3 @@
-#include "api/Camera.h"
 #include <functional>
 #include <gtest/gtest.h>
 #include <memory>
@@ -7,7 +6,8 @@
 #define private public
 #define protected public
 
-#include <crepe/ComponentManager.h>
+#include <crepe/api/Camera.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/Color.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Sprite.h>
@@ -20,9 +20,10 @@ using namespace crepe;
 using namespace testing;
 
 class RenderSystemTest : public Test {
+	Mediator m;
 public:
-	ComponentManager mgr{};
-	RenderSystem sys{mgr};
+	ComponentManager mgr{m};
+	RenderSystem sys{m};
 	GameObject entity1 = this->mgr.new_object("name");
 	GameObject entity2 = this->mgr.new_object("name");
 	GameObject entity3 = this->mgr.new_object("name");
diff --git a/src/test/SceneManagerTest.cpp b/src/test/SceneManagerTest.cpp
index 62b7d33..d027d89 100644
--- a/src/test/SceneManagerTest.cpp
+++ b/src/test/SceneManagerTest.cpp
@@ -1,12 +1,13 @@
-#include "types.h"
-#include <crepe/ComponentManager.h>
+#include <gtest/gtest.h>
+
+#include <crepe/types.h>
+#include <crepe/manager/SceneManager.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Scene.h>
-#include <crepe/api/SceneManager.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
-#include <gtest/gtest.h>
 
 using namespace std;
 using namespace crepe;
@@ -14,7 +15,8 @@ using namespace crepe;
 class ConcreteScene1 : public Scene {
 public:
 	void load_scene() {
-		ComponentManager & mgr = this->component_manager;
+		Mediator & mediator = this->mediator;
+		ComponentManager & mgr = mediator.component_manager;
 		GameObject object1 = mgr.new_object("scene_1", "tag_scene_1", vec2{0, 0}, 0, 1);
 		GameObject object2 = mgr.new_object("scene_1", "tag_scene_1", vec2{1, 0}, 0, 1);
 		GameObject object3 = mgr.new_object("scene_1", "tag_scene_1", vec2{2, 0}, 0, 1);
@@ -26,7 +28,8 @@ public:
 class ConcreteScene2 : public Scene {
 public:
 	void load_scene() {
-		ComponentManager & mgr = this->component_manager;
+		Mediator & mediator = this->mediator;
+		ComponentManager & mgr = mediator.component_manager;
 		GameObject object1 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 0}, 0, 1);
 		GameObject object2 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 1}, 0, 1);
 		GameObject object3 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 2}, 0, 1);
@@ -41,7 +44,8 @@ public:
 	ConcreteScene3(const string & name) : name(name) {}
 
 	void load_scene() {
-		ComponentManager & mgr = this->component_manager;
+		Mediator & mediator = this->mediator;
+		ComponentManager & mgr = mediator.component_manager;
 		GameObject object1 = mgr.new_object("scene_3", "tag_scene_3", vec2{0, 0}, 0, 1);
 	}
 
@@ -52,9 +56,10 @@ private:
 };
 
 class SceneManagerTest : public ::testing::Test {
+	Mediator m;
 public:
-	ComponentManager component_mgr{};
-	SceneManager scene_mgr{component_mgr};
+	ComponentManager component_mgr{m};
+	SceneManager scene_mgr{m};
 };
 
 TEST_F(SceneManagerTest, loadScene) {
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index 78d5061..3187ed2 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -4,10 +4,10 @@
 #define private public
 #define protected public
 
-#include <crepe/ComponentManager.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/EventManager.h>
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Event.h>
-#include <crepe/api/EventManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Script.h>
 #include <crepe/api/Vector2.h>
@@ -20,10 +20,11 @@ using namespace testing;
 class MyEvent : public Event {};
 
 class ScriptTest : public Test {
+	Mediator m;
 public:
-	ComponentManager component_manager{};
-	ScriptSystem system{component_manager};
-	EventManager & event_manager = EventManager::get_instance();
+	ComponentManager component_manager{m};
+	ScriptSystem system{m};
+	EventManager & event_manager = m.event_manager;
 
 	class MyScript : public Script {
 		// NOTE: default (private) visibility of init and update shouldn't cause
-- 
cgit v1.2.3


From 2d5721820063031b65d64b1b2b1b4797b71935af Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 30 Nov 2024 16:41:22 +0100
Subject: `make format`

---
 src/crepe/api/LoopManager.cpp          | 5 +----
 src/crepe/api/LoopManager.h            | 2 +-
 src/crepe/api/Scene.h                  | 3 ++-
 src/crepe/api/Script.cpp               | 1 -
 src/crepe/api/Script.h                 | 4 ++--
 src/crepe/manager/ComponentManager.cpp | 2 +-
 src/crepe/manager/Manager.cpp          | 3 +--
 src/crepe/manager/Manager.h            | 3 +--
 src/crepe/manager/Mediator.h           | 4 ++--
 src/crepe/manager/SaveManager.cpp      | 4 ++--
 src/crepe/system/PhysicsSystem.cpp     | 2 +-
 src/crepe/system/RenderSystem.cpp      | 2 +-
 src/crepe/system/ScriptSystem.cpp      | 2 +-
 src/test/ECSTest.cpp                   | 3 ++-
 src/test/EventTest.cpp                 | 6 ++----
 src/test/ParticleTest.cpp              | 3 ++-
 src/test/PhysicsTest.cpp               | 3 ++-
 src/test/RenderSystemTest.cpp          | 3 ++-
 src/test/SceneManagerTest.cpp          | 7 ++++---
 src/test/ScriptEventTest.cpp           | 7 +++----
 src/test/ScriptSceneTest.cpp           | 3 +--
 src/test/ScriptTest.cpp                | 3 +--
 src/test/ScriptTest.h                  | 8 +++++---
 23 files changed, 40 insertions(+), 43 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index b277185..731cfb7 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -22,9 +22,7 @@ LoopManager::LoopManager() {
 	this->load_system<ScriptSystem>();
 }
 
-void LoopManager::process_input() {
-	this->sdl_context.handle_events(this->game_running);
-}
+void LoopManager::process_input() { this->sdl_context.handle_events(this->game_running); }
 
 void LoopManager::start() {
 	this->setup();
@@ -69,4 +67,3 @@ void LoopManager::render() {
 }
 
 void LoopManager::update() {}
-
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 6ea5ccc..d8910a0 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -2,10 +2,10 @@
 
 #include <memory>
 
+#include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/SceneManager.h"
 #include "../system/System.h"
-#include "../facade/SDLContext.h"
 
 #include "LoopTimer.h"
 
diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h
index 66dad17..9f1e8ce 100644
--- a/src/crepe/api/Scene.h
+++ b/src/crepe/api/Scene.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "../util/OptionalRef.h"
 #include "../manager/Mediator.h"
+#include "../util/OptionalRef.h"
 
 namespace crepe {
 
@@ -37,6 +37,7 @@ public:
 
 	// TODO: Late references should ALWAYS be private! This is currently kept as-is so unit tests
 	// keep passing, but this reference should not be directly accessible by the user!!!
+
 protected:
 	/**
 	 * \name Late references
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index a27838e..4091fd4 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -25,4 +25,3 @@ void Script::set_next_scene(const string & name) {
 	SceneManager & mgr = mediator.scene_manager;
 	mgr.set_next_scene(name);
 }
-
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index e1f86b2..1b339b0 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -2,10 +2,10 @@
 
 #include <vector>
 
+#include "../manager/EventManager.h"
+#include "../manager/Mediator.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
-#include "../manager/Mediator.h"
-#include "../manager/EventManager.h"
 
 namespace crepe {
 
diff --git a/src/crepe/manager/ComponentManager.cpp b/src/crepe/manager/ComponentManager.cpp
index 5a96158..80cf8b4 100644
--- a/src/crepe/manager/ComponentManager.cpp
+++ b/src/crepe/manager/ComponentManager.cpp
@@ -1,6 +1,6 @@
 #include "../api/GameObject.h"
-#include "../util/Log.h"
 #include "../types.h"
+#include "../util/Log.h"
 
 #include "ComponentManager.h"
 
diff --git a/src/crepe/manager/Manager.cpp b/src/crepe/manager/Manager.cpp
index fe7c936..1182785 100644
--- a/src/crepe/manager/Manager.cpp
+++ b/src/crepe/manager/Manager.cpp
@@ -2,5 +2,4 @@
 
 using namespace crepe;
 
-Manager::Manager(Mediator & mediator) : mediator(mediator) { }
-
+Manager::Manager(Mediator & mediator) : mediator(mediator) {}
diff --git a/src/crepe/manager/Manager.h b/src/crepe/manager/Manager.h
index 9adfd0b..4f21ef4 100644
--- a/src/crepe/manager/Manager.h
+++ b/src/crepe/manager/Manager.h
@@ -13,5 +13,4 @@ protected:
 	Mediator & mediator;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index a91509e..71bd1c9 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -3,8 +3,8 @@
 #include "../util/OptionalRef.h"
 
 // TODO: remove these singletons:
-#include "SaveManager.h"
 #include "EventManager.h"
+#include "SaveManager.h"
 
 namespace crepe {
 
@@ -30,4 +30,4 @@ struct Mediator {
 	OptionalRef<EventManager> event_manager = EventManager::get_instance();
 };
 
-}
+} // namespace crepe
diff --git a/src/crepe/manager/SaveManager.cpp b/src/crepe/manager/SaveManager.cpp
index 121d017..d4ed1c1 100644
--- a/src/crepe/manager/SaveManager.cpp
+++ b/src/crepe/manager/SaveManager.cpp
@@ -1,7 +1,7 @@
+#include "../ValueBroker.h"
+#include "../api/Config.h"
 #include "../facade/DB.h"
 #include "../util/Log.h"
-#include "../api/Config.h"
-#include "../ValueBroker.h"
 
 #include "SaveManager.h"
 
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index eba9dfa..bebcf3d 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -1,10 +1,10 @@
 #include <cmath>
 
-#include "../manager/ComponentManager.h"
 #include "../api/Config.h"
 #include "../api/Rigidbody.h"
 #include "../api/Transform.h"
 #include "../api/Vector2.h"
+#include "../manager/ComponentManager.h"
 
 #include "PhysicsSystem.h"
 
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 4e97b3e..0ad685c 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -5,12 +5,12 @@
 #include <stdexcept>
 #include <vector>
 
-#include "../manager/ComponentManager.h"
 #include "../api/Camera.h"
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
+#include "../manager/ComponentManager.h"
 
 #include "RenderSystem.h"
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 2e16eb0..d6b2ca1 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -1,6 +1,6 @@
-#include "../manager/ComponentManager.h"
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
+#include "../manager/ComponentManager.h"
 
 #include "ScriptSystem.h"
 
diff --git a/src/test/ECSTest.cpp b/src/test/ECSTest.cpp
index 22c4fe7..3e6c61c 100644
--- a/src/test/ECSTest.cpp
+++ b/src/test/ECSTest.cpp
@@ -2,17 +2,18 @@
 
 #define protected public
 
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/manager/ComponentManager.h>
 
 using namespace std;
 using namespace crepe;
 
 class ECSTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager mgr{m};
 };
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index 350dd07..dccd554 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -2,9 +2,9 @@
 #include <gtest/gtest.h>
 
 #include <crepe/api/Event.h>
-#include <crepe/manager/EventManager.h>
 #include <crepe/api/IKeyListener.h>
 #include <crepe/api/IMouseListener.h>
+#include <crepe/manager/EventManager.h>
 
 using namespace std;
 using namespace std::chrono_literals;
@@ -37,9 +37,7 @@ public:
 };
 
 TEST_F(EventManagerTest, EventSubscription) {
-	EventHandler<KeyPressEvent> key_handler = [](const KeyPressEvent & e) {
-		return true;
-	};
+	EventHandler<KeyPressEvent> key_handler = [](const KeyPressEvent & e) { return true; };
 
 	// Subscribe to KeyPressEvent
 	EventManager::get_instance().subscribe<KeyPressEvent>(key_handler, 1);
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index 4e9fa4e..a659fe5 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -1,4 +1,3 @@
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/Particle.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
@@ -7,6 +6,7 @@
 #include <crepe/api/Sprite.h>
 #include <crepe/api/Texture.h>
 #include <crepe/api/Transform.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/system/ParticleSystem.h>
 #include <gtest/gtest.h>
 #include <math.h>
@@ -17,6 +17,7 @@ using namespace crepe;
 
 class ParticlesTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager component_manager{m};
 	ParticleSystem particle_system{m};
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 01b7c51..43af8e4 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -1,8 +1,8 @@
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Transform.h>
+#include <crepe/manager/ComponentManager.h>
 #include <crepe/system/PhysicsSystem.h>
 #include <gtest/gtest.h>
 
@@ -12,6 +12,7 @@ using namespace crepe;
 
 class PhysicsTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager component_manager{m};
 	PhysicsSystem system{m};
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index 3528e46..c105dcb 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -7,11 +7,11 @@
 #define protected public
 
 #include <crepe/api/Camera.h>
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/Color.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Sprite.h>
 #include <crepe/api/Texture.h>
+#include <crepe/manager/ComponentManager.h>
 
 #include <crepe/system/RenderSystem.h>
 
@@ -21,6 +21,7 @@ using namespace testing;
 
 class RenderSystemTest : public Test {
 	Mediator m;
+
 public:
 	ComponentManager mgr{m};
 	RenderSystem sys{m};
diff --git a/src/test/SceneManagerTest.cpp b/src/test/SceneManagerTest.cpp
index d027d89..9bb260c 100644
--- a/src/test/SceneManagerTest.cpp
+++ b/src/test/SceneManagerTest.cpp
@@ -1,13 +1,13 @@
 #include <gtest/gtest.h>
 
-#include <crepe/types.h>
-#include <crepe/manager/SceneManager.h>
-#include <crepe/manager/ComponentManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Scene.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/SceneManager.h>
+#include <crepe/types.h>
 
 using namespace std;
 using namespace crepe;
@@ -57,6 +57,7 @@ private:
 
 class SceneManagerTest : public ::testing::Test {
 	Mediator m;
+
 public:
 	ComponentManager component_mgr{m};
 	SceneManager scene_mgr{m};
diff --git a/src/test/ScriptEventTest.cpp b/src/test/ScriptEventTest.cpp
index 7a9abbb..5da31e7 100644
--- a/src/test/ScriptEventTest.cpp
+++ b/src/test/ScriptEventTest.cpp
@@ -4,13 +4,13 @@
 #define private public
 #define protected public
 
-#include <crepe/manager/ComponentManager.h>
-#include <crepe/manager/EventManager.h>
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Event.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Script.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/EventManager.h>
 #include <crepe/system/ScriptSystem.h>
 
 #include "ScriptTest.h"
@@ -32,7 +32,7 @@ TEST_F(ScriptEventTest, Inactive) {
 	EventManager & evmgr = this->event_manager;
 
 	unsigned event_count = 0;
-	script.subscribe<MyEvent>([&](const MyEvent &){
+	script.subscribe<MyEvent>([&](const MyEvent &) {
 		event_count++;
 		return true;
 	});
@@ -48,4 +48,3 @@ TEST_F(ScriptEventTest, Inactive) {
 	evmgr.trigger_event<MyEvent>();
 	EXPECT_EQ(1, event_count);
 }
-
diff --git a/src/test/ScriptSceneTest.cpp b/src/test/ScriptSceneTest.cpp
index f96ae8b..9ee1e52 100644
--- a/src/test/ScriptSceneTest.cpp
+++ b/src/test/ScriptSceneTest.cpp
@@ -4,8 +4,8 @@
 #define private public
 #define protected public
 
-#include <crepe/manager/SceneManager.h>
 #include "ScriptTest.h"
+#include <crepe/manager/SceneManager.h>
 
 using namespace std;
 using namespace crepe;
@@ -28,4 +28,3 @@ TEST_F(ScriptSceneTest, Inactive) {
 	script.set_next_scene(non_default_value);
 	EXPECT_EQ(non_default_value, scene_manager.next_scene);
 }
-
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index 6d0d5fb..1d2d6dd 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -1,5 +1,5 @@
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 // stupid hack to allow access to private/protected members under test
 #define private public
@@ -75,4 +75,3 @@ TEST_F(ScriptTest, UpdateInactive) {
 		system.update();
 	}
 }
-
diff --git a/src/test/ScriptTest.h b/src/test/ScriptTest.h
index 9a71ba7..1bbfdd3 100644
--- a/src/test/ScriptTest.h
+++ b/src/test/ScriptTest.h
@@ -1,22 +1,24 @@
 #pragma once
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
-#include <crepe/manager/ComponentManager.h>
-#include <crepe/system/ScriptSystem.h>
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Script.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/system/ScriptSystem.h>
 
 class ScriptTest : public testing::Test {
 protected:
 	crepe::Mediator mediator;
+
 public:
 	crepe::ComponentManager component_manager{mediator};
 	crepe::ScriptSystem system{mediator};
 
 	class MyScript : public crepe::Script {
 		// NOTE: explicitly stating `public:` is not required on actual scripts
+
 	public:
 		MOCK_METHOD(void, init, (), (override));
 		MOCK_METHOD(void, update, (), (override));
-- 
cgit v1.2.3


From c396ae5f78222a7c3547ae5e2ce719ae143acb66 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Sun, 1 Dec 2024 21:14:35 +0100
Subject: start of text component

---
 .gitignore                   |  1 +
 src/CMakeLists.txt           |  2 ++
 src/crepe/api/Button.h       |  4 ++-
 src/crepe/api/CMakeLists.txt |  3 +++
 src/crepe/api/Font.cpp       | 45 +++++++++++++++++++++++++++++++++
 src/crepe/api/Font.h         | 60 ++++++++++++++++++++++++++++++++++++++++++++
 src/crepe/api/Text.h         | 42 +++++++++++++++++++++++++++++++
 7 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 src/crepe/api/Font.cpp
 create mode 100644 src/crepe/api/Font.h
 create mode 100644 src/crepe/api/Text.h

(limited to 'src/crepe/api')

diff --git a/.gitignore b/.gitignore
index 8bfb819..b67ec97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ CTestTestfile.cmake
 _deps
 CMakeUserPresets.json
 compile.sh
+asset
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c3f29da..b0b034f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,7 @@ project(crepe C CXX)
 
 find_package(SDL2 REQUIRED)
 find_package(SDL2_image REQUIRED)
+find_package(SDL2_ttf REQUIRED)
 find_package(SoLoud REQUIRED)
 find_package(GTest REQUIRED)
 find_package(whereami REQUIRED)
@@ -24,6 +25,7 @@ target_include_directories(crepe
 target_link_libraries(crepe
 	PRIVATE soloud
 	PUBLIC SDL2
+	PUBLIC SDL_ttf
 	PUBLIC SDL2_image
 	PUBLIC ${BERKELEY_DB}
 	PUBLIC whereami
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 18f3def..0dfad5d 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "UiObject.h"
 #include <functional>
 
+#include "UiObject.h"
+
+
 namespace crepe {
 
 /**
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index aeb451d..2d86968 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -25,6 +25,7 @@ target_sources(crepe PUBLIC
 	Script.cpp
 	Button.cpp
 	UiObject.cpp
+	Font.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -62,4 +63,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Asset.h
 	Button.h
 	UiObject.h
+	Font.h
+	Text.h
 )
diff --git a/src/crepe/api/Font.cpp b/src/crepe/api/Font.cpp
new file mode 100644
index 0000000..8db4b23
--- /dev/null
+++ b/src/crepe/api/Font.cpp
@@ -0,0 +1,45 @@
+#include <SDL2/SDL_ttf.h>
+
+#include "facade/SDLContext.h"
+#include "util/Log.h"
+
+#include "Asset.h"
+#include "Font.h"
+
+using namespace crepe;
+using namespace std;
+
+Font::Font(const Asset &src, int size) : font_size(size) {
+    dbg_trace();
+    this->load(src, size);
+}
+
+Font::~Font() {
+    dbg_trace();
+    this->font.reset();
+}
+
+void Font::load(const Asset &res, int size) {
+    SDLContext &ctx = SDLContext::get_instance();
+    // Open the font using SDL's TTF_OpenFontRW, which supports loading from memory
+    SDL_RWops *rw_ops = SDL_RWFromFile(res.get_path().c_str(), "rb");
+    if (!rw_ops) {
+        // dbg_log("Failed to create RWops for font: %s", SDL_GetError());
+        return;
+    }
+
+    TTF_Font *loaded_font = TTF_OpenFontRW(rw_ops, 1, size); // 1 indicates SDL should free the RWops
+    if (!loaded_font) {
+        // dbg_log("Failed to load font from asset: %s", TTF_GetError());
+        return;
+    }
+
+    // Wrap the TTF_Font with a unique_ptr for automatic cleanup
+    this->font = unique_ptr<TTF_Font, function<void(TTF_Font *)>>(loaded_font, [](TTF_Font *f) {
+        if (f) TTF_CloseFont(f);
+    });
+}
+
+int Font::get_size() const {
+    return this->font_size;
+}
diff --git a/src/crepe/api/Font.h b/src/crepe/api/Font.h
new file mode 100644
index 0000000..012c271
--- /dev/null
+++ b/src/crepe/api/Font.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <SDL2/SDL_ttf.h>
+#include <functional>
+#include <memory>
+
+#include "Asset.h"
+
+namespace crepe {
+
+class SDLContext;
+
+/**
+ * \class Font
+ * \brief Manages font loading and text rendering properties.
+ *
+ * The Font class is responsible for loading font resources and providing a way to render text
+ * with different styles and sizes. It can be used for text rendering in the game engine.
+ */
+class Font {
+
+public:
+    /**
+     * \brief Constructs a Font from an Asset resource.
+     * \param src Asset with font data to load.
+     * \param size The point size to render the font at.
+     */
+    Font(const Asset &src, int size);
+
+    /**
+     * \brief Destroys the Font instance, freeing associated resources.
+     */
+    ~Font();
+
+    /**
+     * \brief Gets the size of the font.
+     * \return The point size of the font.
+     */
+    int get_size() const;
+
+private:
+    /**
+     * \brief Loads the font from an Asset resource.
+     * \param res The Asset resource containing the font data.
+     * \param size The point size to render the font at.
+     */
+    void load(const Asset &res, int size);
+
+private:
+    //! The font resource from the SDL_ttf library.
+    std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font;
+
+    //! The size of the font in points.
+    int font_size;
+
+    //! Grants SDLContext access to private members.
+    friend class SDLContext;
+};
+
+} // namespace crepe
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
new file mode 100644
index 0000000..6bb011c
--- /dev/null
+++ b/src/crepe/api/Text.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <string>
+
+#include "Color.h"
+#include "UiObject.h"
+#include ""
+namespace crepe {
+
+/**
+ * \class Button
+ * \brief Represents a clickable UI button, derived from the UiObject class.
+ * 
+ * This class provides functionality for a button in the UI, including toggle state,
+ * click handling, and mouse hover detection. A callback function can be provided to
+ * handle button clicks.
+ */
+class Text : public UiObject {
+public:
+	/**
+     * \brief Constructs a Button with the specified game object ID and dimensions.
+     * 
+     * \param id The unique ID of the game object associated with this button.
+     * \param width The width of the button.
+     * \param height The height of the button.
+     */
+	Text(game_object_id_t id, int width, int height);
+
+	Color color = Color{0,0,0,0};
+	std::string text = "";
+	int size = 0;
+	const std::shared_ptr<Font> sprite_image;
+public:
+	/**
+     * \brief Retrieves the maximum number of instances allowed for this button type.
+     * 
+     * \return Always returns 1, as only a single instance of this type is allowed.
+     */
+	virtual int get_instances_max() const override { return 10; }
+};
+
+} // namespace crepe
-- 
cgit v1.2.3


From 04998545f0c43e76cec9819d1a2993f58e551cab Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 3 Dec 2024 09:13:35 +0100
Subject: fix memory leak

---
 src/crepe/api/LoopManager.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
index cd6bd02..266758a 100644
--- a/src/crepe/api/LoopManager.hpp
+++ b/src/crepe/api/LoopManager.hpp
@@ -38,10 +38,10 @@ void LoopManager::load_system() {
 	static_assert(is_base_of<System, T>::value,
 				  "load_system must recieve a derivative class of System");
 
-	System * system = new T(this->mediator);
 	const type_info & type = typeid(T);
 	if (this->systems.contains(type))
 		throw runtime_error(format("LoopManager: {} is already initialized", type.name()));
+	System * system = new T(this->mediator);
 	this->systems[type] = unique_ptr<System>(system);
 }
 
-- 
cgit v1.2.3


From 7551c98ee239963ad65123132419c3c0a9cfccb3 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 3 Dec 2024 11:56:29 +0100
Subject: world units for click

---
 src/CMakeLists.txt               |  2 -
 src/crepe/api/CMakeLists.txt     |  3 --
 src/crepe/api/Font.cpp           | 45 ---------------------
 src/crepe/api/Font.h             | 60 ----------------------------
 src/crepe/api/Text.h             | 42 --------------------
 src/crepe/facade/SDLContext.cpp  | 70 ++++++++++++++++++++++++++++++++-
 src/crepe/system/InputSystem.cpp | 79 +++++++++++++++++++++----------------
 src/crepe/system/InputSystem.h   | 84 ++++++++++++++++++++++------------------
 src/test/InputTest.cpp           |  7 +++-
 9 files changed, 167 insertions(+), 225 deletions(-)
 delete mode 100644 src/crepe/api/Font.cpp
 delete mode 100644 src/crepe/api/Font.h
 delete mode 100644 src/crepe/api/Text.h

(limited to 'src/crepe/api')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b0b034f..c3f29da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,6 @@ project(crepe C CXX)
 
 find_package(SDL2 REQUIRED)
 find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
 find_package(SoLoud REQUIRED)
 find_package(GTest REQUIRED)
 find_package(whereami REQUIRED)
@@ -25,7 +24,6 @@ target_include_directories(crepe
 target_link_libraries(crepe
 	PRIVATE soloud
 	PUBLIC SDL2
-	PUBLIC SDL_ttf
 	PUBLIC SDL2_image
 	PUBLIC ${BERKELEY_DB}
 	PUBLIC whereami
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 2d86968..aeb451d 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -25,7 +25,6 @@ target_sources(crepe PUBLIC
 	Script.cpp
 	Button.cpp
 	UiObject.cpp
-	Font.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -63,6 +62,4 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Asset.h
 	Button.h
 	UiObject.h
-	Font.h
-	Text.h
 )
diff --git a/src/crepe/api/Font.cpp b/src/crepe/api/Font.cpp
deleted file mode 100644
index 8db4b23..0000000
--- a/src/crepe/api/Font.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <SDL2/SDL_ttf.h>
-
-#include "facade/SDLContext.h"
-#include "util/Log.h"
-
-#include "Asset.h"
-#include "Font.h"
-
-using namespace crepe;
-using namespace std;
-
-Font::Font(const Asset &src, int size) : font_size(size) {
-    dbg_trace();
-    this->load(src, size);
-}
-
-Font::~Font() {
-    dbg_trace();
-    this->font.reset();
-}
-
-void Font::load(const Asset &res, int size) {
-    SDLContext &ctx = SDLContext::get_instance();
-    // Open the font using SDL's TTF_OpenFontRW, which supports loading from memory
-    SDL_RWops *rw_ops = SDL_RWFromFile(res.get_path().c_str(), "rb");
-    if (!rw_ops) {
-        // dbg_log("Failed to create RWops for font: %s", SDL_GetError());
-        return;
-    }
-
-    TTF_Font *loaded_font = TTF_OpenFontRW(rw_ops, 1, size); // 1 indicates SDL should free the RWops
-    if (!loaded_font) {
-        // dbg_log("Failed to load font from asset: %s", TTF_GetError());
-        return;
-    }
-
-    // Wrap the TTF_Font with a unique_ptr for automatic cleanup
-    this->font = unique_ptr<TTF_Font, function<void(TTF_Font *)>>(loaded_font, [](TTF_Font *f) {
-        if (f) TTF_CloseFont(f);
-    });
-}
-
-int Font::get_size() const {
-    return this->font_size;
-}
diff --git a/src/crepe/api/Font.h b/src/crepe/api/Font.h
deleted file mode 100644
index 012c271..0000000
--- a/src/crepe/api/Font.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include <SDL2/SDL_ttf.h>
-#include <functional>
-#include <memory>
-
-#include "Asset.h"
-
-namespace crepe {
-
-class SDLContext;
-
-/**
- * \class Font
- * \brief Manages font loading and text rendering properties.
- *
- * The Font class is responsible for loading font resources and providing a way to render text
- * with different styles and sizes. It can be used for text rendering in the game engine.
- */
-class Font {
-
-public:
-    /**
-     * \brief Constructs a Font from an Asset resource.
-     * \param src Asset with font data to load.
-     * \param size The point size to render the font at.
-     */
-    Font(const Asset &src, int size);
-
-    /**
-     * \brief Destroys the Font instance, freeing associated resources.
-     */
-    ~Font();
-
-    /**
-     * \brief Gets the size of the font.
-     * \return The point size of the font.
-     */
-    int get_size() const;
-
-private:
-    /**
-     * \brief Loads the font from an Asset resource.
-     * \param res The Asset resource containing the font data.
-     * \param size The point size to render the font at.
-     */
-    void load(const Asset &res, int size);
-
-private:
-    //! The font resource from the SDL_ttf library.
-    std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font;
-
-    //! The size of the font in points.
-    int font_size;
-
-    //! Grants SDLContext access to private members.
-    friend class SDLContext;
-};
-
-} // namespace crepe
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
deleted file mode 100644
index 6bb011c..0000000
--- a/src/crepe/api/Text.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "Color.h"
-#include "UiObject.h"
-#include ""
-namespace crepe {
-
-/**
- * \class Button
- * \brief Represents a clickable UI button, derived from the UiObject class.
- * 
- * This class provides functionality for a button in the UI, including toggle state,
- * click handling, and mouse hover detection. A callback function can be provided to
- * handle button clicks.
- */
-class Text : public UiObject {
-public:
-	/**
-     * \brief Constructs a Button with the specified game object ID and dimensions.
-     * 
-     * \param id The unique ID of the game object associated with this button.
-     * \param width The width of the button.
-     * \param height The height of the button.
-     */
-	Text(game_object_id_t id, int width, int height);
-
-	Color color = Color{0,0,0,0};
-	std::string text = "";
-	int size = 0;
-	const std::shared_ptr<Font> sprite_image;
-public:
-	/**
-     * \brief Retrieves the maximum number of instances allowed for this button type.
-     * 
-     * \return Always returns 1, as only a single instance of this type is allowed.
-     */
-	virtual int get_instances_max() const override { return 10; }
-};
-
-} // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 9b4595e..03b0cdc 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -16,6 +16,8 @@
 #include <stdexcept>
 
 #include "../api/Camera.h"
+#include "../api/EventManager.h"
+#include "../api/Config.h"
 #include "../api/Sprite.h"
 #include "../api/Texture.h"
 #include "../util/Log.h"
@@ -213,7 +215,10 @@ MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
 	return MOUSE_BUTTON_LOOKUP_TABLE[sdl_button];
 }
 
-void SDLContext::clear_screen() { SDL_RenderClear(this->game_renderer.get()); }
+void SDLContext::clear_screen() {
+	SDL_SetRenderDrawColor(this->game_renderer.get(), 0, 0, 0, 255);
+	SDL_RenderClear(this->game_renderer.get());
+}
 void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer.get()); }
 
 SDL_Rect SDLContext::get_src_rect(const Sprite & sprite) const {
@@ -336,3 +341,66 @@ ivec2 SDLContext::get_size(const Texture & ctx) {
 }
 
 void SDLContext::delay(int ms) const { SDL_Delay(ms); }
+
+std::vector<SDLContext::EventData> SDLContext::get_events() {
+	std::vector<SDLContext::EventData> event_list;
+	SDL_Event event;
+	while (SDL_PollEvent(&event)) {
+		switch (event.type) {
+			case SDL_QUIT:
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::SHUTDOWN,
+				});
+				break;
+			case SDL_KEYDOWN:
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::KEYDOWN,
+					.key = sdl_to_keycode(event.key.keysym.scancode),
+					.key_repeat = (event.key.repeat != 0),
+				});
+				break;
+			case SDL_KEYUP:
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::KEYUP,
+					.key = sdl_to_keycode(event.key.keysym.scancode),
+				});
+				break;
+			case SDL_MOUSEBUTTONDOWN:
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::MOUSEDOWN,
+					.mouse_button = sdl_to_mousebutton(event.button.button),
+					.mouse_position = {event.button.x, event.button.y},
+				});
+				break;
+			case SDL_MOUSEBUTTONUP: {
+				int x, y;
+				SDL_GetMouseState(&x, &y);
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::MOUSEUP,
+					.mouse_button = sdl_to_mousebutton(event.button.button),
+					.mouse_position = {event.button.x, event.button.y},
+				});
+			} break;
+
+			case SDL_MOUSEMOTION: {
+				event_list.push_back(
+					EventData{.event_type = SDLContext::EventType::MOUSEMOVE,
+							  .mouse_position = {event.motion.x, event.motion.y},
+							  .rel_mouse_move = {event.motion.xrel, event.motion.yrel}});
+			} break;
+
+			case SDL_MOUSEWHEEL: {
+				event_list.push_back(EventData{
+					.event_type = SDLContext::EventType::MOUSEWHEEL,
+					.mouse_position = {event.motion.x, event.motion.y},
+					.wheel_delta = event.wheel.y,
+				});
+			} break;
+		}
+	}
+	return event_list;
+}
+void SDLContext::set_color_texture(const Texture & texture, const Color & color) {
+	SDL_SetTextureColorMod(texture.texture.get(), color.r, color.g, color.b);
+	SDL_SetTextureAlphaMod(texture.texture.get(), color.a);
+}
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index beeef87..5b220eb 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,16 +1,35 @@
-#include "ComponentManager.h"
-#include "api/Button.h"
-#include "api/EventManager.h"
+#include "../ComponentManager.h"
+#include "../api/Button.h"
+#include "../api/EventManager.h"
 
 #include "InputSystem.h"
 
 using namespace crepe;
 
+
 void InputSystem::update() {
+	ComponentManager & mgr = this->component_manager;
 	EventManager & event_mgr = EventManager::get_instance();
 	std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
+	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
+	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
 
+	// Find the active camera
+	for (Camera & cam : cameras) {
+		if (!cam.active) continue;
+		this->curr_cam_ref = cam;
+		break;
+	}
+	if (!curr_cam_ref) return;
+	Camera& current_cam = curr_cam_ref;
+	RefVector<Transform> transform_vec = mgr.get_components_by_id<Transform>(current_cam.game_object_id);
+	Transform& cam_transform = transform_vec.front().get();
+	int camera_origin_x = cam_transform.position.x + current_cam.offset.x - (current_cam.viewport_size.x / 2);
+	int camera_origin_y = cam_transform.position.y + current_cam.offset.y - (current_cam.viewport_size.y / 2);
 	for (const SDLContext::EventData & event : event_list) {
+		int world_mouse_x = event.mouse_position.first + camera_origin_x;
+		int world_mouse_y = event.mouse_position.second + camera_origin_y;
+
 		switch (event.event_type) {
 			case SDLContext::EventType::KEYDOWN:
 				event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{
@@ -25,43 +44,43 @@ void InputSystem::update() {
 				break;
 			case SDLContext::EventType::MOUSEDOWN:
 				event_mgr.queue_event<MousePressEvent>(MousePressEvent{
-					.mouse_x = event.mouse_position.first,
-					.mouse_y = event.mouse_position.second,
+					.mouse_x = world_mouse_x,
+					.mouse_y = world_mouse_y,
 					.button = event.mouse_button,
 				});
-				last_mouse_down_position = event.mouse_position;
+				last_mouse_down_position = {world_mouse_x, world_mouse_y};
 				last_mouse_button = event.mouse_button;
 				break;
 			case SDLContext::EventType::MOUSEUP: {
 				event_mgr.queue_event<MouseReleaseEvent>(MouseReleaseEvent{
-					.mouse_x = event.mouse_position.first,
-					.mouse_y = event.mouse_position.second,
+					.mouse_x = world_mouse_x,
+					.mouse_y = world_mouse_y,
 					.button = event.mouse_button,
 				});
-
-				int delta_x = event.mouse_position.first - last_mouse_down_position.first;
-				int delta_y = event.mouse_position.second - last_mouse_down_position.second;
+				//check if its a click by checking the last button down
+				int delta_x = world_mouse_x - last_mouse_down_position.first;
+				int delta_y = world_mouse_y - last_mouse_down_position.second;
 
 				if (last_mouse_button == event.mouse_button
 					&& std::abs(delta_x) <= click_tolerance
 					&& std::abs(delta_y) <= click_tolerance) {
 					event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
-						.mouse_x = event.mouse_position.first,
-						.mouse_y = event.mouse_position.second,
+						.mouse_x = world_mouse_x,
+						.mouse_y = world_mouse_y,
 						.button = event.mouse_button,
 					});
 
-					handle_click(event);
+					handle_click(event.mouse_button, world_mouse_x, world_mouse_y);
 				}
 			} break;
 			case SDLContext::EventType::MOUSEMOVE:
 				event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
-					.mouse_x = event.mouse_position.first,
-					.mouse_y = event.mouse_position.second,
+					.mouse_x = world_mouse_x,
+					.mouse_y = world_mouse_y,
 					.rel_x = event.rel_mouse_move.first,
 					.rel_y = event.rel_mouse_move.second,
 				});
-				handle_move(event);
+				handle_move(event, world_mouse_x, world_mouse_y);
 				break;
 			case SDLContext::EventType::MOUSEWHEEL:
 				event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{
@@ -79,7 +98,7 @@ void InputSystem::update() {
 	}
 }
 
-void InputSystem::handle_move(const SDLContext::EventData & event_data) {
+void InputSystem::handle_move(const SDLContext::EventData & event_data, const int& world_mouse_x, const int& world_mouse_y) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
@@ -90,19 +109,14 @@ void InputSystem::handle_move(const SDLContext::EventData & event_data) {
 		OptionalRef<Transform> transform(transform_vec.front().get());
 		if (!transform) continue;
 
-		bool was_hovering = button.hover; // Store previous hover state
-
-		// Check if the mouse is inside the button
-		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
+		bool was_hovering = button.hover;
+		if (button.active && is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
 			button.hover = true;
-
-			// Trigger the on_enter callback if the hover state just changed to true
 			if (!was_hovering && button.on_enter) {
 				button.on_enter();
 			}
 		} else {
 			button.hover = false;
-
 			// Trigger the on_exit callback if the hover state just changed to false
 			if (was_hovering && button.on_exit) {
 				button.on_exit();
@@ -111,7 +125,7 @@ void InputSystem::handle_move(const SDLContext::EventData & event_data) {
 	}
 }
 
-void InputSystem::handle_click(const SDLContext::EventData & event_data) {
+void InputSystem::handle_click(const MouseButton& mouse_button, const int& world_mouse_x, const int& world_mouse_y) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
@@ -121,18 +135,17 @@ void InputSystem::handle_click(const SDLContext::EventData & event_data) {
 			= mgr.get_components_by_id<Transform>(button.game_object_id);
 		OptionalRef<Transform> transform(transform_vec.front().get());
 
-		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
+		if (button.active && is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
 			handle_button_press(button);
 		}
 	}
 }
 
-bool InputSystem::is_mouse_inside_button(const SDLContext::EventData & event_data,
-										 const Button & button, const Transform & transform) {
-	return event_data.mouse_position.first >= transform.position.x
-		   && event_data.mouse_position.first <= transform.position.x + button.width
-		   && event_data.mouse_position.second >= transform.position.y
-		   && event_data.mouse_position.second <= transform.position.y + button.height;
+bool InputSystem::is_mouse_inside_button(const int& mouse_x, const int& mouse_y, const Button & button, const Transform & transform) {
+	return mouse_x >= transform.position.x
+		   && mouse_x <= transform.position.x + button.width
+		   && mouse_y >= transform.position.y
+		   && mouse_y <= transform.position.y + button.height;
 }
 
 void InputSystem::handle_button_press(Button & button) {
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index c6ca114..e937d01 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -8,69 +8,77 @@
 
 namespace crepe {
 
+class Camera;
 class Button;
-
 class Transform;
+
 /**
- * \class InputSystem
  * \brief Handles the processing of input events like mouse and keyboard interactions.
- * 
+ *
  * This system processes events such as mouse clicks, mouse movement, and keyboard
  * actions. It is responsible for detecting interactions with UI buttons and
  * passing the corresponding events to the registered listeners.
  */
 class InputSystem : public System {
 public:
-	using System::System;
+    using System::System;
 
-	/**
+    /**
      * \brief Updates the system, processing all input events.
      * This method processes all events and triggers corresponding actions.
      */
-	void update() override;
+    void update() override;
 
 private:
-	//! Stores the last position of the mouse when the button was pressed.
-	std::pair<int, int> last_mouse_down_position{-1, -1};
+    	//! Reference to the currently active camera.
+    	OptionalRef<Camera> curr_cam_ref;
 
-	//! Stores the last mouse button pressed.
-	MouseButton last_mouse_button = MouseButton::NONE;
+    	//! Stores the last position of the mouse when the button was pressed.
+    	std::pair<int, int> last_mouse_down_position{INFINITY, INFINITY};
 
-	//! The tolerance in game units for detecting a mouse click.
-	const int click_tolerance = 5;
+    	//! Stores the last mouse button pressed.
+    	MouseButton last_mouse_button = MouseButton::NONE;
+	//
+    	//! The tolerance in game units for detecting a mouse click.
+    	const int click_tolerance = 5;
 
 	/**
-     * \brief Handles the click event.
-     * \param eventData The event data containing information about the mouse click.
-     * 
-     * This method processes the mouse click event and triggers the corresponding button action.
-     */
-	void handle_click(const SDLContext::EventData & eventData);
+	* \brief Handles the mouse click event.
+	* \param mouse_button The mouse button involved in the click.
+	* \param world_mouse_x The X coordinate of the mouse in world space.
+	* \param world_mouse_y The Y coordinate of the mouse in world space.
+	*
+	* This method processes the mouse click event and triggers the corresponding button action.
+	*/
+	void handle_click(const MouseButton& mouse_button, const int& world_mouse_x, const int& world_mouse_y);
 
 	/**
-     * \brief Handles the mouse movement event.
-     * \param eventData The event data containing information about the mouse movement.
-     * 
-     * This method processes the mouse movement event and updates the button hover state.
-     */
-	void handle_move(const SDLContext::EventData & eventData);
+	* \brief Handles the mouse movement event.
+	* \param event_data The event data containing information about the mouse movement.
+	* \param world_mouse_x The X coordinate of the mouse in world space.
+	* \param world_mouse_y The Y coordinate of the mouse in world space.
+	*
+	* This method processes the mouse movement event and updates the button hover state.
+	*/
+	void handle_move(const SDLContext::EventData& event_data, const int& world_mouse_x, const int& world_mouse_y);
+
 	/**
-     * \brief Checks if the mouse position is inside the bounds of the button.
-     * \param eventData The event data containing the mouse position.
-     * \param button The button to check.
-     * \param transform The transform component of the button.
-     * \return True if the mouse is inside the button, false otherwise.
-     */
-	bool is_mouse_inside_button(const SDLContext::EventData & eventData, const Button & button,
-								const Transform & transform);
+	* \brief Checks if the mouse position is inside the bounds of the button.
+	* \param mouse_x The X coordinate of the mouse.
+	* \param mouse_y The Y coordinate of the mouse.
+	* \param button The button to check.
+	* \param transform The transform component of the button.
+	* \return True if the mouse is inside the button, false otherwise.
+	*/
+	bool is_mouse_inside_button(const int& mouse_x, const int& mouse_y, const Button& button, const Transform& transform);
 
 	/**
-     * \brief Handles the button press event, calling the on_click callback if necessary.
-     * \param button The button being pressed.
-     * 
-     * This method triggers the on_click action for the button when it is pressed.
-     */
-	void handle_button_press(Button & button);
+	* \brief Handles the button press event, calling the on_click callback if necessary.
+	* \param button The button being pressed.
+	*
+	* This method triggers the on_click action for the button when it is pressed.
+	*/
+	void handle_button_press(Button& button);
 };
 
 } // namespace crepe
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 4f6077b..9725836 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -12,6 +12,7 @@
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/api/Camera.h>
 #include <gmock/gmock.h>
 
 using namespace std;
@@ -26,7 +27,10 @@ public:
 	EventManager & event_manager = EventManager::get_instance();
 
 protected:
-	void SetUp() override { event_manager.clear(); }
+	void SetUp() override { 
+		event_manager.clear(); 
+		// GameObject camera = mgr.new_object<Camera>(Color{0,0,0,0},ivec2{0,0},vec2{500,500},0,vec2{0,0});
+	}
 
 	void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
 		SDL_Event event;
@@ -47,6 +51,7 @@ protected:
 		event.button.button = mouse_button;
 		SDL_PushEvent(&event);
 	}
+	GameObject camera;
 };
 
 TEST_F(InputTest, MouseDown) {
-- 
cgit v1.2.3


From db181bafbe57e8df5f1df5c0871865701ac62ecc Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 3 Dec 2024 12:39:41 +0100
Subject: make format

---
 src/crepe/api/Button.h           |  1 -
 src/crepe/facade/SDLContext.cpp  |  2 +-
 src/crepe/facade/SDLContext.h    |  5 ++---
 src/crepe/system/InputSystem.cpp | 43 ++++++++++++++++++++++------------------
 src/crepe/system/InputSystem.h   | 33 ++++++++++++++++--------------
 src/test/InputTest.cpp           | 31 ++++++++++++++++++-----------
 6 files changed, 64 insertions(+), 51 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 0dfad5d..290bb2f 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -4,7 +4,6 @@
 
 #include "UiObject.h"
 
-
 namespace crepe {
 
 /**
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 03b0cdc..a657373 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -16,8 +16,8 @@
 #include <stdexcept>
 
 #include "../api/Camera.h"
-#include "../api/EventManager.h"
 #include "../api/Config.h"
+#include "../api/EventManager.h"
 #include "../api/Sprite.h"
 #include "../api/Texture.h"
 #include "../util/Log.h"
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index a56232f..2228950 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -12,13 +12,12 @@
 #include <utility>
 
 #include "api/Camera.h"
+#include "api/Color.h"
 #include "api/Event.h"
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
-#include "api/Transform.h"
-#include "api/Camera.h"
-#include "api/Color.h"
 #include "api/Texture.h"
+#include "api/Transform.h"
 #include "types.h"
 
 namespace crepe {
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 1cd3974..0cf5af1 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -6,7 +6,6 @@
 
 using namespace crepe;
 
-
 void InputSystem::update() {
 	ComponentManager & mgr = this->component_manager;
 	EventManager & event_mgr = EventManager::get_instance();
@@ -21,11 +20,14 @@ void InputSystem::update() {
 		break;
 	}
 	if (!curr_cam_ref) return;
-	Camera& current_cam = curr_cam_ref;
-	RefVector<Transform> transform_vec = mgr.get_components_by_id<Transform>(current_cam.game_object_id);
-	Transform& cam_transform = transform_vec.front().get();
-	int camera_origin_x = cam_transform.position.x + current_cam.offset.x - (current_cam.viewport_size.x / 2);
-	int camera_origin_y = cam_transform.position.y + current_cam.offset.y - (current_cam.viewport_size.y / 2);
+	Camera & current_cam = curr_cam_ref;
+	RefVector<Transform> transform_vec
+		= mgr.get_components_by_id<Transform>(current_cam.game_object_id);
+	Transform & cam_transform = transform_vec.front().get();
+	int camera_origin_x
+		= cam_transform.position.x + current_cam.offset.x - (current_cam.viewport_size.x / 2);
+	int camera_origin_y
+		= cam_transform.position.y + current_cam.offset.y - (current_cam.viewport_size.y / 2);
 	for (const SDLContext::EventData & event : event_list) {
 		int world_mouse_x = event.mouse_position.first + camera_origin_x;
 		int world_mouse_y = event.mouse_position.second + camera_origin_y;
@@ -98,7 +100,8 @@ void InputSystem::update() {
 	}
 }
 
-void InputSystem::handle_move(const SDLContext::EventData & event_data, const int& world_mouse_x, const int& world_mouse_y) {
+void InputSystem::handle_move(const SDLContext::EventData & event_data,
+							  const int & world_mouse_x, const int & world_mouse_y) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
@@ -110,7 +113,8 @@ void InputSystem::handle_move(const SDLContext::EventData & event_data, const in
 		if (!transform) continue;
 
 		bool was_hovering = button.hover;
-		if (button.active && is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
+		if (button.active
+			&& is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
 			button.hover = true;
 			if (!was_hovering && button.on_enter) {
 				button.on_enter();
@@ -125,7 +129,8 @@ void InputSystem::handle_move(const SDLContext::EventData & event_data, const in
 	}
 }
 
-void InputSystem::handle_click(const MouseButton& mouse_button, const int& world_mouse_x, const int& world_mouse_y) {
+void InputSystem::handle_click(const MouseButton & mouse_button, const int & world_mouse_x,
+							   const int & world_mouse_y) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
@@ -135,21 +140,21 @@ void InputSystem::handle_click(const MouseButton& mouse_button, const int& world
 			= mgr.get_components_by_id<Transform>(button.game_object_id);
 		OptionalRef<Transform> transform(transform_vec.front().get());
 
-		if (button.active && is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
+		if (button.active
+			&& is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
 			handle_button_press(button);
 		}
 	}
 }
 
-bool InputSystem::is_mouse_inside_button(
-    const int& mouse_x, const int& mouse_y, 
-    const Button & button, const Transform & transform) {
-    int half_width = button.width / 2;
-    int half_height = button.height / 2;
-    return mouse_x >= transform.position.x - half_width
-        && mouse_x <= transform.position.x + half_width
-        && mouse_y >= transform.position.y - half_height
-        && mouse_y <= transform.position.y + half_height;
+bool InputSystem::is_mouse_inside_button(const int & mouse_x, const int & mouse_y,
+										 const Button & button, const Transform & transform) {
+	int half_width = button.width / 2;
+	int half_height = button.height / 2;
+	return mouse_x >= transform.position.x - half_width
+		   && mouse_x <= transform.position.x + half_width
+		   && mouse_y >= transform.position.y - half_height
+		   && mouse_y <= transform.position.y + half_height;
 }
 
 void InputSystem::handle_button_press(Button & button) {
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 4244d91..53f2c4e 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -21,26 +21,26 @@ class Transform;
  */
 class InputSystem : public System {
 public:
-    using System::System;
+	using System::System;
 
-    /**
+	/**
      * \brief Updates the system, processing all input events.
      * This method processes all events and triggers corresponding actions.
      */
-    void update() override;
+	void update() override;
 
 private:
-    	//! Reference to the currently active camera.
-    	OptionalRef<Camera> curr_cam_ref;
+	//! Reference to the currently active camera.
+	OptionalRef<Camera> curr_cam_ref;
 
-    	//! Stores the last position of the mouse when the button was pressed.
-    	std::pair<int, int> last_mouse_down_position{INFINITY, INFINITY};
+	//! Stores the last position of the mouse when the button was pressed.
+	std::pair<int, int> last_mouse_down_position{INFINITY, INFINITY};
 
-    	//! Stores the last mouse button pressed.
-    	MouseButton last_mouse_button = MouseButton::NONE;
+	//! Stores the last mouse button pressed.
+	MouseButton last_mouse_button = MouseButton::NONE;
 	//
-    	//! The tolerance in game units for detecting a mouse click.
-    	const int click_tolerance = 5;
+	//! The tolerance in game units for detecting a mouse click.
+	const int click_tolerance = 5;
 
 	/**
 	* \brief Handles the mouse click event.
@@ -50,7 +50,8 @@ private:
 	*
 	* This method processes the mouse click event and triggers the corresponding button action.
 	*/
-	void handle_click(const MouseButton& mouse_button, const int& world_mouse_x, const int& world_mouse_y);
+	void handle_click(const MouseButton & mouse_button, const int & world_mouse_x,
+					  const int & world_mouse_y);
 
 	/**
 	* \brief Handles the mouse movement event.
@@ -60,7 +61,8 @@ private:
 	*
 	* This method processes the mouse movement event and updates the button hover state.
 	*/
-	void handle_move(const SDLContext::EventData& event_data, const int& world_mouse_x, const int& world_mouse_y);
+	void handle_move(const SDLContext::EventData & event_data, const int & world_mouse_x,
+					 const int & world_mouse_y);
 
 	/**
 	* \brief Checks if the mouse position is inside the bounds of the button.
@@ -70,7 +72,8 @@ private:
 	* \param transform The transform component of the button.
 	* \return True if the mouse is inside the button, false otherwise.
 	*/
-	bool is_mouse_inside_button(const int& world_mouse_x, const int& world_mouse_y, const Button& button, const Transform& transform);
+	bool is_mouse_inside_button(const int & world_mouse_x, const int & world_mouse_y,
+								const Button & button, const Transform & transform);
 
 	/**
 	* \brief Handles the button press event, calling the on_click callback if necessary.
@@ -78,7 +81,7 @@ private:
 	*
 	* This method triggers the on_click action for the button when it is pressed.
 	*/
-	void handle_button_press(Button& button);
+	void handle_button_press(Button & button);
 };
 
 } // namespace crepe
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 790dbff..32111c0 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -8,11 +8,11 @@
 #include <SDL2/SDL_keycode.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/api/Button.h>
+#include <crepe/api/Camera.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
 #include <crepe/api/Transform.h>
 #include <crepe/api/Vector2.h>
-#include <crepe/api/Camera.h>
 #include <gmock/gmock.h>
 
 using namespace std;
@@ -26,10 +26,9 @@ public:
 
 	EventManager & event_manager = EventManager::get_instance();
 	//GameObject camera;
+
 protected:
-	void SetUp() override { 
-		event_manager.clear(); 
-	}
+	void SetUp() override { event_manager.clear(); }
 
 	void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
 		SDL_Event event;
@@ -54,7 +53,8 @@ protected:
 
 TEST_F(InputTest, MouseDown) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	bool mouse_triggered = false;
 	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
@@ -83,7 +83,8 @@ TEST_F(InputTest, MouseDown) {
 
 TEST_F(InputTest, MouseUp) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	bool function_triggered = false;
 	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
@@ -110,7 +111,8 @@ TEST_F(InputTest, MouseUp) {
 
 TEST_F(InputTest, MouseMove) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	bool function_triggered = false;
 	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
@@ -139,7 +141,8 @@ TEST_F(InputTest, MouseMove) {
 
 TEST_F(InputTest, KeyDown) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	bool function_triggered = false;
 
@@ -169,7 +172,8 @@ TEST_F(InputTest, KeyDown) {
 
 TEST_F(InputTest, KeyUp) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	bool function_triggered = false;
 	EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent & event) {
@@ -192,7 +196,8 @@ TEST_F(InputTest, KeyUp) {
 
 TEST_F(InputTest, MouseClick) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	bool on_click_triggered = false;
 	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
@@ -212,7 +217,8 @@ TEST_F(InputTest, MouseClick) {
 
 TEST_F(InputTest, testButtonClick) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
@@ -237,7 +243,8 @@ TEST_F(InputTest, testButtonClick) {
 
 TEST_F(InputTest, testButtonHover) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto& camera = obj.add_component<Camera>(Color::BLACK,ivec2{0,0},vec2{500,500},0.0,vec2{0,0});
+	auto & camera = obj.add_component<Camera>(Color::BLACK, ivec2{0, 0}, vec2{500, 500}, 0.0,
+											  vec2{0, 0});
 	camera.active = true;
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
-- 
cgit v1.2.3


From cfb67ffddb9f4bb0357c2b9df4239bfee7364c5a Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 4 Dec 2024 14:21:26 +0100
Subject: process PR feedback

---
 src/crepe/api/BehaviorScript.hpp | 10 ++++------
 src/crepe/manager/Manager.h      |  8 ++++++++
 src/crepe/system/System.h        |  5 ++---
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 6de0157..b9bb1e2 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -13,14 +13,12 @@ template <class T, typename... Args>
 BehaviorScript & BehaviorScript::set_script(Args &&... args) {
 	dbg_trace();
 	static_assert(std::is_base_of<Script, T>::value);
-	Script * s = new T(std::forward<Args>(args)...);
-	Mediator & mediator = this->mediator;
+	this->script = std::unique_ptr<Script>(new T(std::forward<Args>(args)...));
 
-	s->game_object_id = this->game_object_id;
-	s->active = this->active;
-	s->mediator = mediator;
+	this->script->game_object_id = this->game_object_id;
+	this->script->active = this->active;
+	this->script->mediator = this->mediator;
 
-	this->script = std::unique_ptr<Script>(s);
 	return *this;
 }
 
diff --git a/src/crepe/manager/Manager.h b/src/crepe/manager/Manager.h
index 4f21ef4..84d80fe 100644
--- a/src/crepe/manager/Manager.h
+++ b/src/crepe/manager/Manager.h
@@ -4,6 +4,14 @@
 
 namespace crepe {
 
+/**
+ * \brief Base manager class
+ *
+ * Managers are used for various tasks that fall outside the ECS system category. All managers
+ * are required to register themselves to the mediator passed to the constructor, and this
+ * mutable reference is saved for convenience, even though not all managers use the mediator
+ * directly.
+ */
 class Manager {
 public:
 	Manager(Mediator & mediator);
diff --git a/src/crepe/system/System.h b/src/crepe/system/System.h
index 4e7fc6d..063dfbf 100644
--- a/src/crepe/system/System.h
+++ b/src/crepe/system/System.h
@@ -9,9 +9,8 @@ class ComponentManager;
 /**
  * \brief Base ECS system class
  *
- * This class is used as the base for all system classes. Classes derived from
- * System must implement the System::update() method and copy Script::Script
- * with the `using`-syntax.
+ * This class is used as the base for all system classes. Classes derived from System must
+ * implement the System::update() method and copy Script::Script with the `using`-syntax.
  */
 class System {
 public:
-- 
cgit v1.2.3


From 9cce00687e9ee318d72fd66793d070da2424fcbc Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 4 Dec 2024 16:50:42 +0100
Subject: feedback changes

---
 src/crepe/api/Button.h           | 6 +++---
 src/crepe/system/InputSystem.cpp | 7 +++----
 src/crepe/system/InputSystem.h   | 9 +++------
 3 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 290bb2f..06d64d6 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -42,7 +42,7 @@ public:
      * This function is invoked whenever the button is clicked. It can be set to any
      * function that matches the signature `void()`.
      */
-	std::function<void()> on_click;
+	std::function<void()> on_click = nullptr;
 
 	/**
 	 * \brief Callback function to be executed when the mouse enters the button's boundaries.
@@ -50,7 +50,7 @@ public:
 	 * This function is triggered when the mouse cursor moves over the button, allowing
 	 * custom actions like visual effects, highlighting, or sound effects.
 	 */
-	std::function<void()> on_enter;
+	std::function<void()> on_enter = nullptr;
 
 	/**
 	 * \brief Callback function to be executed when the mouse exits the button's boundaries.
@@ -58,7 +58,7 @@ public:
 	 * This function is triggered when the mouse cursor moves out of the button's area,
 	 * allowing custom actions like resetting visual effects or playing exit-related effects.
 	 */
-	std::function<void()> on_exit;
+	std::function<void()> on_exit = nullptr;
 
 private:
 	friend class InputSystem;
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 72d728c..dca621e 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -11,11 +11,11 @@ void InputSystem::update() {
 	std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
-
+	OptionalRef<Camera> curr_cam_ref;
 	// Find the active camera
 	for (Camera & cam : cameras) {
 		if (!cam.active) continue;
-		this->curr_cam_ref = cam;
+		curr_cam_ref = cam;
 		break;
 	}
 	if (!curr_cam_ref) return;
@@ -123,8 +123,7 @@ void InputSystem::handle_move(const SDLContext::EventData & event_data,
 	for (Button & button : buttons) {
 		RefVector<Transform> transform_vec
 			= mgr.get_components_by_id<Transform>(button.game_object_id);
-		OptionalRef<Transform> transform(transform_vec.front().get());
-		if (!transform) continue;
+		Transform & transform(transform_vec.front().get());
 
 		bool was_hovering = button.hover;
 		if (button.active
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 53f2c4e..e65ad30 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "facade/SDLContext.h"
-#include "types.h"
-#include "util/OptionalRef.h"
+#include "../facade/SDLContext.h"
+#include "../types.h"
+#include "../util/OptionalRef.h"
 
 #include "System.h"
 
@@ -30,9 +30,6 @@ public:
 	void update() override;
 
 private:
-	//! Reference to the currently active camera.
-	OptionalRef<Camera> curr_cam_ref;
-
 	//! Stores the last position of the mouse when the button was pressed.
 	std::pair<int, int> last_mouse_down_position{INFINITY, INFINITY};
 
-- 
cgit v1.2.3


From 6454975779acb39d7d546e11855a07a952e68e5b Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 4 Dec 2024 20:12:34 +0100
Subject: loeks feedback changes

---
 src/crepe/api/Button.cpp         |  4 +--
 src/crepe/api/Button.h           | 27 ++++++----------
 src/crepe/api/Event.h            | 14 +++++---
 src/crepe/api/UiObject.cpp       |  5 ++-
 src/crepe/api/UiObject.h         | 21 ++++--------
 src/crepe/facade/SDLContext.cpp  |  3 +-
 src/crepe/facade/SDLContext.h    | 19 +++++------
 src/crepe/system/InputSystem.cpp | 70 +++++++++++++++++++++++-----------------
 src/crepe/system/InputSystem.h   | 19 +++++------
 src/example/button.cpp           |  7 +++-
 src/test/InputTest.cpp           | 10 +++---
 11 files changed, 101 insertions(+), 98 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index d325014..f179f60 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,9 +2,9 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, int width, int height, std::function<void()> on_click,
+Button::Button(game_object_id_t id, vec2 dimensions,vec2 offset, std::function<void()> on_click,
 			   bool is_toggle)
-	: UiObject(id, width, height),
+	: UIObject(id, dimensions,offset),
 	  is_toggle(is_toggle),
 	  on_click(on_click) {}
 
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 06d64d6..043cc78 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -7,25 +7,21 @@
 namespace crepe {
 
 /**
- * \class Button
  * \brief Represents a clickable UI button, derived from the UiObject class.
  * 
- * This class provides functionality for a button in the UI, including toggle state,
- * click handling, and mouse hover detection. A callback function can be provided to
- * handle button clicks.
  */
-class Button : public UiObject {
+class Button : public UIObject {
 public:
 	/**
      * \brief Constructs a Button with the specified game object ID and dimensions.
      * 
      * \param id The unique ID of the game object associated with this button.
-     * \param width The width of the button.
-     * \param height The height of the button.
+     * \param Dimensions The width and height of the UIObject
+     * \param offset The offset relative this GameObjects Transform
      * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
      * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id, int width, int height, std::function<void()> on_click,
+	Button(game_object_id_t id, vec2 dimensions,vec2 offset, std::function<void()> on_click,
 		   bool is_toggle = false);
 
 	/**
@@ -50,7 +46,7 @@ public:
 	 * This function is triggered when the mouse cursor moves over the button, allowing
 	 * custom actions like visual effects, highlighting, or sound effects.
 	 */
-	std::function<void()> on_enter = nullptr;
+	std::function<void()> on_mouse_enter = nullptr;
 
 	/**
 	 * \brief Callback function to be executed when the mouse exits the button's boundaries.
@@ -58,14 +54,15 @@ public:
 	 * This function is triggered when the mouse cursor moves out of the button's area,
 	 * allowing custom actions like resetting visual effects or playing exit-related effects.
 	 */
-	std::function<void()> on_exit = nullptr;
+	std::function<void()> on_mouse_exit = nullptr;
 
 private:
+	//! friend relation for is_pressed and hover variables
 	friend class InputSystem;
 	/**
-     * \brief Indicates whether the button is currently pressed.
+     * \brief Indicates whether the toggle button is pressed
      * 
-     * This state is true when the button is actively pressed and false otherwise.
+     *  This state indicates if the toggle button is pressed or not
      */
 	bool is_pressed = false;
 
@@ -77,12 +74,6 @@ private:
 	bool hover = false;
 
 public:
-	/**
-     * \brief Retrieves the maximum number of instances allowed for this button type.
-     * 
-     * \return Always returns 1, as only a single instance of this type is allowed.
-     */
-	virtual int get_instances_max() const override { return 1; }
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index 91a30b5..8083d7c 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -90,10 +90,12 @@ public:
 	int mouse_y = 0;
 
 	// Movement since last event in x
-	int rel_x = 0;
+	int delta_x = 0;
 
 	// Movement since last event in y
-	int rel_y = 0;
+	int delta_y = 0;
+
+	
 };
 
 /**
@@ -102,13 +104,15 @@ public:
 class MouseScrollEvent : public Event {
 public:
 	//! X-coordinate of the mouse position at the time of the event.
-	int scroll_x = 0;
+	int mouse_x = 0;
 
 	//! Y-coordinate of the mouse position at the time of the event.
-	int scroll_y = 0;
+	int mouse_y = 0;
 
 	//! scroll direction (-1 = down, 1 = up)
-	int direction = 0;
+	int scroll_direction = 0;
+	//! scroll amount in y axis (from and away from the person).
+	float scroll_delta = 0;
 };
 /**
  * \brief Event triggered during a collision between objects.
diff --git a/src/crepe/api/UiObject.cpp b/src/crepe/api/UiObject.cpp
index 7859a90..0262d31 100644
--- a/src/crepe/api/UiObject.cpp
+++ b/src/crepe/api/UiObject.cpp
@@ -2,7 +2,6 @@
 
 using namespace crepe;
 
-UiObject::UiObject(game_object_id_t id, int width, int height)
+UIObject::UIObject(game_object_id_t id, vec2 dimensions,vec2 offset)
 	: Component(id),
-	  width(width),
-	  height(height){};
+	  dimensions(dimensions),offset(offset){}
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index c056877..1130f99 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -8,26 +8,19 @@ namespace crepe {
  * @class UiObject
  * \brief Represents a UI object in the game, derived from the Component class.
  */
-class UiObject : public Component {
+class UIObject : public Component {
 public:
 	/**
      * \brief Constructs a UiObject with the specified game object ID.
      * \param id The unique ID of the game object associated with this UI object.
+	 * \param dimensions width and height of the UIObject
+	 * \param offset Offset relative to the GameObject Transform
      */
-	UiObject(game_object_id_t id, int width, int height);
+	UIObject(game_object_id_t id, vec2 dimensions,vec2 offset);
+	//! Width and height of the UIObject
+	vec2 dimensions;
+	vec2 offset;
 
-	//! The width of the UI object.
-	int width = 0;
-
-	//! The height of the UI object.
-	int height = 0;
-
-public:
-	/**
-     * \brief Retrieves the maximum number of instances allowed for this UI object type.
-     * /return Always returns 1, as only a single instance is allowed.
-     */
-	virtual int get_instances_max() const override { return 1; }
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index a657373..aba7ce7 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -393,7 +393,8 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 				event_list.push_back(EventData{
 					.event_type = SDLContext::EventType::MOUSEWHEEL,
 					.mouse_position = {event.motion.x, event.motion.y},
-					.wheel_delta = event.wheel.y,
+					.scroll_direction = event.wheel.direction,
+					.scroll_delta = event.wheel.preciseY,
 				});
 			} break;
 		}
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 2228950..bd0427a 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -62,7 +62,8 @@ public:
 		bool key_repeat = false;
 		MouseButton mouse_button = MouseButton::NONE;
 		std::pair<int, int> mouse_position = {-1, -1};
-		int wheel_delta = -1;
+		int scroll_direction = -1;
+		float scroll_delta = INFINITY;
 		std::pair<int, int> rel_mouse_move = {-1, -1};
 	};
 	/**
@@ -80,35 +81,35 @@ private:
 	//! will only use get_events
 	friend class InputSystem;
 	/**
-	 * @brief Retrieves a list of all events from the SDL context.
+	 * \brief Retrieves a list of all events from the SDL context.
 	 * 
 	 * This method retrieves all the events from the SDL context that are currently
 	 * available. It is primarily used by the InputSystem to process various
 	 * input events such as mouse clicks, mouse movements, and keyboard presses.
 	 * 
-	 * @return A vector of `SDLContext::EventData` containing the events.
+	 * \return Events that occurred since last call to `get_events()`
 	 */
 	std::vector<SDLContext::EventData> get_events();
 
 	/**
-	 * @brief Converts an SDL key code to the custom Keycode type.
+	 * \brief Converts an SDL key code to the custom Keycode type.
 	 * 
 	 * This method maps an SDL key code to the corresponding `Keycode` enum value,
 	 * which is used internally by the system to identify the keys.
 	 * 
-	 * @param sdl_key The SDL key code to convert.
-	 * @return The corresponding `Keycode` value.
+	 * \param sdl_key The SDL key code to convert.
+	 * \return The corresponding `Keycode` value or `Keycode::NONE` if the key is unrecognized.
 	 */
 	Keycode sdl_to_keycode(SDL_Keycode sdl_key);
 
 	/**
-	 * @brief Converts an SDL mouse button code to the custom MouseButton type.
+	 * \brief Converts an SDL mouse button code to the custom MouseButton type.
 	 * 
 	 * This method maps an SDL mouse button code to the corresponding `MouseButton` 
 	 * enum value, which is used internally by the system to identify mouse buttons.
 	 * 
-	 * @param sdl_button The SDL mouse button code to convert.
-	 * @return The corresponding `MouseButton` value.
+	 * \param sdl_button The SDL mouse button code to convert.
+	 * \return The corresponding `MouseButton` value or `MouseButton::NONE` if the key is unrecognized
 	 */
 	MouseButton sdl_to_mousebutton(Uint8 sdl_button);
 
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 11749e1..bbf2547 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -37,7 +37,7 @@ void InputSystem::update() {
 				|| world_mouse_x > camera_origin_x + current_cam.viewport_size.x
 				|| world_mouse_y < camera_origin_y
 				|| world_mouse_y > camera_origin_y + current_cam.viewport_size.y);
-		
+
 		switch (event.event_type) {
 			case SDLContext::EventType::KEYDOWN:
 				event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{
@@ -59,8 +59,8 @@ void InputSystem::update() {
 					.mouse_y = world_mouse_y,
 					.button = event.mouse_button,
 				});
-				last_mouse_down_position = {world_mouse_x, world_mouse_y};
-				last_mouse_button = event.mouse_button;
+				this->last_mouse_down_position = {world_mouse_x, world_mouse_y};
+				this->last_mouse_button = event.mouse_button;
 				break;
 			case SDLContext::EventType::MOUSEUP: {
 				if (!mouse_in_viewport) {
@@ -72,10 +72,10 @@ void InputSystem::update() {
 					.button = event.mouse_button,
 				});
 				//check if its a click by checking the last button down
-				int delta_x = world_mouse_x - last_mouse_down_position.first;
-				int delta_y = world_mouse_y - last_mouse_down_position.second;
+				int delta_x = world_mouse_x - this->last_mouse_down_position.x;
+				int delta_y = world_mouse_y - this->last_mouse_down_position.y;
 
-				if (last_mouse_button == event.mouse_button
+				if (this->last_mouse_button == event.mouse_button
 					&& std::abs(delta_x) <= click_tolerance
 					&& std::abs(delta_y) <= click_tolerance) {
 					event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
@@ -84,7 +84,7 @@ void InputSystem::update() {
 						.button = event.mouse_button,
 					});
 
-					handle_click(event.mouse_button, world_mouse_x, world_mouse_y);
+					this->handle_click(event.mouse_button, world_mouse_x, world_mouse_y);
 				}
 			} break;
 			case SDLContext::EventType::MOUSEMOVE:
@@ -94,16 +94,17 @@ void InputSystem::update() {
 				event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
 					.mouse_x = world_mouse_x,
 					.mouse_y = world_mouse_y,
-					.rel_x = event.rel_mouse_move.first,
-					.rel_y = event.rel_mouse_move.second,
+					.delta_x = event.rel_mouse_move.first,
+					.delta_y = event.rel_mouse_move.second,
 				});
 				handle_move(event, world_mouse_x, world_mouse_y);
 				break;
 			case SDLContext::EventType::MOUSEWHEEL:
 				event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{
-					.scroll_x = event.wheel_delta,
-					.scroll_y = 0,
-					.direction = event.wheel_delta,
+					.mouse_x = world_mouse_x,
+					.mouse_y = world_mouse_y,
+					.scroll_direction = event.scroll_direction,
+					.scroll_delta = event.scroll_delta,
 				});
 				break;
 			case SDLContext::EventType::SHUTDOWN:
@@ -115,7 +116,7 @@ void InputSystem::update() {
 	}
 }
 void InputSystem::handle_move(const SDLContext::EventData & event_data,
-							  const int & world_mouse_x, const int & world_mouse_y) {
+							  const int world_mouse_x, const int world_mouse_y) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
@@ -127,23 +128,23 @@ void InputSystem::handle_move(const SDLContext::EventData & event_data,
 
 		bool was_hovering = button.hover;
 		if (button.active
-			&& is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
+			&& this->is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
 			button.hover = true;
-			if (!was_hovering && button.on_enter) {
-				button.on_enter();
+			if (!was_hovering && button.on_mouse_enter) {
+				button.on_mouse_enter();
 			}
 		} else {
 			button.hover = false;
 			// Trigger the on_exit callback if the hover state just changed to false
-			if (was_hovering && button.on_exit) {
-				button.on_exit();
+			if (was_hovering && button.on_mouse_exit) {
+				button.on_mouse_exit();
 			}
 		}
 	}
 }
 
-void InputSystem::handle_click(const MouseButton & mouse_button, const int & world_mouse_x,
-							   const int & world_mouse_y) {
+void InputSystem::handle_click(const MouseButton & mouse_button, const int world_mouse_x,
+							   const int world_mouse_y) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
@@ -154,30 +155,39 @@ void InputSystem::handle_click(const MouseButton & mouse_button, const int & wor
 		Transform& transform(transform_vec.front().get());
 
 		if (button.active
-			&& is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
-			handle_button_press(button);
+			&& this->is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
+			this->handle_button_press(button);
 		}
 	}
 }
 
-bool InputSystem::is_mouse_inside_button(const int & mouse_x, const int & mouse_y,
-										 const Button & button, const Transform & transform) {
-	int half_width = button.width / 2;
-	int half_height = button.height / 2;
+bool InputSystem::is_mouse_inside_button(const int mouse_x, const int mouse_y,
+                                         const Button &button, const Transform &transform) {
+    int actual_x = transform.position.x + button.offset.x;
+    int actual_y = transform.position.y + button.offset.y;
 
-	return mouse_x >= transform.position.x - half_width
-		   && mouse_x <= transform.position.x + half_width
-		   && mouse_y >= transform.position.y - half_height
-		   && mouse_y <= transform.position.y + half_height;
+    int half_width = button.dimensions.x / 2;
+    int half_height = button.dimensions.y / 2;
+
+    // Check if the mouse is within the button's boundaries
+    return mouse_x >= actual_x - half_width
+           && mouse_x <= actual_x + half_width
+           && mouse_y >= actual_y - half_height
+           && mouse_y <= actual_y + half_height;
 }
 
+
 void InputSystem::handle_button_press(Button & button) {
+	//checks if the button is a toggle button
 	if (button.is_toggle) {
+		//if the toggle button is not in a pressed state and it has a on_click call the on_click
 		if (!button.is_pressed && button.on_click) {
 			button.on_click();
 		}
+		//toggle the pressed state
 		button.is_pressed = !button.is_pressed;
 	} else if (button.on_click) {
+		// if the button is not a toggle button and has a on_click call the on_click
 		button.on_click();
 	}
 }
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index e65ad30..557ba47 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -13,7 +13,7 @@ class Button;
 class Transform;
 
 /**
- * \brief Handles the processing of input events like mouse and keyboard interactions.
+ * \brief Handles the processing of input events created by SDLContext
  *
  * This system processes events such as mouse clicks, mouse movement, and keyboard
  * actions. It is responsible for detecting interactions with UI buttons and
@@ -31,14 +31,15 @@ public:
 
 private:
 	//! Stores the last position of the mouse when the button was pressed.
-	std::pair<int, int> last_mouse_down_position{INFINITY, INFINITY};
+	ivec2 last_mouse_down_position{std::numeric_limits<int>::max(), std::numeric_limits<int>::max()};
 
 	//! Stores the last mouse button pressed.
 	MouseButton last_mouse_button = MouseButton::NONE;
-	//
-	//! The tolerance in game units for detecting a mouse click.
+	
+	//! The maximum allowable distance between mouse down and mouse up to register as a click.
 	const int click_tolerance = 5;
 
+
 	/**
 	* \brief Handles the mouse click event.
 	* \param mouse_button The mouse button involved in the click.
@@ -47,8 +48,8 @@ private:
 	*
 	* This method processes the mouse click event and triggers the corresponding button action.
 	*/
-	void handle_click(const MouseButton & mouse_button, const int & world_mouse_x,
-					  const int & world_mouse_y);
+	void handle_click(const MouseButton & mouse_button, const int world_mouse_x,
+					  const int world_mouse_y);
 
 	/**
 	* \brief Handles the mouse movement event.
@@ -58,8 +59,8 @@ private:
 	*
 	* This method processes the mouse movement event and updates the button hover state.
 	*/
-	void handle_move(const SDLContext::EventData & event_data, const int & world_mouse_x,
-					 const int & world_mouse_y);
+	void handle_move(const SDLContext::EventData & event_data, const int world_mouse_x,
+					 const int world_mouse_y);
 
 	/**
 	* \brief Checks if the mouse position is inside the bounds of the button.
@@ -69,7 +70,7 @@ private:
 	* \param transform The transform component of the button.
 	* \return True if the mouse is inside the button, false otherwise.
 	*/
-	bool is_mouse_inside_button(const int & world_mouse_x, const int & world_mouse_y,
+	bool is_mouse_inside_button(const int world_mouse_x, const int world_mouse_y,
 								const Button & button, const Transform & transform);
 
 	/**
diff --git a/src/example/button.cpp b/src/example/button.cpp
index 52fa199..7efd889 100644
--- a/src/example/button.cpp
+++ b/src/example/button.cpp
@@ -34,7 +34,12 @@ int main(int argc, char * argv[]) {
 	auto & sprite2 = button_obj.add_component<Sprite>(
 		s2, Color::GREEN, Sprite::FlipSettings{false, false}, 2, 1, 100);
 	std::function<void()> on_click = [&]() { std::cout << "button clicked" << std::endl; };
-	auto & button = button_obj.add_component<Button>(100, 100, on_click, false);
+	std::function<void()> on_enter = [&]() { std::cout << "enter" << std::endl; };
+	std::function<void()> on_exit = [&]() { std::cout << "exit" << std::endl; };
+	auto & button = button_obj.add_component<Button>(vec2{100,100},vec2{0,0}, on_click, false);
+	button.on_mouse_enter = on_enter;
+	button.on_mouse_exit = on_exit;
+	button.is_toggle = true;
 	button.active = true;
 	auto start = std::chrono::steady_clock::now();
 	while (true) {
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 32111c0..f7d1059 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -119,8 +119,8 @@ TEST_F(InputTest, MouseMove) {
 		function_triggered = true;
 		EXPECT_EQ(e.mouse_x, 0);
 		EXPECT_EQ(e.mouse_y, 0);
-		EXPECT_EQ(e.rel_x, 10);
-		EXPECT_EQ(e.rel_y, 10);
+		EXPECT_EQ(e.delta_x , 10);
+		EXPECT_EQ(e.delta_y , 10);
 		return false;
 	};
 	event_manager.subscribe<MouseMoveEvent>(on_mouse_move);
@@ -223,7 +223,7 @@ TEST_F(InputTest, testButtonClick) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = button_obj.add_component<Button>(100, 100, on_click, false);
+	auto & button = button_obj.add_component<Button>(vec2{100,100},vec2{0,0}, on_click, false);
 
 	bool hover = false;
 	button.active = true;
@@ -249,10 +249,8 @@ TEST_F(InputTest, testButtonHover) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = button_obj.add_component<Button>(100, 100, on_click, false);
+	auto & button = button_obj.add_component<Button>(vec2{100,100},vec2{0,0}, on_click, false);
 	button.active = true;
-	button.width = 100;
-	button.height = 100;
 	button.is_pressed = false;
 	button.is_toggle = false;
 
-- 
cgit v1.2.3


From 66fdcffaddb0ab31d12b6b1d7892a8edaa31af65 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 4 Dec 2024 20:13:09 +0100
Subject: make format

---
 src/crepe/api/Button.cpp         |  6 +++---
 src/crepe/api/Button.h           |  2 +-
 src/crepe/api/Event.h            |  2 --
 src/crepe/api/UiObject.cpp       |  5 +++--
 src/crepe/api/UiObject.h         |  3 +--
 src/crepe/system/InputSystem.cpp | 25 +++++++++++--------------
 src/crepe/system/InputSystem.h   |  6 +++---
 src/example/button.cpp           |  3 ++-
 src/test/InputTest.cpp           | 10 ++++++----
 9 files changed, 30 insertions(+), 32 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index f179f60..b104329 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,9 +2,9 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, vec2 dimensions,vec2 offset, std::function<void()> on_click,
-			   bool is_toggle)
-	: UIObject(id, dimensions,offset),
+Button::Button(game_object_id_t id, vec2 dimensions, vec2 offset,
+			   std::function<void()> on_click, bool is_toggle)
+	: UIObject(id, dimensions, offset),
 	  is_toggle(is_toggle),
 	  on_click(on_click) {}
 
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 043cc78..5c803ba 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -21,7 +21,7 @@ public:
      * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
      * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id, vec2 dimensions,vec2 offset, std::function<void()> on_click,
+	Button(game_object_id_t id, vec2 dimensions, vec2 offset, std::function<void()> on_click,
 		   bool is_toggle = false);
 
 	/**
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index 8083d7c..6298118 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -94,8 +94,6 @@ public:
 
 	// Movement since last event in y
 	int delta_y = 0;
-
-	
 };
 
 /**
diff --git a/src/crepe/api/UiObject.cpp b/src/crepe/api/UiObject.cpp
index 0262d31..2b287b3 100644
--- a/src/crepe/api/UiObject.cpp
+++ b/src/crepe/api/UiObject.cpp
@@ -2,6 +2,7 @@
 
 using namespace crepe;
 
-UIObject::UIObject(game_object_id_t id, vec2 dimensions,vec2 offset)
+UIObject::UIObject(game_object_id_t id, vec2 dimensions, vec2 offset)
 	: Component(id),
-	  dimensions(dimensions),offset(offset){}
+	  dimensions(dimensions),
+	  offset(offset) {}
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
index 1130f99..0634f97 100644
--- a/src/crepe/api/UiObject.h
+++ b/src/crepe/api/UiObject.h
@@ -16,11 +16,10 @@ public:
 	 * \param dimensions width and height of the UIObject
 	 * \param offset Offset relative to the GameObject Transform
      */
-	UIObject(game_object_id_t id, vec2 dimensions,vec2 offset);
+	UIObject(game_object_id_t id, vec2 dimensions, vec2 offset);
 	//! Width and height of the UIObject
 	vec2 dimensions;
 	vec2 offset;
-
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index bbf2547..21ec24b 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -152,7 +152,7 @@ void InputSystem::handle_click(const MouseButton & mouse_button, const int world
 	for (Button & button : buttons) {
 		RefVector<Transform> transform_vec
 			= mgr.get_components_by_id<Transform>(button.game_object_id);
-		Transform& transform(transform_vec.front().get());
+		Transform & transform(transform_vec.front().get());
 
 		if (button.active
 			&& this->is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
@@ -162,20 +162,17 @@ void InputSystem::handle_click(const MouseButton & mouse_button, const int world
 }
 
 bool InputSystem::is_mouse_inside_button(const int mouse_x, const int mouse_y,
-                                         const Button &button, const Transform &transform) {
-    int actual_x = transform.position.x + button.offset.x;
-    int actual_y = transform.position.y + button.offset.y;
-
-    int half_width = button.dimensions.x / 2;
-    int half_height = button.dimensions.y / 2;
-
-    // Check if the mouse is within the button's boundaries
-    return mouse_x >= actual_x - half_width
-           && mouse_x <= actual_x + half_width
-           && mouse_y >= actual_y - half_height
-           && mouse_y <= actual_y + half_height;
-}
+										 const Button & button, const Transform & transform) {
+	int actual_x = transform.position.x + button.offset.x;
+	int actual_y = transform.position.y + button.offset.y;
 
+	int half_width = button.dimensions.x / 2;
+	int half_height = button.dimensions.y / 2;
+
+	// Check if the mouse is within the button's boundaries
+	return mouse_x >= actual_x - half_width && mouse_x <= actual_x + half_width
+		   && mouse_y >= actual_y - half_height && mouse_y <= actual_y + half_height;
+}
 
 void InputSystem::handle_button_press(Button & button) {
 	//checks if the button is a toggle button
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 557ba47..eafeb91 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -31,15 +31,15 @@ public:
 
 private:
 	//! Stores the last position of the mouse when the button was pressed.
-	ivec2 last_mouse_down_position{std::numeric_limits<int>::max(), std::numeric_limits<int>::max()};
+	ivec2 last_mouse_down_position{std::numeric_limits<int>::max(),
+								   std::numeric_limits<int>::max()};
 
 	//! Stores the last mouse button pressed.
 	MouseButton last_mouse_button = MouseButton::NONE;
-	
+
 	//! The maximum allowable distance between mouse down and mouse up to register as a click.
 	const int click_tolerance = 5;
 
-
 	/**
 	* \brief Handles the mouse click event.
 	* \param mouse_button The mouse button involved in the click.
diff --git a/src/example/button.cpp b/src/example/button.cpp
index 7efd889..00bdc28 100644
--- a/src/example/button.cpp
+++ b/src/example/button.cpp
@@ -36,7 +36,8 @@ int main(int argc, char * argv[]) {
 	std::function<void()> on_click = [&]() { std::cout << "button clicked" << std::endl; };
 	std::function<void()> on_enter = [&]() { std::cout << "enter" << std::endl; };
 	std::function<void()> on_exit = [&]() { std::cout << "exit" << std::endl; };
-	auto & button = button_obj.add_component<Button>(vec2{100,100},vec2{0,0}, on_click, false);
+	auto & button
+		= button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0}, on_click, false);
 	button.on_mouse_enter = on_enter;
 	button.on_mouse_exit = on_exit;
 	button.is_toggle = true;
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index f7d1059..f9b2fe7 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -119,8 +119,8 @@ TEST_F(InputTest, MouseMove) {
 		function_triggered = true;
 		EXPECT_EQ(e.mouse_x, 0);
 		EXPECT_EQ(e.mouse_y, 0);
-		EXPECT_EQ(e.delta_x , 10);
-		EXPECT_EQ(e.delta_y , 10);
+		EXPECT_EQ(e.delta_x, 10);
+		EXPECT_EQ(e.delta_y, 10);
 		return false;
 	};
 	event_manager.subscribe<MouseMoveEvent>(on_mouse_move);
@@ -223,7 +223,8 @@ TEST_F(InputTest, testButtonClick) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = button_obj.add_component<Button>(vec2{100,100},vec2{0,0}, on_click, false);
+	auto & button
+		= button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0}, on_click, false);
 
 	bool hover = false;
 	button.active = true;
@@ -249,7 +250,8 @@ TEST_F(InputTest, testButtonHover) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = button_obj.add_component<Button>(vec2{100,100},vec2{0,0}, on_click, false);
+	auto & button
+		= button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0}, on_click, false);
 	button.active = true;
 	button.is_pressed = false;
 	button.is_toggle = false;
-- 
cgit v1.2.3


From d10f220ff6c5d62bb51793a0ef4ee37090161d89 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 4 Dec 2024 21:50:00 +0100
Subject: feedback changes

---
 src/crepe/api/Button.cpp         |  4 ++--
 src/crepe/api/Button.h           |  4 ++--
 src/crepe/api/CMakeLists.txt     |  4 ++--
 src/crepe/api/UIObject.cpp       |  8 ++++++++
 src/crepe/api/UIObject.h         | 26 ++++++++++++++++++++++++++
 src/crepe/api/UiObject.cpp       |  8 --------
 src/crepe/api/UiObject.h         | 25 -------------------------
 src/crepe/system/InputSystem.cpp |  6 +-----
 8 files changed, 41 insertions(+), 44 deletions(-)
 create mode 100644 src/crepe/api/UIObject.cpp
 create mode 100644 src/crepe/api/UIObject.h
 delete mode 100644 src/crepe/api/UiObject.cpp
 delete mode 100644 src/crepe/api/UiObject.h

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index b104329..313ec4c 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,8 +2,8 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, vec2 dimensions, vec2 offset,
-			   std::function<void()> on_click, bool is_toggle)
+Button::Button(game_object_id_t id, const vec2& dimensions, const vec2& offset,
+			   const std::function<void()>& on_click, bool is_toggle)
 	: UIObject(id, dimensions, offset),
 	  is_toggle(is_toggle),
 	  on_click(on_click) {}
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 5c803ba..baee71f 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "UiObject.h"
+#include "UIObject.h"
 
 namespace crepe {
 
@@ -21,7 +21,7 @@ public:
      * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
      * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id, vec2 dimensions, vec2 offset, std::function<void()> on_click,
+	Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const std::function<void()>& on_click,
 		   bool is_toggle = false);
 
 	/**
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index aeb451d..25a9439 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -24,7 +24,7 @@ target_sources(crepe PUBLIC
 	EventHandler.cpp
 	Script.cpp
 	Button.cpp
-	UiObject.cpp
+	UIObject.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -61,5 +61,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	LoopTimer.h
 	Asset.h
 	Button.h
-	UiObject.h
+	UIObject.h
 )
diff --git a/src/crepe/api/UIObject.cpp b/src/crepe/api/UIObject.cpp
new file mode 100644
index 0000000..784328a
--- /dev/null
+++ b/src/crepe/api/UIObject.cpp
@@ -0,0 +1,8 @@
+#include "UIObject.h"
+
+using namespace crepe;
+
+UIObject::UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 &offset)
+	: Component(id),
+	  dimensions(dimensions),
+	  offset(offset) {}
diff --git a/src/crepe/api/UIObject.h b/src/crepe/api/UIObject.h
new file mode 100644
index 0000000..614794d
--- /dev/null
+++ b/src/crepe/api/UIObject.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "../Component.h"
+
+namespace crepe {
+
+/**
+ * @class UiObject
+ * \brief Represents a UI object in the game, derived from the Component class.
+ */
+class UIObject : public Component {
+public:
+	/**
+     * \brief Constructs a UiObject with the specified game object ID.
+     * \param id The unique ID of the game object associated with this UI object.
+	 * \param dimensions width and height of the UIObject
+	 * \param offset Offset relative to the GameObject Transform
+     */
+	UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset);
+	//! Width and height of the UIObject
+	vec2 dimensions;
+	//! Position offset relative to this GameObjects Transform
+	vec2 offset;
+};
+
+} // namespace crepe
diff --git a/src/crepe/api/UiObject.cpp b/src/crepe/api/UiObject.cpp
deleted file mode 100644
index 2b287b3..0000000
--- a/src/crepe/api/UiObject.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "UiObject.h"
-
-using namespace crepe;
-
-UIObject::UIObject(game_object_id_t id, vec2 dimensions, vec2 offset)
-	: Component(id),
-	  dimensions(dimensions),
-	  offset(offset) {}
diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h
deleted file mode 100644
index 0634f97..0000000
--- a/src/crepe/api/UiObject.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "../Component.h"
-
-namespace crepe {
-
-/**
- * @class UiObject
- * \brief Represents a UI object in the game, derived from the Component class.
- */
-class UIObject : public Component {
-public:
-	/**
-     * \brief Constructs a UiObject with the specified game object ID.
-     * \param id The unique ID of the game object associated with this UI object.
-	 * \param dimensions width and height of the UIObject
-	 * \param offset Offset relative to the GameObject Transform
-     */
-	UIObject(game_object_id_t id, vec2 dimensions, vec2 offset);
-	//! Width and height of the UIObject
-	vec2 dimensions;
-	vec2 offset;
-};
-
-} // namespace crepe
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 8fe583f..afd71fe 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -153,7 +153,7 @@ void InputSystem::handle_click(const MouseButton & mouse_button, const int world
 	for (Button & button : buttons) {
 		RefVector<Transform> transform_vec
 			= mgr.get_components_by_id<Transform>(button.game_object_id);
-		Transform & transform(transform_vec.front().get());
+		Transform & transform = transform_vec.front().get();
 
 		if (button.active
 			&& this->is_mouse_inside_button(world_mouse_x, world_mouse_y, button, transform)) {
@@ -176,16 +176,12 @@ bool InputSystem::is_mouse_inside_button(const int mouse_x, const int mouse_y,
 }
 
 void InputSystem::handle_button_press(Button & button) {
-	//checks if the button is a toggle button
 	if (button.is_toggle) {
-		//if the toggle button is not in a pressed state and it has a on_click call the on_click
 		if (!button.is_pressed && button.on_click) {
 			button.on_click();
 		}
-		//toggle the pressed state
 		button.is_pressed = !button.is_pressed;
 	} else if (button.on_click) {
-		// if the button is not a toggle button and has a on_click call the on_click
 		button.on_click();
 	}
 }
-- 
cgit v1.2.3


From a199b953d634426b48224487b478649e3937ee10 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 4 Dec 2024 21:51:08 +0100
Subject: make format

---
 src/crepe/api/Button.cpp   | 4 ++--
 src/crepe/api/Button.h     | 4 ++--
 src/crepe/api/UIObject.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
index 313ec4c..76f74f0 100644
--- a/src/crepe/api/Button.cpp
+++ b/src/crepe/api/Button.cpp
@@ -2,8 +2,8 @@
 
 namespace crepe {
 
-Button::Button(game_object_id_t id, const vec2& dimensions, const vec2& offset,
-			   const std::function<void()>& on_click, bool is_toggle)
+Button::Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+			   const std::function<void()> & on_click, bool is_toggle)
 	: UIObject(id, dimensions, offset),
 	  is_toggle(is_toggle),
 	  on_click(on_click) {}
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index baee71f..3b5da96 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -21,8 +21,8 @@ public:
      * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
      * \param on_click callback function that will be invoked when the button is clicked.
      */
-	Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const std::function<void()>& on_click,
-		   bool is_toggle = false);
+	Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		   const std::function<void()> & on_click, bool is_toggle = false);
 
 	/**
      * \brief Indicates if the button is a toggle button (can be pressed and released).
diff --git a/src/crepe/api/UIObject.cpp b/src/crepe/api/UIObject.cpp
index 784328a..d239b89 100644
--- a/src/crepe/api/UIObject.cpp
+++ b/src/crepe/api/UIObject.cpp
@@ -2,7 +2,7 @@
 
 using namespace crepe;
 
-UIObject::UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 &offset)
+UIObject::UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset)
 	: Component(id),
 	  dimensions(dimensions),
 	  offset(offset) {}
-- 
cgit v1.2.3


From 5c7d01c49081e0127f00116a7ff174a79c6325d5 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 5 Dec 2024 13:01:55 +0100
Subject: todo

---
 src/crepe/api/Button.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 3b5da96..578f21e 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -8,7 +8,7 @@ namespace crepe {
 
 /**
  * \brief Represents a clickable UI button, derived from the UiObject class.
- * 
+ *
  */
 class Button : public UIObject {
 public:
@@ -31,7 +31,7 @@ public:
      * typically only has an on-click state.
      */
 	bool is_toggle = false;
-
+	// TODO: toggle button in new class
 	/**
      * \brief The callback function to be executed when the button is clicked.
      * 
-- 
cgit v1.2.3


From 16fda1ef8da96c44cec20225cc4427d8eec52827 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 5 Dec 2024 13:54:01 +0100
Subject: feedback changes

---
 src/crepe/api/UIObject.h         | 1 -
 src/crepe/facade/SDLContext.h    | 4 ++--
 src/crepe/system/InputSystem.cpp | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/crepe/api')

diff --git a/src/crepe/api/UIObject.h b/src/crepe/api/UIObject.h
index 614794d..c8987dc 100644
--- a/src/crepe/api/UIObject.h
+++ b/src/crepe/api/UIObject.h
@@ -5,7 +5,6 @@
 namespace crepe {
 
 /**
- * @class UiObject
  * \brief Represents a UI object in the game, derived from the Component class.
  */
 class UIObject : public Component {
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index bd0427a..a2b34c1 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -61,10 +61,10 @@ public:
 		Keycode key = Keycode::NONE;
 		bool key_repeat = false;
 		MouseButton mouse_button = MouseButton::NONE;
-		std::pair<int, int> mouse_position = {-1, -1};
+		ivec2 mouse_position = {-1, -1};
 		int scroll_direction = -1;
 		float scroll_delta = INFINITY;
-		std::pair<int, int> rel_mouse_move = {-1, -1};
+		ivec2 rel_mouse_move = {-1, -1};
 	};
 	/**
 	 * \brief Gets the singleton instance of SDLContext.
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index d24a33d..4a7f115 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -31,8 +31,8 @@ void InputSystem::update() {
 		= cam_transform.position.y + current_cam.offset.y - (current_cam.viewport_size.y / 2);
 
 	for (const SDLContext::EventData & event : event_list) {
-		int world_mouse_x = event.mouse_position.first + camera_origin_x;
-		int world_mouse_y = event.mouse_position.second + camera_origin_y;
+		int world_mouse_x = event.mouse_position.x + camera_origin_x;
+		int world_mouse_y = event.mouse_position.y + camera_origin_y;
 		// check if the mouse is within the viewport
 		bool mouse_in_viewport
 			= !(world_mouse_x < camera_origin_x
@@ -96,8 +96,8 @@ void InputSystem::update() {
 				event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
 					.mouse_x = world_mouse_x,
 					.mouse_y = world_mouse_y,
-					.delta_x = event.rel_mouse_move.first,
-					.delta_y = event.rel_mouse_move.second,
+					.delta_x = event.rel_mouse_move.x,
+					.delta_y = event.rel_mouse_move.y,
 				});
 				this->handle_move(event, world_mouse_x, world_mouse_y);
 				break;
-- 
cgit v1.2.3


From 1f4e961d7f9d6887c807cac1a362f2d178b0860b Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 5 Dec 2024 17:11:09 +0100
Subject: nitpick #55

---
 mwe/events/include/event.h      |  2 +-
 src/crepe/api/Button.h          | 56 ++++++++++++++++-----------------------
 src/crepe/api/EventHandler.h    | 58 ++++++++++++++++++++---------------------
 src/crepe/api/IKeyListener.h    | 22 ++++++++--------
 src/crepe/api/IMouseListener.h  | 42 ++++++++++++++---------------
 src/crepe/api/UIObject.h        |  6 ++---
 src/crepe/facade/SDLContext.cpp |  3 ++-
 src/crepe/system/InputSystem.h  |  7 ++---
 8 files changed, 93 insertions(+), 103 deletions(-)

(limited to 'src/crepe/api')

diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index e1b220b..ee1bf52 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -148,7 +148,7 @@ private:
 };
 class ShutDownEvent : public Event {
 public:
-	ShutDownEvent() : Event("ShutDownEvent"){};
+	ShutDownEvent() : Event("ShutDownEvent") {};
 
 	REGISTER_EVENT_TYPE(ShutDownEvent)
 
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 578f21e..26e7526 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -6,38 +6,35 @@
 
 namespace crepe {
 
-/**
- * \brief Represents a clickable UI button, derived from the UiObject class.
- *
- */
+//! Represents a clickable UI button, derived from the UiObject class.
 class Button : public UIObject {
 public:
 	/**
-     * \brief Constructs a Button with the specified game object ID and dimensions.
-     * 
-     * \param id The unique ID of the game object associated with this button.
-     * \param Dimensions The width and height of the UIObject
-     * \param offset The offset relative this GameObjects Transform
-     * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
-     * \param on_click callback function that will be invoked when the button is clicked.
-     */
+	 * \brief Constructs a Button with the specified game object ID and dimensions.
+	 * 
+	 * \param id The unique ID of the game object associated with this button.
+	 * \param dimensions The width and height of the UIObject
+	 * \param offset The offset relative this GameObjects Transform
+	 * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false.
+	 * \param on_click callback function that will be invoked when the button is clicked.
+	 */
 	Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
 		   const std::function<void()> & on_click, bool is_toggle = false);
 
 	/**
-     * \brief Indicates if the button is a toggle button (can be pressed and released).
-     * 
-     * A toggle button allows for a pressed/released state, whereas a regular button
-     * typically only has an on-click state.
-     */
+	 * \brief Indicates if the button is a toggle button (can be pressed and released).
+	 * 
+	 * A toggle button allows for a pressed/released state, whereas a regular button
+	 * typically only has an on-click state.
+	 */
 	bool is_toggle = false;
-	// TODO: toggle button in new class
+	// TODO: create separate toggle button class
 	/**
-     * \brief The callback function to be executed when the button is clicked.
-     * 
-     * This function is invoked whenever the button is clicked. It can be set to any
-     * function that matches the signature `void()`.
-     */
+	 * \brief The callback function to be executed when the button is clicked.
+	 * 
+	 * This function is invoked whenever the button is clicked. It can be set to any
+	 * function that matches the signature `void()`.
+	 */
 	std::function<void()> on_click = nullptr;
 
 	/**
@@ -59,18 +56,9 @@ public:
 private:
 	//! friend relation for is_pressed and hover variables
 	friend class InputSystem;
-	/**
-     * \brief Indicates whether the toggle button is pressed
-     * 
-     *  This state indicates if the toggle button is pressed or not
-     */
+	//! Indicates whether the toggle button is pressed
 	bool is_pressed = false;
-
-	/**
-     * \brief Indicates whether the mouse is currently hovering over the button.
-     * 
-     * This is set to true when the mouse is over the button and false otherwise.
-     */
+	//! Indicates whether the mouse is currently hovering over the button
 	bool hover = false;
 
 public:
diff --git a/src/crepe/api/EventHandler.h b/src/crepe/api/EventHandler.h
index ef659fd..7bdd9a3 100644
--- a/src/crepe/api/EventHandler.h
+++ b/src/crepe/api/EventHandler.h
@@ -29,29 +29,29 @@ using EventHandler = std::function<bool(const EventType & e)>;
 class IEventHandlerWrapper {
 public:
 	/**
-     * \brief Virtual destructor for IEventHandlerWrapper.
-     */
+	 * \brief Virtual destructor for IEventHandlerWrapper.
+	 */
 	virtual ~IEventHandlerWrapper() = default;
 
 	/**
-     * \brief Executes the handler with the given event.
-     * 
-     * This method calls the `call()` method of the derived class, passing the event to the handler.
-     * 
-     * \param e The event to be processed.
-     * \return A boolean value indicating whether the event is handled.
-     */
+	 * \brief Executes the handler with the given event.
+	 * 
+	 * This method calls the `call()` method of the derived class, passing the event to the handler.
+	 * 
+	 * \param e The event to be processed.
+	 * \return A boolean value indicating whether the event is handled.
+	 */
 	bool exec(const Event & e);
 
 private:
 	/**
-     * \brief The method responsible for handling the event.
-     * 
-     * This method is implemented by derived classes to process the event.
-     * 
-     * \param e The event to be processed.
-     * \return A boolean value indicating whether the event is handled.
-     */
+	 * \brief The method responsible for handling the event.
+	 * 
+	 * This method is implemented by derived classes to process the event.
+	 * 
+	 * \param e The event to be processed.
+	 * \return A boolean value indicating whether the event is handled.
+	 */
 	virtual bool call(const Event & e) = 0;
 };
 
@@ -69,23 +69,23 @@ template <typename EventType>
 class EventHandlerWrapper : public IEventHandlerWrapper {
 public:
 	/**
-     * \brief Constructs an EventHandlerWrapper with a given handler.
-     * 
-     * The constructor takes an event handler function and stores it in the wrapper.
-     * 
-     * \param handler The event handler function.
-     */
+	 * \brief Constructs an EventHandlerWrapper with a given handler.
+	 * 
+	 * The constructor takes an event handler function and stores it in the wrapper.
+	 * 
+	 * \param handler The event handler function.
+	 */
 	explicit EventHandlerWrapper(const EventHandler<EventType> & handler);
 
 private:
 	/**
-     * \brief Calls the stored event handler with the event.
-     * 
-     * This method casts the event to the appropriate type and calls the handler.
-     * 
-     * \param e The event to be handled.
-     * \return A boolean value indicating whether the event is handled.
-     */
+	 * \brief Calls the stored event handler with the event.
+	 * 
+	 * This method casts the event to the appropriate type and calls the handler.
+	 * 
+	 * \param e The event to be handled.
+	 * \return A boolean value indicating whether the event is handled.
+	 */
 	bool call(const Event & e) override;
 	//! The event handler function.
 	EventHandler<EventType> handler;
diff --git a/src/crepe/api/IKeyListener.h b/src/crepe/api/IKeyListener.h
index 6ded107..180a0a6 100644
--- a/src/crepe/api/IKeyListener.h
+++ b/src/crepe/api/IKeyListener.h
@@ -14,9 +14,9 @@ namespace crepe {
 class IKeyListener {
 public:
 	/**
-     * \brief Constructs an IKeyListener with a specified channel.
-     * \param channel The channel ID for event handling.
-     */
+	 * \brief Constructs an IKeyListener with a specified channel.
+	 * \param channel The channel ID for event handling.
+	 */
 	IKeyListener(event_channel_t channel = EventManager::CHANNEL_ALL);
 	virtual ~IKeyListener();
 	IKeyListener(const IKeyListener &) = delete;
@@ -25,17 +25,17 @@ public:
 	IKeyListener(IKeyListener &&) = delete;
 
 	/**
-     * \brief Pure virtual function to handle key press events.
-     * \param event The key press event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
+	 * \brief Pure virtual function to handle key press events.
+	 * \param event The key press event to handle.
+	 * \return True if the event was handled, false otherwise.
+	 */
 	virtual bool on_key_pressed(const KeyPressEvent & event) = 0;
 
 	/**
-     * \brief Pure virtual function to handle key release events.
-     * \param event The key release event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
+	 * \brief Pure virtual function to handle key release events.
+	 * \param event The key release event to handle.
+	 * \return True if the event was handled, false otherwise.
+	 */
 	virtual bool on_key_released(const KeyReleaseEvent & event) = 0;
 
 private:
diff --git a/src/crepe/api/IMouseListener.h b/src/crepe/api/IMouseListener.h
index 9e4fdf7..e19897d 100644
--- a/src/crepe/api/IMouseListener.h
+++ b/src/crepe/api/IMouseListener.h
@@ -14,9 +14,9 @@ namespace crepe {
 class IMouseListener {
 public:
 	/**
-     * \brief Constructs an IMouseListener with a specified channel.
-     * \param channel The channel ID for event handling.
-     */
+	 * \brief Constructs an IMouseListener with a specified channel.
+	 * \param channel The channel ID for event handling.
+	 */
 	IMouseListener(event_channel_t channel = EventManager::CHANNEL_ALL);
 	virtual ~IMouseListener();
 	IMouseListener & operator=(const IMouseListener &) = delete;
@@ -25,36 +25,36 @@ public:
 	IMouseListener(IMouseListener &&) = delete;
 
 	/**
-     * \brief Move assignment operator (deleted).
-     */
+	 * \brief Move assignment operator (deleted).
+	 */
 	IMouseListener & operator=(IMouseListener &&) = delete;
 
 	/**
-     * \brief Handles a mouse click event.
-     * \param event The mouse click event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
+	 * \brief Handles a mouse click event.
+	 * \param event The mouse click event to handle.
+	 * \return True if the event was handled, false otherwise.
+	 */
 	virtual bool on_mouse_clicked(const MouseClickEvent & event) = 0;
 
 	/**
-     * \brief Handles a mouse press event.
-     * \param event The mouse press event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
+	 * \brief Handles a mouse press event.
+	 * \param event The mouse press event to handle.
+	 * \return True if the event was handled, false otherwise.
+	 */
 	virtual bool on_mouse_pressed(const MousePressEvent & event) = 0;
 
 	/**
-     * \brief Handles a mouse release event.
-     * \param event The mouse release event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
+	 * \brief Handles a mouse release event.
+	 * \param event The mouse release event to handle.
+	 * \return True if the event was handled, false otherwise.
+	 */
 	virtual bool on_mouse_released(const MouseReleaseEvent & event) = 0;
 
 	/**
-     * \brief Handles a mouse move event.
-     * \param event The mouse move event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
+	 * \brief Handles a mouse move event.
+	 * \param event The mouse move event to handle.
+	 * \return True if the event was handled, false otherwise.
+	 */
 	virtual bool on_mouse_moved(const MouseMoveEvent & event) = 0;
 
 private:
diff --git a/src/crepe/api/UIObject.h b/src/crepe/api/UIObject.h
index c8987dc..f7f4fba 100644
--- a/src/crepe/api/UIObject.h
+++ b/src/crepe/api/UIObject.h
@@ -10,11 +10,11 @@ namespace crepe {
 class UIObject : public Component {
 public:
 	/**
-     * \brief Constructs a UiObject with the specified game object ID.
-     * \param id The unique ID of the game object associated with this UI object.
+	 * \brief Constructs a UiObject with the specified game object ID.
+	 * \param id The unique ID of the game object associated with this UI object.
 	 * \param dimensions width and height of the UIObject
 	 * \param offset Offset relative to the GameObject Transform
-     */
+	 */
 	UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset);
 	//! Width and height of the UIObject
 	vec2 dimensions;
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 88804ef..ad9f1f0 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -393,7 +393,8 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 				event_list.push_back(EventData{
 					.event_type = SDLContext::EventType::MOUSEWHEEL,
 					.mouse_position = {event.motion.x, event.motion.y},
-					.scroll_direction = event.wheel.direction,
+					// TODO: why is this needed?
+					.scroll_direction = event.wheel.y < 0 ? -1 : 1,
 					.scroll_delta = event.wheel.preciseY,
 				});
 			} break;
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 0c42bd6..87e86f8 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -24,14 +24,15 @@ public:
 	using System::System;
 
 	/**
-     * \brief Updates the system, processing all input events.
-     * This method processes all events and triggers corresponding actions.
-     */
+	 * \brief Updates the system, processing all input events.
+	 * This method processes all events and triggers corresponding actions.
+	 */
 	void update() override;
 
 private:
 	//! Stores the last position of the mouse when the button was pressed.
 	ivec2 last_mouse_down_position;
+	// TODO: specify world/hud space and make regular `vec2`
 
 	//! Stores the last mouse button pressed.
 	MouseButton last_mouse_button = MouseButton::NONE;
-- 
cgit v1.2.3