1 files changed, 104 insertions, 99 deletions

diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index b7d2eb4..c3bf4d4 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -13,6 +13,7 @@ void InputSystem::update() {
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
 	OptionalRef<Camera> curr_cam_ref;
+
 	// Find the active camera
 	for (Camera & cam : cameras) {
 		if (!cam.active) continue;
@@ -20,122 +21,126 @@ void InputSystem::update() {
 		break;
 	}
 	if (!curr_cam_ref) return;
+
 	Camera & current_cam = curr_cam_ref;
 	RefVector<Transform> transform_vec
 		= mgr.get_components_by_id<Transform>(current_cam.game_object_id);
 	Transform & cam_transform = transform_vec.front().get();
-	int camera_origin_x = cam_transform.position.x + current_cam.data.postion_offset.x
-						  - (current_cam.viewport_size.x / 2);
-	int camera_origin_y = 
+
 	ivec2 camera_origin;
 	camera_origin.y = cam_transform.position.y + current_cam.data.postion_offset.y
 						  - (current_cam.viewport_size.y / 2);
-	camera_origin
+	camera_origin.x = cam_transform.position.x + current_cam.data.postion_offset.x
+						  - (current_cam.viewport_size.x / 2);
+
 	for (const SDLContext::EventData & event : event_list) {
-		int adjusted_mouse_x = event.mouse_data.mouse_position.x + camera_origin_x;
-		int adjusted_mouse_y = event.mouse_data.mouse_position.y + camera_origin_y;
-		// check if the mouse is within the viewport
-		bool mouse_in_viewport
-			= !(adjusted_mouse_x < camera_origin_x
-				|| adjusted_mouse_x > camera_origin_x + current_cam.viewport_size.x
-				|| adjusted_mouse_y < camera_origin_y
-				|| adjusted_mouse_y > camera_origin_y + current_cam.viewport_size.y);
-
-		switch (event.event_type) {
-			case SDLContext::EventType::KEYDOWN:
-				event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{
-					.repeat = event.key_data.key_repeat,
-					.key = event.key_data.key,
-				});
-				break;
-			case SDLContext::EventType::KEYUP:
-				event_mgr.queue_event<KeyReleaseEvent>(KeyReleaseEvent{
-					.key = event.key_data.key,
-				});
-				break;
-			case SDLContext::EventType::MOUSEDOWN:
-				if (!mouse_in_viewport) {
+		// Only calculate mouse coordinates for relevant events
+		if (event.event_type == SDLContext::EventType::MOUSEDOWN 
+			|| event.event_type == SDLContext::EventType::MOUSEUP
+			|| event.event_type == SDLContext::EventType::MOUSEMOVE
+			|| event.event_type == SDLContext::EventType::MOUSEWHEEL) {
+
+			int adjusted_mouse_x = event.mouse_data.mouse_position.x + camera_origin.x;
+			int adjusted_mouse_y = event.mouse_data.mouse_position.y + camera_origin.y;
+
+			// Check if the mouse is within the viewport
+			bool mouse_in_viewport = !(adjusted_mouse_x < camera_origin.x
+				|| adjusted_mouse_x > camera_origin.x + current_cam.viewport_size.x
+				|| adjusted_mouse_y < camera_origin.y
+				|| adjusted_mouse_y > camera_origin.y + current_cam.viewport_size.y);
+
+			if (!mouse_in_viewport) continue;
+
+			// Handle mouse-specific events
+			switch (event.event_type) {
+				case SDLContext::EventType::MOUSEDOWN:
+					event_mgr.queue_event<MousePressEvent>({
+						.mouse_pos = {adjusted_mouse_x, adjusted_mouse_y},
+						.button = event.mouse_data.mouse_button,
+					});
+					this->last_mouse_down_position = {adjusted_mouse_x, adjusted_mouse_y};
+					this->last_mouse_button = event.mouse_data.mouse_button;
 					break;
-				}
-				event_mgr.queue_event<MousePressEvent>(MousePressEvent{
-					.mouse_pos = {adjusted_mouse_x,adjusted_mouse_y},
-					.button = event.mouse_data.mouse_button,
-				});
-				this->last_mouse_down_position = {adjusted_mouse_x, adjusted_mouse_y};
-				this->last_mouse_button = event.mouse_data.mouse_button;
-				break;
-			case SDLContext::EventType::MOUSEUP: {
-				if (!mouse_in_viewport) {
+
+				case SDLContext::EventType::MOUSEUP: {
+					event_mgr.queue_event<MouseReleaseEvent>({
+						.mouse_pos = {adjusted_mouse_x, adjusted_mouse_y},
+						.button = event.mouse_data.mouse_button,
+					});
+					int delta_x = adjusted_mouse_x - this->last_mouse_down_position.x;
+					int delta_y = adjusted_mouse_y - this->last_mouse_down_position.y;
+
+					if (this->last_mouse_button == event.mouse_data.mouse_button
+						&& std::abs(delta_x) <= click_tolerance
+						&& std::abs(delta_y) <= click_tolerance) {
+						event_mgr.queue_event<MouseClickEvent>({
+							.mouse_pos = {adjusted_mouse_x, adjusted_mouse_y},
+							.button = event.mouse_data.mouse_button,
+						});
+						this->handle_click(event.mouse_data.mouse_button, adjusted_mouse_x, adjusted_mouse_y);
+					}
 					break;
 				}
-				event_mgr.queue_event<MouseReleaseEvent>(MouseReleaseEvent{
-					.mouse_pos = {adjusted_mouse_x,adjusted_mouse_y},
-					.button = event.mouse_data.mouse_button,
-				});
-				int delta_x = adjusted_mouse_x - this->last_mouse_down_position.x;
-				int delta_y = adjusted_mouse_y - this->last_mouse_down_position.y;
-
-				if (this->last_mouse_button == event.mouse_data.mouse_button
-					&& std::abs(delta_x) <= click_tolerance
-					&& std::abs(delta_y) <= click_tolerance) {
-					event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{
-						.mouse_pos = {adjusted_mouse_x,adjusted_mouse_y},
-						.button = event.mouse_data.mouse_button,
+
+				case SDLContext::EventType::MOUSEMOVE:
+					event_mgr.queue_event<MouseMoveEvent>({
+						.mouse_pos = {adjusted_mouse_x, adjusted_mouse_y},
+						.mouse_delta = event.mouse_data.rel_mouse_move,
 					});
+					this->handle_move(event, adjusted_mouse_x, adjusted_mouse_y);
+					break;
 
-					this->handle_click(event.mouse_data.mouse_button, adjusted_mouse_x, adjusted_mouse_y);
-				}
-			} break;
-			case SDLContext::EventType::MOUSEMOVE:
-				if (!mouse_in_viewport) {
+				case SDLContext::EventType::MOUSEWHEEL:
+					event_mgr.queue_event<MouseScrollEvent>({
+						.mouse_pos = {adjusted_mouse_x, adjusted_mouse_y},
+						.scroll_direction = event.mouse_data.scroll_direction,
+						.scroll_delta = event.mouse_data.scroll_delta,
+					});
 					break;
-				}
-				event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{
-					.mouse_pos = {adjusted_mouse_x,adjusted_mouse_y},
-					.mouse_delta = event.mouse_data.rel_mouse_move,
-				});
-				this->handle_move(event, adjusted_mouse_x, adjusted_mouse_y);
-				break;
-			case SDLContext::EventType::MOUSEWHEEL:
-				event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{
-					.mouse_pos = {adjusted_mouse_x,adjusted_mouse_y},
-					.scroll_direction = event.mouse_data.scroll_direction,
-					.scroll_delta = event.mouse_data.scroll_delta,
-				});
-				break;
-			case SDLContext::EventType::SHUTDOWN:
-				event_mgr.queue_event<ShutDownEvent>(ShutDownEvent{});
-				break;
-			case SDLContext::EventType::WINDOW_EXPOSE:
-				event_mgr.queue_event<WindowExposeEvent>(WindowExposeEvent{});
-				break;
-            case SDLContext::EventType::WINDOW_RESIZE:
-				event_mgr.queue_event<WindowResizeEvent>(WindowResizeEvent{
-					.dimensions = event.window_data.resize_dimension,
-				});
-				break;
-            case SDLContext::EventType::WINDOW_MOVE:
-				event_mgr.queue_event<WindowMoveEvent>(WindowMoveEvent{
-					.delta_move = event.window_data.move_delta,
-				});
-				break;
-            case SDLContext::EventType::WINDOW_MINIMIZE:
-				event_mgr.queue_event<WindowMinimizeEvent>(WindowMinimizeEvent{});
-				break;
-            case SDLContext::EventType::WINDOW_MAXIMIZE:
-				event_mgr.queue_event<WindowMaximizeEvent>(WindowMaximizeEvent{});
-				break;
-            case SDLContext::EventType::WINDOW_FOCUS_GAIN:
-				event_mgr.queue_event<WindowFocusGainEvent>(WindowFocusGainEvent{});
-				break;
-            case SDLContext::EventType::WINDOW_FOCUS_LOST:
-				event_mgr.queue_event<WindowFocusLostEvent>(WindowFocusLostEvent{});
-				break;
-			default:
-				break;
+
+				default:
+					break;
+			}
+		} else {
+			// Handle non-mouse events
+			switch (event.event_type) {
+				case SDLContext::EventType::KEYDOWN:
+					event_mgr.queue_event<KeyPressEvent>({.repeat = event.key_data.key_repeat, .key = event.key_data.key});
+					break;
+				case SDLContext::EventType::KEYUP:
+					event_mgr.queue_event<KeyReleaseEvent>({.key = event.key_data.key});
+					break;
+				case SDLContext::EventType::SHUTDOWN:
+					event_mgr.queue_event<ShutDownEvent>({});
+					break;
+				case SDLContext::EventType::WINDOW_EXPOSE:
+					event_mgr.queue_event<WindowExposeEvent>({});
+					break;
+				case SDLContext::EventType::WINDOW_RESIZE:
+					event_mgr.queue_event<WindowResizeEvent>({.dimensions = event.window_data.resize_dimension});
+					break;
+				case SDLContext::EventType::WINDOW_MOVE:
+					event_mgr.queue_event<WindowMoveEvent>({.delta_move = event.window_data.move_delta});
+					break;
+				case SDLContext::EventType::WINDOW_MINIMIZE:
+					event_mgr.queue_event<WindowMinimizeEvent>({});
+					break;
+				case SDLContext::EventType::WINDOW_MAXIMIZE:
+					event_mgr.queue_event<WindowMaximizeEvent>({});
+					break;
+				case SDLContext::EventType::WINDOW_FOCUS_GAIN:
+					event_mgr.queue_event<WindowFocusGainEvent>({});
+					break;
+				case SDLContext::EventType::WINDOW_FOCUS_LOST:
+					event_mgr.queue_event<WindowFocusLostEvent>({});
+					break;
+				default:
+					break;
+			}
 		}
 	}
 }
+
 void InputSystem::handle_move(const SDLContext::EventData & event_data,
 							  const int adjusted_mouse_x, const int adjusted_mouse_y) {
 	ComponentManager & mgr = this->mediator.component_manager;