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
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/crepe/api/Button.cpp

(limited to 'src/crepe/api/Button.cpp')

diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp
new file mode 100644
index 0000000..e69de29
-- 
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/Button.cpp')

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 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/Button.cpp')

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/Button.cpp')

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 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/Button.cpp')

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/Button.cpp')

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/Button.cpp')

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/Button.cpp')

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 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/Button.cpp')

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/Button.cpp')

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/Button.cpp')

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/Button.cpp')

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