From 47dd27c42f375b65ee53f8b1e8c1b25327315a92 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Sun, 10 Nov 2024 21:38:58 +0100
Subject: box-box collision

---
 src/crepe/api/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/crepe/api/CMakeLists.txt')

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 87cbb09..6915074 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -18,6 +18,8 @@ target_sources(crepe PUBLIC
 	Vector2.cpp
 	Camera.cpp
 	Animator.cpp
+	BoxCollider.cpp
+	CircleCollider.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -42,4 +44,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	SceneManager.hpp
 	Camera.h
 	Animator.h
+	BoxCollider.h
+	CircleCollider.h
 )
-- 
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/CMakeLists.txt')

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/CMakeLists.txt')

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

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

(limited to 'src/crepe/api/CMakeLists.txt')

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


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

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

(limited to 'src/crepe/api/CMakeLists.txt')

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


From 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/CMakeLists.txt')

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 fdb4c99e139a264d4e15e6913a3756fc6cccb2f2 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Fri, 6 Dec 2024 20:07:24 +0100
Subject: nitpick #59

---
 src/crepe/Collider.h                 |  2 +-
 src/crepe/Component.h                |  2 +-
 src/crepe/api/Animator.cpp           |  6 ++--
 src/crepe/api/Animator.h             | 58 ++++++++------------------------
 src/crepe/api/AssetManager.h         |  6 ++--
 src/crepe/api/BoxCollider.h          |  2 +-
 src/crepe/api/Button.h               |  6 ++--
 src/crepe/api/CMakeLists.txt         |  4 +--
 src/crepe/api/CircleCollider.h       |  2 +-
 src/crepe/api/Config.h               |  5 +--
 src/crepe/api/EventHandler.h         | 34 +++++++++----------
 src/crepe/api/GameObject.h           | 12 +++----
 src/crepe/api/Metadata.h             |  2 +-
 src/crepe/api/Rigidbody.h            | 28 ++++++++--------
 src/crepe/api/Scene.h                |  4 +--
 src/crepe/api/Script.h               |  2 +-
 src/crepe/api/Sprite.h               | 38 ++++++++++-----------
 src/crepe/api/Transform.h            |  2 +-
 src/crepe/facade/SDLContext.h        | 28 ++++++++--------
 src/crepe/facade/Sound.h             |  2 +-
 src/crepe/manager/ComponentManager.h | 30 ++++++++---------
 src/crepe/manager/EventManager.h     | 28 ++++++++--------
 src/crepe/system/CollisionSystem.h   | 65 ++++++++++++++++++------------------
 src/crepe/system/ParticleSystem.h    | 10 +++---
 src/crepe/system/PhysicsSystem.h     |  4 +--
 src/crepe/system/RenderSystem.cpp    |  3 +-
 src/crepe/system/RenderSystem.h      |  8 ++---
 src/crepe/system/ScriptSystem.h      |  2 +-
 src/test/Profiling.cpp               | 25 ++++++++++----
 29 files changed, 200 insertions(+), 220 deletions(-)

(limited to 'src/crepe/api/CMakeLists.txt')

diff --git a/src/crepe/Collider.h b/src/crepe/Collider.h
index a08a68e..42ccfd4 100644
--- a/src/crepe/Collider.h
+++ b/src/crepe/Collider.h
@@ -15,7 +15,7 @@ public:
 	*
 	* The `offset` defines the positional shift applied to the collider relative to the position of the rigidbody it is attached to.
 	* This allows the collider to be placed at a different position than the rigidbody.
-	* 
+	*
 	*/
 	vec2 offset;
 };
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index dc17721..c30419d 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -8,7 +8,7 @@ class ComponentManager;
 
 /**
  * \brief Base class for all components
- * 
+ *
  * This class is the base class for all components. It provides a common interface for all
  * components.
  */
diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 154135f..b8a91dc 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -7,10 +7,10 @@
 
 using namespace crepe;
 
-Animator::Animator(uint32_t id, Sprite & ss, unsigned int max_row, unsigned int max_col,
-				   const Animator::Data & data)
+Animator::Animator(game_object_id_t id, Sprite & spritesheet, unsigned int max_row,
+				   unsigned int max_col, const Animator::Data & data)
 	: Component(id),
-	  spritesheet(ss),
+	  spritesheet(spritesheet),
 	  max_rows(max_row),
 	  max_columns(max_col),
 	  data(data) {
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 23d29f6..7c850b8 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <sys/types.h>
+#include "../types.h"
 
 #include "Component.h"
 #include "Sprite.h"
-#include "types.h"
 
 namespace crepe {
 
@@ -21,55 +20,31 @@ class SDLContext;
 class Animator : public Component {
 public:
 	struct Data {
-
 		//! frames per second for animation
 		unsigned int fps = 1;
-
 		//! The current col being animated.
 		unsigned int col = 0;
-
 		//! The current row being animated.
 		unsigned int row = 0;
-
 		//! should the animation loop
 		bool looping = false;
-
 		//! starting frame for cycling
 		unsigned int cycle_start = 0;
-
-		//! end frame for cycling (-1 --> use last frame)
+		//! end frame for cycling (-1 = use last frame)
 		int cycle_end = -1;
-
-		//! offset in pixels.
-		// TODO implement
-		unsigned int white_space = 0;
 	};
 
 public:
-	/**
-	 * \brief Animator will repeat the animation 
-	 *
-	 */
+	//! Animator will repeat the animation
 	void loop();
-
-	/**
-	 * \brief starts the animation
-	 *
-	 */
+	//! starts the animation
 	void play();
-	/**
-	 * \brief pauses the animation
-	 *
-	 * sets the active false
-	 *
-	 */
+	//! pauses the animation
 	void pause();
-
 	/**
 	 * \brief stops the animation
 	 *
 	 * sets the active on false and resets all the current rows and columns
-	 *
 	 */
 	void stop();
 	/**
@@ -81,8 +56,8 @@ public:
 	/**
 	 * \brief set the range in the row
 	 *
-	 * \param  start of row animation
-	 * \param  end of row animation	
+	 * \param start of row animation
+	 * \param end of row animation
 	 */
 	void set_cycle_range(int start, int end);
 	/**
@@ -91,11 +66,7 @@ public:
 	 * \param col animation column
 	 */
 	void set_anim(int col);
-
-	/**
-	 * \brief will go to the next animaiton of current row 
-	 *
-	 */
+	//! will go to the next animaiton of current row
 	void next_anim();
 
 public:
@@ -103,7 +74,7 @@ public:
 	 * \brief Constructs an Animator object that will control animations for a sprite sheet.
 	 *
 	 * \param id The unique identifier for the component, typically assigned automatically.
-	 * \param ss the reference to the spritesheet
+	 * \param spritesheet the reference to the spritesheet
 	 * \param max_row maximum of rows inside the given spritesheet
 	 * \param max_col maximum of columns inside the given spritesheet
 	 * \param data extra animation data for more control
@@ -111,25 +82,22 @@ public:
 	 * This constructor sets up the Animator with the given parameters, and initializes the
 	 * animation system.
 	 */
-	Animator(game_object_id_t id, Sprite & ss, unsigned int max_row, unsigned int max_col,
-			 const Animator::Data & data);
+	Animator(game_object_id_t id, Sprite & spritesheet, unsigned int max_row,
+			 unsigned int max_col, const Animator::Data & data);
 	~Animator(); // dbg_trace
 
 public:
 	//! The maximum number of columns in the sprite sheet.
 	const unsigned int max_columns;
-
 	//! The maximum number of rows in the sprite sheet.
 	const unsigned int max_rows;
-
 	Animator::Data data;
 
 private:
 	//! A reference to the Sprite sheet containing.
 	Sprite & spritesheet;
-
-	// uses the spritesheet
+	//! Uses the spritesheet
 	friend AnimatorSystem;
 };
+
 } // namespace crepe
-//
diff --git a/src/crepe/api/AssetManager.h b/src/crepe/api/AssetManager.h
index fee6780..3b1cc4b 100644
--- a/src/crepe/api/AssetManager.h
+++ b/src/crepe/api/AssetManager.h
@@ -9,7 +9,7 @@ namespace crepe {
 
 /**
  * \brief The AssetManager is responsible for storing and managing assets over multiple scenes.
- * 
+ *
  * The AssetManager ensures that assets are loaded once and can be accessed across different
  * scenes. It caches assets to avoid reloading them every time a scene is loaded. Assets are
  * retained in memory until the AssetManager is destroyed, at which point the cached assets are
@@ -46,9 +46,9 @@ public:
 	 * \param reload If true, the asset will be reloaded from the file, even if it is already
 	 * cached.
 	 * \tparam T The type of asset to cache (e.g., texture, sound, etc.).
-	 * 
+	 *
 	 * \return A shared pointer to the cached asset.
-	 * 
+	 *
 	 * This template function caches the asset at the given file path. If the asset is already
 	 * cached and `reload` is false, the existing cached version will be returned. Otherwise, the
 	 * asset will be reloaded and added to the cache.
diff --git a/src/crepe/api/BoxCollider.h b/src/crepe/api/BoxCollider.h
index 89e43d8..1ac4d46 100644
--- a/src/crepe/api/BoxCollider.h
+++ b/src/crepe/api/BoxCollider.h
@@ -8,7 +8,7 @@ namespace crepe {
 
 /**
  * \brief A class representing a box-shaped collider.
- * 
+ *
  * This class is used for collision detection with other colliders (e.g., CircleCollider).
  */
 class BoxCollider : public Collider {
diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 26e7526..61b18d7 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -11,7 +11,7 @@ class Button : public UIObject {
 public:
 	/**
 	 * \brief Constructs a Button with the specified game object ID and dimensions.
-	 * 
+	 *
 	 * \param id The unique ID of the game object associated with this button.
 	 * \param dimensions The width and height of the UIObject
 	 * \param offset The offset relative this GameObjects Transform
@@ -23,7 +23,7 @@ public:
 
 	/**
 	 * \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.
 	 */
@@ -31,7 +31,7 @@ public:
 	// TODO: create separate toggle button class
 	/**
 	 * \brief The callback function to be executed when the button is clicked.
-	 * 
+	 *
 	 * This function is invoked whenever the button is clicked. It can be set to any
 	 * function that matches the signature `void()`.
 	 */
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index b2e3df8..593c4e6 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -39,8 +39,8 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Vector2.h
 	Vector2.hpp
 	Color.h
-	Texture.h 
-	AssetManager.h 
+	Texture.h
+	AssetManager.h
 	AssetManager.hpp
 	Scene.h
 	Metadata.h
diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h
index ebd1cb2..c7bf66e 100644
--- a/src/crepe/api/CircleCollider.h
+++ b/src/crepe/api/CircleCollider.h
@@ -8,7 +8,7 @@ namespace crepe {
 
 /**
  * \brief A class representing a circle-shaped collider.
- * 
+ *
  * This class is used for collision detection with other colliders (e.g., BoxCollider).
  */
 class CircleCollider : public Collider {
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index f1bca62..a9745c3 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include <string>
+
 #include "../util/Log.h"
+
 #include "types.h"
-#include <string>
 
 namespace crepe {
 
@@ -69,7 +71,6 @@ public:
 		//! default screen size in pixels
 		ivec2 default_size = {1280, 720};
 		std::string window_title = "Jetpack joyride clone";
-
 	} window_settings;
 
 	//! Asset loading options
diff --git a/src/crepe/api/EventHandler.h b/src/crepe/api/EventHandler.h
index 7bdd9a3..7bb501b 100644
--- a/src/crepe/api/EventHandler.h
+++ b/src/crepe/api/EventHandler.h
@@ -8,12 +8,12 @@
 namespace crepe {
 /**
  * \brief A type alias for an event handler function.
- * 
- * The EventHandler is a std::function that takes an EventType reference and returns a boolean value 
+ *
+ * The EventHandler is a std::function that takes an EventType reference and returns a boolean value
  * indicating whether the event is handled.
- * 
+ *
  * \tparam EventType The type of event this handler will handle.
- * 
+ *
  * Returning \c false from an event handler results in the event being propogated to other listeners for the same event type, while returning \c true stops propogation altogether.
  */
 template <typename EventType>
@@ -22,7 +22,7 @@ using EventHandler = std::function<bool(const EventType & e)>;
 /**
  * \class IEventHandlerWrapper
  * \brief An abstract base class for event handler wrappers.
- * 
+ *
  * This class provides the interface for handling events. Derived classes must implement the
  * `call()` method to process events
  */
@@ -35,9 +35,9 @@ public:
 
 	/**
 	 * \brief Executes the handler with the given event.
-	 * 
+	 *
 	 * This method calls the `call()` method of the derived class, passing the event to the handler.
-	 * 
+	 *
 	 * \param e The event to be processed.
 	 * \return A boolean value indicating whether the event is handled.
 	 */
@@ -46,9 +46,9 @@ public:
 private:
 	/**
 	 * \brief The method responsible for handling the event.
-	 * 
+	 *
 	 * This method is implemented by derived classes to process the event.
-	 * 
+	 *
 	 * \param e The event to be processed.
 	 * \return A boolean value indicating whether the event is handled.
 	 */
@@ -58,11 +58,11 @@ private:
 /**
  * \class EventHandlerWrapper
  * \brief A wrapper for event handler functions.
- * 
- * This class wraps an event handler function of a specific event type. It implements the 
- * `call()` and `get_type()` methods to allow the handler to be executed and its type to be 
+ *
+ * This class wraps an event handler function of a specific event type. It implements the
+ * `call()` and `get_type()` methods to allow the handler to be executed and its type to be
  * queried.
- * 
+ *
  * \tparam EventType The type of event this handler will handle.
  */
 template <typename EventType>
@@ -70,9 +70,9 @@ class EventHandlerWrapper : public IEventHandlerWrapper {
 public:
 	/**
 	 * \brief Constructs an EventHandlerWrapper with a given handler.
-	 * 
+	 *
 	 * The constructor takes an event handler function and stores it in the wrapper.
-	 * 
+	 *
 	 * \param handler The event handler function.
 	 */
 	explicit EventHandlerWrapper(const EventHandler<EventType> & handler);
@@ -80,9 +80,9 @@ public:
 private:
 	/**
 	 * \brief Calls the stored event handler with the event.
-	 * 
+	 *
 	 * This method casts the event to the appropriate type and calls the handler.
-	 * 
+	 *
 	 * \param e The event to be handled.
 	 * \return A boolean value indicating whether the event is handled.
 	 */
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
index 4cd2bc0..ff80f49 100644
--- a/src/crepe/api/GameObject.h
+++ b/src/crepe/api/GameObject.h
@@ -10,7 +10,7 @@ class ComponentManager;
 
 /**
  * \brief Represents a GameObject
- * 
+ *
  * This class represents a GameObject. The GameObject class is only used as an interface for
  * the game programmer. The actual implementation is done in the ComponentManager.
  */
@@ -19,7 +19,7 @@ private:
 	/**
 	 * This constructor creates a new GameObject. It creates a new Transform and Metadata
 	 * component and adds them to the ComponentManager.
-	 * 
+	 *
 	 * \param component_manager Reference to component_manager
 	 * \param id The id of the GameObject
 	 * \param name The name of the GameObject
@@ -37,20 +37,20 @@ private:
 public:
 	/**
 	 * \brief Set the parent of this GameObject
-	 * 
+	 *
 	 * This method sets the parent of this GameObject. It sets the parent in the Metadata
 	 * component of this GameObject and adds this GameObject to the children list of the parent
 	 * GameObject.
-	 * 
+	 *
 	 * \param parent The parent GameObject
 	 */
 	void set_parent(const GameObject & parent);
 	/**
 	 * \brief Add a component to the GameObject
-	 * 
+	 *
 	 * This method adds a component to the GameObject. It forwards the arguments to the
 	 * ComponentManager.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \tparam Args The types of the arguments
 	 * \param args The arguments to create the component
diff --git a/src/crepe/api/Metadata.h b/src/crepe/api/Metadata.h
index 235d42f..f404703 100644
--- a/src/crepe/api/Metadata.h
+++ b/src/crepe/api/Metadata.h
@@ -9,7 +9,7 @@ namespace crepe {
 
 /**
  * \brief Metadata component
- * 
+ *
  * This class represents the Metadata component. It stores the name, tag, parent and children
  * of a GameObject.
  */
diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
index 8265ba5..40c6bf1 100644
--- a/src/crepe/api/Rigidbody.h
+++ b/src/crepe/api/Rigidbody.h
@@ -11,7 +11,7 @@ namespace crepe {
 
 /**
  * \brief Rigidbody class
- * 
+ *
  * This class is used by the physics sytem and collision system. It configures how to system
  * interact with the gameobject for movement and collisions.
  */
@@ -19,7 +19,7 @@ class Rigidbody : public Component {
 public:
 	/**
 	 * \brief BodyType enum
-	 * 
+	 *
 	 * This enum provides three bodytypes the physics sytem and collision system use.
 	 */
 	enum class BodyType {
@@ -32,7 +32,7 @@ public:
 	};
 	/**
 	 * \brief PhysicsConstraints to constrain movement
-	 * 
+	 *
 	 * This struct configures the movement constraint for this object. If a constraint is enabled
 	 * the systems will not move the object.
 	 */
@@ -46,9 +46,9 @@ public:
 	};
 
 public:
-	/** 
+	/**
 	 * \brief struct for Rigidbody data
-	 * 
+	 *
 	 * This struct holds the data for the Rigidbody.
 	 */
 	struct Data {
@@ -59,7 +59,7 @@ public:
 		*
 		* The `gravity_scale` controls how much gravity affects the object. It is a multiplier applied to the default
 		* gravity force, allowing for fine-grained control over how the object responds to gravity.
-		* 
+		*
 		*/
 		float gravity_scale = 0;
 
@@ -108,7 +108,7 @@ public:
 		* The `PhysicsConstraints` struct defines the constraints that restrict an object's movement
 		* in certain directions or prevent rotation. These constraints effect only the physics system
 		* to prevent the object from moving or rotating in specified ways.
-		* 
+		*
 		*/
 		PhysicsConstraints constraints;
 
@@ -128,7 +128,7 @@ public:
 		* The `offset` defines a positional shift applied to all colliders associated with the object, relative to the object's
 		* transform position. This allows for the colliders to be placed at a different position than the object's actual
 		* position, without modifying the object's transform itself.
-		* 
+		*
 		*/
 		vec2 offset;
 
@@ -136,14 +136,14 @@ public:
 		 * \brief Defines the collision layers of a GameObject.
 		 *
 		 * The `collision_layers` specifies the layers that the GameObject will collide with.
-		 * Each element represents a layer ID, and the GameObject will only detect 
+		 * Each element represents a layer ID, and the GameObject will only detect
 		 * collisions with other GameObjects that belong to these layers.
 		 */
 		std::set<int> collision_layers;
 	};
 
 public:
-	/** 
+	/**
 	 * \param game_object_id id of the gameobject the rigibody is added to.
 	 * \param data struct to configure the rigidbody.
 	 */
@@ -152,15 +152,15 @@ public:
 	Data data;
 
 public:
-	/** 
+	/**
 	 * \brief add a linear force to the Rigidbody.
-	 * 
+	 *
 	 * \param force Vector2 that is added to the linear force.
 	 */
 	void add_force_linear(const vec2 & force);
-	/** 
+	/**
 	 * \brief add a angular force to the Rigidbody.
-	 * 
+	 *
 	 * \param force Vector2 that is added to the angular force.
 	 */
 	void add_force_angular(float force);
diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h
index 9f1e8ce..ba9bb76 100644
--- a/src/crepe/api/Scene.h
+++ b/src/crepe/api/Scene.h
@@ -12,7 +12,7 @@ class ComponentManager;
 
 /**
  * \brief Represents a Scene
- * 
+ *
  * This class represents a Scene. The Scene class is only used as an interface for the game
  * programmer.
  */
@@ -41,7 +41,7 @@ public:
 protected:
 	/**
 	 * \name Late references
-	 * 
+	 *
 	 * These references are set by SceneManager immediately after calling the constructor of Scene.
 	 *
 	 * \note Scene must have a constructor without arguments so the game programmer doesn't need to
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index d1be1dc..d99ab0e 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -20,7 +20,7 @@ class ComponentManager;
  * This class is used as a base class for user-defined scripts that can be added to game
  * objects using the \c BehaviorScript component.
  *
- * \info Additional *events* (like Unity's OnDisable and OnEnable) should be implemented as
+ * \note Additional *events* (like Unity's OnDisable and OnEnable) should be implemented as
  * member or lambda methods in derivative user script classes and registered in \c init().
  *
  * \warning Concrete scripts are allowed do create a custom constructor, but the utility
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index ea8104c..dbf41e4 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -31,11 +31,10 @@ public:
 	//! Sprite data that does not have to be set in the constructor
 	struct Data {
 		/**
-		 * \color tint of the sprite 
+		 * \brief Sprite tint (multiplied)
 		 *
-		 * the default value is white because of the color multiplier.
-		 * this means that the orginal image will be shown. if color is BLACK for example
-		 * then it turns the image black because of the Color channels being 0.
+		 * The sprite texture's pixels are multiplied by this color before being displayed
+		 * (including alpha channel for transparency).
 		 */
 		Color color = Color::WHITE;
 
@@ -49,15 +48,15 @@ public:
 		const int order_in_layer = 0;
 
 		/**
-	 	* \size width and height of the sprite in game units
-	 	*
-	 	* - if height is filled in and not width it will multiply width by aspect_ratio.
-	 	* - if width is filled in and not height it will multiply height by aspect_ratio.
-	 	* - if neither is filled it will not show sprite because size will be zero
-	 	* - if both are filled will it use the width and height without making sure the aspect_ratio
-	 	* is correct
-	 	*/
-		vec2 size;
+		 * \brief width and height of the sprite in game units
+		 *
+		 * - if exclusively width is specified, the height is calculated using the texture's aspect
+		 *   ratio
+		 * - if exclusively height is specified, the width is calculated using the texture's aspect
+		 *   ratio
+		 * - if both are specified the texture is streched to fit the specified size
+		 */
+		vec2 size = {0, 0};
 
 		//! independent sprite angle. rotating clockwise direction in degrees
 		float angle_offset = 0;
@@ -71,7 +70,6 @@ public:
 
 public:
 	/**
-	 * \brief Constructs a Sprite with specified parameters.
 	 * \param game_id Unique identifier for the game object this sprite belongs to.
 	 * \param texture asset of the image
 	 * \param ctx all the sprite data
@@ -86,12 +84,12 @@ public:
 
 private:
 	/**
-	* \aspect_ratio ratio of the img
-	* 
-	*  - This will multiply one of \c size variable if it is 0.
-	*  - Will be adjusted if \c Animator component is added to an GameObject
-	*  that is why this value cannot be const. 
-	*/
+	 * \brief ratio of the img
+	 *
+	 * - This will multiply one of \c size variable if it is 0.
+	 * - Will be adjusted if \c Animator component is added to an GameObject that is why this
+	 *   value cannot be const.
+	 */
 	float aspect_ratio;
 
 	//! Reads the mask of sprite
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index 3ef0fb5..7ee6d65 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -7,7 +7,7 @@ namespace crepe {
 
 /**
  * \brief Transform component
- * 
+ *
  * This class represents the Transform component. It stores the position, rotation and scale of
  * a GameObject.
  */
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 81a8a34..e232511 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -25,7 +25,7 @@ class InputSystem;
 /**
  * \class SDLContext
  * \brief Facade for the SDL library
- * 
+ *
  * SDLContext is a singleton that handles the SDL window and renderer, provides methods for
  * event handling, and rendering to the screen. It is never used directly by the user
  */
@@ -38,16 +38,16 @@ public:
 		vec2 zoomed_viewport;
 
 		/**
-		 * \render_scale scaling factor
+		 * \brief scaling factor
 		 *
 		 * depending on the black bars type will the scaling be different.
-		 * - lettorboxing --> scaling on the y-as 
-		 * - pillarboxing --> scaling on the x-as 
+		 * - letterboxing --> scaling on the y-as
+		 * - pillarboxing --> scaling on the x-as
 		 */
 		vec2 render_scale;
 
 		/**
-		 * \bar_size size of calculated black bars
+		 * \brief size of calculated black bars
 		 *
 		 * depending on the black bars type will the size be different
 		 * - lettorboxing --> {0, bar_height}
@@ -108,21 +108,21 @@ private:
 	friend class InputSystem;
 	/**
 	 * \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 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.
-	 * 
+	 *
 	 * 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 or `Keycode::NONE` if the key is unrecognized.
 	 */
@@ -130,10 +130,10 @@ private:
 
 	/**
 	 * \brief Converts an SDL mouse button code to the custom MouseButton type.
-	 * 
-	 * This method maps an SDL mouse button code to the corresponding `MouseButton` 
+	 *
+	 * 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 or `MouseButton::NONE` if the key is unrecognized
 	 */
@@ -233,14 +233,14 @@ private:
 	 * \param pos the pos in world units
 	 * \param cam the camera of the current scene
 	 * \param cam_pos the current postion of the camera
-	 * \param img_scale the image multiplier for increasing img size 
+	 * \param img_scale the image multiplier for increasing img size
 	 * \return sdl rectangle to draw a dst image to draw on the screen
 	 */
 	SDL_FRect get_dst_rect(const DestinationRectangleData & data) const;
 	/**
 	 * \brief Set an additional color value multiplied into render copy operations.
 	 *
-	 * \param  texture the given texture to adjust 
+	 * \param  texture the given texture to adjust
 	 * \param  color the color data for the texture
 	 */
 	void set_color_texture(const Texture & texture, const Color & color);
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index 4c68f32..ee43d94 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -35,7 +35,7 @@ public:
 	void play();
 	/**
 	 * \brief Reset playhead position
-	 * 
+	 *
 	 * Resets the playhead position so that calling \c play() after this function makes it play
 	 * from the start of the sample. If the sound is not paused before calling this function,
 	 * this function will stop playback.
diff --git a/src/crepe/manager/ComponentManager.h b/src/crepe/manager/ComponentManager.h
index ad37586..44429d9 100644
--- a/src/crepe/manager/ComponentManager.h
+++ b/src/crepe/manager/ComponentManager.h
@@ -16,7 +16,7 @@ class GameObject;
 
 /**
  * \brief Manages all components
- * 
+ *
  * This class manages all components. It provides methods to add, delete and get components.
  */
 class ComponentManager : public Manager {
@@ -56,10 +56,10 @@ protected:
 	friend class GameObject;
 	/**
 	 * \brief Add a component to the ComponentManager
-	 * 
+	 *
 	 * This method adds a component to the ComponentManager. The component is created with the
 	 * given arguments and added to the ComponentManager.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \tparam Args The types of the arguments
 	 * \param id The id of the GameObject this component belongs to
@@ -70,9 +70,9 @@ protected:
 	T & add_component(game_object_id_t id, Args &&... args);
 	/**
 	 * \brief Delete all components of a specific type and id
-	 * 
+	 *
 	 * This method deletes all components of a specific type and id.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \param id The id of the GameObject this component belongs to
 	 */
@@ -80,24 +80,24 @@ protected:
 	void delete_components_by_id(game_object_id_t id);
 	/**
 	 * \brief Delete all components of a specific type
-	 * 
+	 *
 	 * This method deletes all components of a specific type.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 */
 	template <typename T>
 	void delete_components();
 	/**
 	 * \brief Delete all components of a specific id
-	 * 
+	 *
 	 * This method deletes all components of a specific id.
-	 * 
+	 *
 	 * \param id The id of the GameObject this component belongs to
 	 */
 	void delete_all_components_of_id(game_object_id_t id);
 	/**
 	 * \brief Delete all components
-	 * 
+	 *
 	 * This method deletes all components.
 	 */
 	void delete_all_components();
@@ -115,9 +115,9 @@ protected:
 public:
 	/**
 	 * \brief Get all components of a specific type and id
-	 * 
+	 *
 	 * This method gets all components of a specific type and id.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \param id The id of the GameObject this component belongs to
 	 * \return A vector of all components of the specific type and id
@@ -126,9 +126,9 @@ public:
 	RefVector<T> get_components_by_id(game_object_id_t id) const;
 	/**
 	 * \brief Get all components of a specific type
-	 * 
+	 *
 	 * This method gets all components of a specific type.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \return A vector of all components of the specific type
 	 */
@@ -138,7 +138,7 @@ public:
 private:
 	/**
 	 * \brief The components
-	 * 
+	 *
 	 * This unordered_map stores all components. The key is the type of the component and the
 	 * value is a vector of vectors of unique pointers to the components.
 	 *
diff --git a/src/crepe/manager/EventManager.h b/src/crepe/manager/EventManager.h
index d634f54..ba5e98b 100644
--- a/src/crepe/manager/EventManager.h
+++ b/src/crepe/manager/EventManager.h
@@ -24,7 +24,7 @@ typedef size_t event_channel_t;
 /**
  * \class EventManager
  * \brief Manages event subscriptions, triggers, and queues, enabling decoupled event handling.
- * 
+ *
  * The `EventManager` acts as a centralized event system. It allows for registering callbacks
  * for specific event types, triggering events synchronously, queueing events for later
  * processing, and managing subscriptions via unique identifiers.
@@ -35,20 +35,20 @@ public:
 
 	/**
 	 * \brief Get the singleton instance of the EventManager.
-	 * 
+	 *
 	 * This method returns the unique instance of the EventManager, creating it if it
 	 * doesn't already exist. Ensures only one instance is active in the program.
-	 * 
+	 *
 	 * \return Reference to the singleton instance of the EventManager.
 	 */
 	static EventManager & get_instance();
 
 	/**
 	 * \brief Subscribe to a specific event type.
-	 * 
+	 *
 	 * Registers a callback for a given event type and optional channel. Each callback
 	 * is assigned a unique subscription ID that can be used for later unsubscription.
-	 * 
+	 *
 	 * \tparam EventType The type of the event to subscribe to.
 	 * \param callback The callback function to be invoked when the event is triggered.
 	 * \param channel The channel number to subscribe to (default is CHANNEL_ALL, which listens to all channels).
@@ -60,18 +60,18 @@ public:
 
 	/**
 	 * \brief Unsubscribe a previously registered callback.
-	 * 
+	 *
 	 * Removes a callback from the subscription list based on its unique subscription ID.
-	 * 
+	 *
 	 * \param event_id The unique subscription ID of the callback to remove.
 	 */
 	void unsubscribe(subscription_t event_id);
 
 	/**
 	 * \brief Trigger an event immediately.
-	 * 
+	 *
 	 * Synchronously invokes all registered callbacks for the given event type on the specified channel.
-	 * 
+	 *
 	 * \tparam EventType The type of the event to trigger.
 	 * \param event The event instance to pass to the callbacks.
 	 * \param channel The channel to trigger the event on (default is CHANNEL_ALL, which triggers on all channels).
@@ -81,9 +81,9 @@ public:
 
 	/**
 	 * \brief Queue an event for later processing.
-	 * 
+	 *
 	 * Adds an event to the event queue to be processed during the next call to `dispatch_events`.
-	 * 
+	 *
 	 * \tparam EventType The type of the event to queue.
 	 * \param event The event instance to queue.
 	 * \param channel The channel to associate with the event (default is CHANNEL_ALL).
@@ -93,7 +93,7 @@ public:
 
 	/**
 	 * \brief Process all queued events.
-	 * 
+	 *
 	 * Iterates through the event queue and triggers callbacks for each queued event.
 	 * Events are removed from the queue once processed.
 	 */
@@ -101,7 +101,7 @@ public:
 
 	/**
 	 * \brief Clear all subscriptions.
-	 * 
+	 *
 	 * Removes all registered event handlers and clears the subscription list.
 	 */
 	void clear();
@@ -109,7 +109,7 @@ public:
 private:
 	/**
 	 * \brief Default constructor for the EventManager.
-	 * 
+	 *
 	 * Constructor is private to enforce the singleton pattern.
 	 */
 	EventManager() = default;
diff --git a/src/crepe/system/CollisionSystem.h b/src/crepe/system/CollisionSystem.h
index 7e893c8..5b136c6 100644
--- a/src/crepe/system/CollisionSystem.h
+++ b/src/crepe/system/CollisionSystem.h
@@ -37,7 +37,7 @@ private:
 
 	/**
 		* \brief A structure to store the collision data of a single collider.
-		* 
+		*
 		* This structure all components and id that are for needed within this system when calculating or handeling collisions.
 		* The transform and rigidbody are mostly needed for location and rotation.
 		* In rigidbody additional info is written about what the body of the object is,
@@ -65,7 +65,7 @@ private:
 public:
 	/**
 		* \brief Structure representing detailed collision information between two colliders.
-		* 
+		*
 		* Includes information about the colliding objects and the resolution data for handling the collision.
 		*/
 	struct CollisionInfo {
@@ -90,9 +90,9 @@ public:
 private:
 	/**
 		* \brief Determines the type of collider pair from two colliders.
-		* 
+		*
 		* Uses std::holds_alternative to identify the types of the provided colliders.
-		* 
+		*
 		* \param collider1 First collider variant (BoxCollider or CircleCollider).
 		* \param collider2 Second collider variant (BoxCollider or CircleCollider).
 		* \return The combined type of the two colliders.
@@ -102,9 +102,9 @@ private:
 
 	/**
 		* \brief Calculates the current position of a collider.
-		* 
+		*
 		* Combines the Collider offset, Transform position, and Rigidbody offset to compute the position of the collider.
-		* 
+		*
 		* \param collider_offset The offset of the collider.
 		* \param transform The Transform of the associated game object.
 		* \param rigidbody The Rigidbody of the associated game object.
@@ -116,9 +116,9 @@ private:
 private:
 	/**
 		* \brief Handles collision resolution between two colliders.
-		* 
+		*
 		* Processes collision data and adjusts objects to resolve collisions and/or calls the user oncollision script function.
-		* 
+		*
 		* \param data1 Collision data for the first collider.
 		* \param data2 Collision data for the second collider.
 		*/
@@ -126,9 +126,9 @@ private:
 
 	/**
 		* \brief Resolves collision between two colliders and calculates the movement required.
-		* 
+		*
 		* Determines the displacement and direction needed to separate colliders based on their types.
-		* 
+		*
 		* \param data1 Collision data for the first collider.
 		* \param data2 Collision data for the second collider.
 		* \param type The type of collider pair.
@@ -140,9 +140,9 @@ private:
 
 	/**
 		* \brief Calculates the resolution vector for two BoxColliders.
-		* 
+		*
 		* Computes the displacement required to separate two overlapping BoxColliders.
-		* 
+		*
 		* \param box_collider1 The first BoxCollider.
 		* \param box_collider2 The second BoxCollider.
 		* \param position1 The position of the first BoxCollider.
@@ -155,13 +155,13 @@ private:
 
 	/**
 		* \brief Calculates the resolution vector for two CircleCollider.
-		* 
+		*
 		* Computes the displacement required to separate two overlapping CircleCollider.
-		* 
+		*
 		* \param circle_collider1 The first CircleCollider.
 		* \param circle_collider2 The second CircleCollider.
-		* \param position1 The position of the first CircleCollider.
-		* \param position2 The position of the second CircleCollider.
+		* \param final_position1 The position of the first CircleCollider.
+		* \param final_position2 The position of the second CircleCollider.
 		* \return The resolution vector for the collision.
 		*/
 	vec2 get_circle_circle_resolution(const CircleCollider & circle_collider1,
@@ -171,14 +171,13 @@ private:
 
 	/**
 		* \brief Calculates the resolution vector for two CircleCollider.
-		* 
+		*
 		* Computes the displacement required to separate two overlapping CircleCollider.
-		* 
+		*
 		* \param circle_collider The first CircleCollider.
 		* \param box_collider The second CircleCollider.
 		* \param circle_position The position of the CircleCollider.
 		* \param box_position The position of the BoxCollider.
-		* \param inverse Inverted true if box circle collision, false if circle box collision (inverts the direction).
 		* \return The resolution vector for the collision.
 		*/
 	vec2 get_circle_box_resolution(const CircleCollider & circle_collider,
@@ -188,18 +187,18 @@ private:
 
 	/**
 		* \brief Determines the appropriate collision handler for a collision.
-		* 
+		*
 		* Decides the correct resolution process based on the dynamic or static nature of the colliders involved.
-		* 
+		*
 		* \param info Collision information containing data about both colliders.
 		*/
 	void determine_collision_handler(CollisionInfo & info);
 
 	/**
 		* \brief Handles collisions involving static objects.
-		* 
+		*
 		* Resolves collisions by adjusting positions and modifying velocities if bounce is enabled.
-		* 
+		*
 		* \param info Collision information containing data about both colliders.
 		*/
 	void static_collision_handler(CollisionInfo & info);
@@ -207,9 +206,9 @@ private:
 private:
 	/**
 		* \brief Checks for collisions between colliders.
-		* 
+		*
 		* Identifies collisions and generates pairs of colliding objects for further processing.
-		* 
+		*
 		* \param colliders A collection of all active colliders.
 		* \return A list of collision pairs with their associated data.
 		*/
@@ -218,13 +217,13 @@ private:
 
 	/**
 	 * \brief Checks if two collision layers have at least one common layer.
-	 * 
+	 *
 	 * This function checks if there is any overlapping layer between the two inputs.
-	 * It compares each layer from the first input to see 
-	 * if it exists in the second input. If at least one common layer is found, 
-	 * the function returns true, indicating that the two colliders share a common 
+	 * It compares each layer from the first input to see
+	 * if it exists in the second input. If at least one common layer is found,
+	 * the function returns true, indicating that the two colliders share a common
 	 * collision layer.
-	 * 
+	 *
 	 * \param layers1 all collision layers for the first collider.
 	 * \param layers2 all collision layers for the second collider.
 	 * \return Returns true if there is at least one common layer, false otherwise.
@@ -234,9 +233,9 @@ private:
 
 	/**
 		* \brief Checks for collision between two colliders.
-		* 
+		*
 		* Calls the appropriate collision detection function based on the collider types.
-		* 
+		*
 		* \param first_info Collision data for the first collider.
 		* \param second_info Collision data for the second collider.
 		* \param type The type of collider pair.
@@ -248,7 +247,7 @@ private:
 
 	/**
 		* \brief Detects collisions between two BoxColliders.
-		* 
+		*
 		* \param box1 The first BoxCollider.
 		* \param box2 The second BoxCollider.
 		* \param transform1 Transform of the first object.
diff --git a/src/crepe/system/ParticleSystem.h b/src/crepe/system/ParticleSystem.h
index c647284..068f01c 100644
--- a/src/crepe/system/ParticleSystem.h
+++ b/src/crepe/system/ParticleSystem.h
@@ -25,7 +25,7 @@ public:
 private:
 	/**
 	 * \brief Emits a particle from the specified emitter based on its emission properties.
-	 * 
+	 *
 	 * \param emitter Reference to the ParticleEmitter.
 	 * \param transform Const reference to the Transform component associated with the emitter.
 	 */
@@ -34,7 +34,7 @@ private:
 	/**
 	 * \brief Calculates the number of times particles should be emitted based on emission rate
 	 * and update count.
-	 * 
+	 *
 	 * \param count Current update count.
 	 * \param emission Emission rate.
 	 * \return The number of particles to emit.
@@ -44,7 +44,7 @@ private:
 	/**
 	 * \brief Checks whether particles are within the emitter’s boundary, resets or stops
 	 * particles if they exit.
-	 * 
+	 *
 	 * \param emitter Reference to the ParticleEmitter.
 	 * \param transform Const reference to the Transform component associated with the emitter.
 	 */
@@ -52,7 +52,7 @@ private:
 
 	/**
 	 * \brief Generates a random angle for particle emission within the specified range.
-	 * 
+	 *
 	 * \param min_angle Minimum emission angle in degrees.
 	 * \param max_angle Maximum emission angle in degrees.
 	 * \return Random angle in degrees.
@@ -61,7 +61,7 @@ private:
 
 	/**
 	 * \brief Generates a random speed for particle emission within the specified range.
-	 * 
+	 *
 	 * \param min_speed Minimum emission speed.
 	 * \param max_speed Maximum emission speed.
 	 * \return Random speed.
diff --git a/src/crepe/system/PhysicsSystem.h b/src/crepe/system/PhysicsSystem.h
index 227ab69..26152a5 100644
--- a/src/crepe/system/PhysicsSystem.h
+++ b/src/crepe/system/PhysicsSystem.h
@@ -6,7 +6,7 @@ namespace crepe {
 
 /**
  * \brief System that controls all physics
- * 
+ *
  * This class is a physics system that uses a rigidbody and transform to add physics to a game
  * object.
  */
@@ -15,7 +15,7 @@ public:
 	using System::System;
 	/**
 	 * \brief updates the physics system.
-	 * 
+	 *
 	 * It calculates new velocties and changes the postion in the transform.
 	 */
 	void update() override;
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 830d380..26f2c85 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -46,7 +46,8 @@ SDLContext::CameraValues RenderSystem::update_camera() {
 }
 
 bool sorting_comparison(const Sprite & a, const Sprite & b) {
-	if (a.data.sorting_in_layer != b.data.sorting_in_layer) return a.data.sorting_in_layer < b.data.sorting_in_layer;
+	if (a.data.sorting_in_layer != b.data.sorting_in_layer)
+		return a.data.sorting_in_layer < b.data.sorting_in_layer;
 	if (a.data.order_in_layer != b.data.order_in_layer)
 		return a.data.order_in_layer < b.data.order_in_layer;
 
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index de76229..e270a6b 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -18,7 +18,7 @@ class Transform;
  * \brief Manages rendering operations for all game objects.
  *
  * RenderSystem is responsible for rendering, clearing and presenting the screen, and
- * managing the active camera. 
+ * managing the active camera.
  */
 class RenderSystem : public System {
 public:
@@ -56,10 +56,10 @@ private:
 						 const double & scale);
 
 	/**
-	 * \brief renders a sprite with a Transform component on the screen 
+	 * \brief renders a sprite with a Transform component on the screen
 	 *
 	 * \param sprite  the sprite component that holds all the data
-	 * \param tm the Transform component that holds the position,rotation and scale 
+	 * \param tm the Transform component that holds the position,rotation and scale
 	 */
 	void render_normal(const Sprite & sprite, const SDLContext::CameraValues & cam,
 					   const Transform & tm);
@@ -67,7 +67,7 @@ private:
 	/**
 	 * \brief sort a vector sprite objects with
 	 *
-	 * \param objs the vector that will do a sorting algorithm on 
+	 * \param objs the vector that will do a sorting algorithm on
 	 * \return returns a sorted reference vector
 	 */
 	RefVector<Sprite> sort(RefVector<Sprite> & objs) const;
diff --git a/src/crepe/system/ScriptSystem.h b/src/crepe/system/ScriptSystem.h
index 936e9ca..3db1b1e 100644
--- a/src/crepe/system/ScriptSystem.h
+++ b/src/crepe/system/ScriptSystem.h
@@ -8,7 +8,7 @@ class Script;
 
 /**
  * \brief Script system
- * 
+ *
  * The script system is responsible for all \c BehaviorScript components, and
  * calls the methods on classes derived from \c Script.
  */
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index bd99614..c753bca 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -70,8 +70,11 @@ public:
 	void SetUp() override {
 
 		GameObject do_not_use = mgr.new_object("DO_NOT_USE", "", {0, 0});
-		do_not_use.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, vec2{2000, 2000},
-										 1.0f);
+		do_not_use.add_component<Camera>(ivec2{1080, 720}, vec2{2000, 2000},
+										 Camera::Data{
+											 .bg_color = Color::WHITE,
+											 .zoom = 1.0f,
+										 });
 		// initialize systems here:
 		//calls init
 		script_sys.update();
@@ -164,10 +167,15 @@ TEST_F(DISABLED_ProfilingTest, Profiling_2) {
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			Color color(0, 0, 0, 0);
 			auto img = Texture("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
-				img, color, Sprite::FlipSettings{false, false}, 1, 1, 500);
+				img, Sprite::Data{
+						 .color = {0, 0, 0, 0},
+						 .flip = {.flip_x = false, .flip_y = false},
+						 .sorting_in_layer = 1,
+						 .order_in_layer = 1,
+						 .size = {.y = 500},
+					 });
 		}
 
 		this->game_object_count++;
@@ -197,10 +205,15 @@ TEST_F(DISABLED_ProfilingTest, Profiling_3) {
 			});
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			Color color(0, 0, 0, 0);
 			auto img = Texture("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
-				img, color, Sprite::FlipSettings{false, false}, 1, 1, 500);
+				img, Sprite::Data{
+						 .color = {0, 0, 0, 0},
+						 .flip = {.flip_x = false, .flip_y = false},
+						 .sorting_in_layer = 1,
+						 .order_in_layer = 1,
+						 .size = {.y = 500},
+					 });
 			auto & test = gameobject.add_component<ParticleEmitter>(ParticleEmitter::Data{
 				.max_particles = 10,
 				.emission_rate = 100,
-- 
cgit v1.2.3