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

---
 src/crepe/system/InputSystem.cpp | 64 +++++++++++++++++++++-------------------
 src/crepe/system/InputSystem.h   | 10 -------
 2 files changed, 34 insertions(+), 40 deletions(-)

(limited to 'src/crepe/system')

diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 070f804..4695620 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -80,50 +80,54 @@ void InputSystem::update() {
 }
 
 void InputSystem::handle_move(const SDLContext::EventData & event_data) {
-	ComponentManager & mgr = this->component_manager;
-
-	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-	RefVector<Transform> transforms = mgr.get_components_by_type<Transform>();
-
-	for (Button & button : buttons) {
-		OptionalRef<Transform> transform = find_transform_for_button(button, transforms);
-		if (!transform) continue;
-
-		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
-			button.hover = true;
-		} else {
-			button.hover = false;
-		}
-	}
+    ComponentManager & mgr = this->component_manager;
+
+    RefVector<Button> buttons = mgr.get_components_by_type<Button>();
+    
+
+    for (Button & button : buttons) {
+        RefVector<Transform> transform_vec =  mgr.get_components_by_id<Transform>(button.game_object_id);
+		OptionalRef<Transform> transform(transform_vec.front().get());
+        if (!transform) continue;
+
+        bool was_hovering = button.hover; // Store previous hover state
+
+        // Check if the mouse is inside the button
+        if (button.active && is_mouse_inside_button(event_data, button, transform)) {
+            button.hover = true;
+
+            // Trigger the on_enter callback if the hover state just changed to true
+            if (!was_hovering && button.on_enter) {
+                button.on_enter();
+            }
+        } else {
+            button.hover = false;
+
+            // Trigger the on_exit callback if the hover state just changed to false
+            if (was_hovering && button.on_exit) {
+                button.on_exit();
+            }
+        }
+    }
 }
 
+
 void InputSystem::handle_click(const SDLContext::EventData & event_data) {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-	RefVector<Transform> transforms = mgr.get_components_by_type<Transform>();
+	
 
 	for (Button & button : buttons) {
-		OptionalRef<Transform> transform_ref = find_transform_for_button(button, transforms);
+		RefVector<Transform> transform_vec =  mgr.get_components_by_id<Transform>(button.game_object_id);
+		OptionalRef<Transform> transform(transform_vec.front().get());
 
-		if (button.active && is_mouse_inside_button(event_data, button, transform_ref)) {
+		if (button.active && is_mouse_inside_button(event_data, button, transform)) {
 			handle_button_press(button);
 		}
 	}
 }
 
-OptionalRef<Transform>
-InputSystem::find_transform_for_button(Button & button, RefVector<Transform> & transforms) {
-
-	for (auto & transform : transforms) {
-		if (button.game_object_id == transform.get().game_object_id) {
-			return OptionalRef<Transform>(transform);
-		}
-	}
-
-	return OptionalRef<Transform>();
-}
-
 bool InputSystem::is_mouse_inside_button(const SDLContext::EventData & event_data,
 										 const Button & button, const Transform & transform) {
 	return event_data.mouse_position.first >= transform.position.x
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index b648144..c6ca114 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -54,16 +54,6 @@ private:
      * This method processes the mouse movement event and updates the button hover state.
      */
 	void handle_move(const SDLContext::EventData & eventData);
-
-	/**
-     * \brief Finds the transform component associated with a button.
-     * \param button The button to find the associated transform for.
-     * \param transforms A list of transforms to search through.
-     * \return A pointer to the transform of the button, or nullptr if not found.
-     */
-	OptionalRef<Transform> find_transform_for_button(Button & button,
-													 RefVector<Transform> & transforms);
-
 	/**
      * \brief Checks if the mouse position is inside the bounds of the button.
      * \param eventData The event data containing the mouse position.
-- 
cgit v1.2.3