From eb9c76082d7d0ee0c3e55cb8eadfa5f8978bd8f2 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 20:12:30 +0100
Subject: button improvements

---
 src/test/InputTest.cpp | 59 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 21 deletions(-)

(limited to 'src/test/InputTest.cpp')

diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 2d844d4..6c40235 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -2,7 +2,6 @@
 
 #include <crepe/manager/ResourceManager.h>
 #include <crepe/system/RenderSystem.h>
-
 #define protected public
 #define private public
 
@@ -214,8 +213,13 @@ TEST_F(InputTest, MouseClick) {
 TEST_F(InputTest, testButtonClick) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
-	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0}, on_click);
+	event_manager.subscribe<ButtonPressEvent>([&](const ButtonPressEvent & event) {
+		button_clicked = true;
+		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
+		return false;
+	}
+	);
+	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0});
 
 	bool hover = false;
 	button.active = true;
@@ -232,25 +236,21 @@ TEST_F(InputTest, testButtonClick) {
 
 TEST_F(InputTest, testButtonHover) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	bool button_clicked = false;
-	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0}, on_click);
+	bool button_hover = false;
+	event_manager.subscribe<ButtonEnterEvent>([&](const ButtonEnterEvent & event) {
+		button_hover = true;
+		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
+		return false;
+	}
+	);
+	event_manager.subscribe<ButtonExitEvent>([&](const ButtonExitEvent & event) {
+		button_hover = false;
+		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
+		return false;
+	}
+	);
+	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0});
 	button.active = true;
-
-	// Mouse not on button
-	SDL_Event event;
-	SDL_zero(event);
-	event.type = SDL_MOUSEMOTION;
-	event.motion.x = 700;
-	event.motion.y = 700;
-	event.motion.xrel = 10;
-	event.motion.yrel = 10;
-	SDL_PushEvent(&event);
-
-	input_system.update();
-	event_manager.dispatch_events();
-	EXPECT_FALSE(button.hover);
-
 	// Mouse on button
 	SDL_Event hover_event;
 	SDL_zero(hover_event);
@@ -264,4 +264,21 @@ TEST_F(InputTest, testButtonHover) {
 	input_system.update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(button.hover);
+	EXPECT_TRUE(button_hover);
+	// Mouse not on button
+	SDL_Event event;
+	SDL_zero(event);
+	event.type = SDL_MOUSEMOTION;
+	event.motion.x = 500;
+	event.motion.y = 500;
+	event.motion.xrel = 10;
+	event.motion.yrel = 10;
+	SDL_PushEvent(&event);
+
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_FALSE(button.hover);
+	EXPECT_FALSE(button_hover);
+
+	
 }
-- 
cgit v1.2.3


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

---
 src/crepe/api/Button.h           |  2 +-
 src/crepe/system/InputSystem.cpp |  6 +++---
 src/crepe/system/InputSystem.h   | 18 +++++++++---------
 src/test/InputTest.cpp           | 11 +++--------
 4 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'src/test/InputTest.cpp')

diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 5d4156b..25d74e2 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -2,9 +2,9 @@
 
 #include <functional>
 
-#include "UIObject.h"
 #include "Event.h"
 #include "Metadata.h"
+#include "UIObject.h"
 
 namespace crepe {
 
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 5d1537d..e42eaeb 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -155,7 +155,7 @@ void InputSystem::handle_non_mouse_event(const EventData & event) {
 
 void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_pos) {
 	ComponentManager & mgr = this->mediator.component_manager;
-	EventManager& event_mgr = this->mediator.event_manager;
+	EventManager & event_mgr = this->mediator.event_manager;
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 
 	for (Button & button : buttons) {
@@ -183,9 +183,9 @@ void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_p
 
 void InputSystem::handle_click(const MouseButton & mouse_button, const vec2 & mouse_pos) {
 	ComponentManager & mgr = this->mediator.component_manager;
-	EventManager& event_mgr = this->mediator.event_manager;
+	EventManager & event_mgr = this->mediator.event_manager;
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-	
+
 	for (Button & button : buttons) {
 		if (!button.active) continue;
 		RefVector<Metadata> metadata_vec
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 9cad178..5afe641 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -3,11 +3,10 @@
 #include "../api/Config.h"
 #include "../facade/EventData.h"
 
+#include "../api/Event.h"
+#include "../api/Metadata.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
-#include "../api/Metadata.h"
-#include "../api/Event.h"
-
 
 #include "System.h"
 
@@ -21,18 +20,19 @@ class Transform;
  */
 class ButtonPressEvent : public Event {
 public:
-	const Metadata& meta_data;
-	ButtonPressEvent(const Metadata& meta_data) : meta_data(meta_data){};;
+	const Metadata & meta_data;
+	ButtonPressEvent(const Metadata & meta_data) : meta_data(meta_data){};
+	;
 };
 class ButtonEnterEvent : public Event {
 public:
-	const Metadata& meta_data;
-	ButtonEnterEvent(const Metadata& meta_data) : meta_data(meta_data){};
+	const Metadata & meta_data;
+	ButtonEnterEvent(const Metadata & meta_data) : meta_data(meta_data){};
 };
 class ButtonExitEvent : public Event {
 public:
-	const Metadata& meta_data;
-	ButtonExitEvent(const Metadata& meta_data) : meta_data(meta_data){};
+	const Metadata & meta_data;
+	ButtonExitEvent(const Metadata & meta_data) : meta_data(meta_data){};
 };
 
 /**
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 6c40235..097667a 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -217,8 +217,7 @@ TEST_F(InputTest, testButtonClick) {
 		button_clicked = true;
 		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
 		return false;
-	}
-	);
+	});
 	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0});
 
 	bool hover = false;
@@ -241,14 +240,12 @@ TEST_F(InputTest, testButtonHover) {
 		button_hover = true;
 		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
 		return false;
-	}
-	);
+	});
 	event_manager.subscribe<ButtonExitEvent>([&](const ButtonExitEvent & event) {
 		button_hover = false;
 		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
 		return false;
-	}
-	);
+	});
 	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0});
 	button.active = true;
 	// Mouse on button
@@ -279,6 +276,4 @@ TEST_F(InputTest, testButtonHover) {
 	event_manager.dispatch_events();
 	EXPECT_FALSE(button.hover);
 	EXPECT_FALSE(button_hover);
-
-	
 }
-- 
cgit v1.2.3


From a3e418c1a48a057d82fc3faf927ebf1cd3da7227 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Tue, 17 Dec 2024 20:48:34 +0100
Subject: feedback

---
 src/crepe/api/Button.h           |  8 ++++----
 src/crepe/system/InputSystem.cpp | 18 ++++--------------
 src/crepe/system/InputSystem.h   | 18 +++++++++---------
 src/test/InputTest.cpp           |  6 +++---
 4 files changed, 20 insertions(+), 30 deletions(-)

(limited to 'src/test/InputTest.cpp')

diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h
index 0f446c9..d42527e 100644
--- a/src/crepe/api/Button.h
+++ b/src/crepe/api/Button.h
@@ -13,9 +13,9 @@ namespace crepe {
  * This component creates a clickable surface at the transform location with the specified width and height.
  * 
  * The Button can be used in scripts by subscribing a EventHandler to the following events:
- * - **ButtonPressEvent**: Triggered when the surface is clicked with the mouse. Contains GameObject metadata.
- * - **MouseEnterEvent**: Triggered when the mouse enters the button area. Contains GameObject metadata.
- * - **MouseExitEvent**: Triggered when the mouse leaves the button area. Contains GameObject metadata.
+ * - ButtonPressEvent
+ * - ButtonEnterEvent
+ * - ButtonExitEvent
  * \see EventManager
  * 
  */
@@ -34,7 +34,7 @@ public:
 	 *
 	 * Since the button Event transfers the GameObject Metadata it will be the same for each button so only one button is allowed per GameObject	
 	 * 
-	 * \return The maximum number of instances for this component
+	 * \return 1
 	 */
 	virtual int get_instances_max() const { return 1; }
 
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index e42eaeb..34aad06 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -10,10 +10,8 @@ using namespace crepe;
 
 void InputSystem::update() {
 	ComponentManager & mgr = this->mediator.component_manager;
-
 	SDLContext & context = this->mediator.sdl_context;
 	std::vector<EventData> event_list = context.get_events();
-	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
 	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
 	OptionalRef<Camera> curr_cam_ref;
 
@@ -160,12 +158,8 @@ void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_p
 
 	for (Button & button : buttons) {
 		if (!button.active) continue;
-		RefVector<Transform> transform_vec
-			= mgr.get_components_by_id<Transform>(button.game_object_id);
-		Transform & transform = transform_vec.front().get();
-		RefVector<Metadata> metadata_vec
-			= mgr.get_components_by_id<Metadata>(button.game_object_id);
-		Metadata & metadata = metadata_vec.front().get();
+		Metadata & metadata = mgr.get_components_by_id<Metadata>(button.game_object_id).front();
+		Transform & transform = mgr.get_components_by_id<Transform>(button.game_object_id).front();
 		bool was_hovering = button.hover;
 		if (this->is_mouse_inside_button(mouse_pos, button, transform)) {
 			button.hover = true;
@@ -188,12 +182,8 @@ void InputSystem::handle_click(const MouseButton & mouse_button, const vec2 & mo
 
 	for (Button & button : buttons) {
 		if (!button.active) continue;
-		RefVector<Metadata> metadata_vec
-			= mgr.get_components_by_id<Metadata>(button.game_object_id);
-		Metadata & metadata = metadata_vec.front().get();
-		RefVector<Transform> transform_vec
-			= mgr.get_components_by_id<Transform>(button.game_object_id);
-		Transform & transform = transform_vec.front().get();
+		Metadata & metadata = mgr.get_components_by_id<Metadata>(button.game_object_id).front();
+		Transform & transform = mgr.get_components_by_id<Transform>(button.game_object_id).front();
 
 		if (this->is_mouse_inside_button(mouse_pos, button, transform)) {
 			event_mgr.trigger_event<ButtonPressEvent>(metadata);
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 45c593a..e580d8e 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -19,31 +19,31 @@ class Transform;
 class ButtonPressEvent : public Event {
 public:
 	//! Metadata of the button.
-	const Metadata & meta_data;
+	const Metadata & metadata;
 	/**
-	 * \param meta_data Metadata of the button pressed
+	 * \param metadata Metadata of the button pressed
 	 */
-	ButtonPressEvent(const Metadata & meta_data) : meta_data(meta_data){};
+	ButtonPressEvent(const Metadata & metadata) : metadata(metadata){};
 };
 //! Event triggered when the mouse enters a button
 class ButtonEnterEvent : public Event {
 public:
 	//! Metadata of the button.
-	const Metadata & meta_data;
+	const Metadata & metadata;
 	/**
-	 * \param meta_data Metadata of the button pressed
+	 * \param metadata Metadata of the button pressed
 	 */
-	ButtonEnterEvent(const Metadata & meta_data) : meta_data(meta_data){};
+	ButtonEnterEvent(const Metadata & metadata) : metadata(metadata){};
 };
 //! Event triggered when the mouse leaves a button
 class ButtonExitEvent : public Event {
 public:
 	//! Metadata of the button.
-	const Metadata & meta_data;
+	const Metadata & metadata;
 	/**
-	 * \param meta_data Metadata of the button pressed
+	 * \param metadata Metadata of the button pressed
 	 */
-	ButtonExitEvent(const Metadata & meta_data) : meta_data(meta_data){};
+	ButtonExitEvent(const Metadata & metadata) : metadata(metadata){};
 };
 
 /**
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 097667a..ce8ea44 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -215,7 +215,7 @@ TEST_F(InputTest, testButtonClick) {
 	bool button_clicked = false;
 	event_manager.subscribe<ButtonPressEvent>([&](const ButtonPressEvent & event) {
 		button_clicked = true;
-		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
+		EXPECT_EQ(event.metadata.game_object_id, button_obj.id);
 		return false;
 	});
 	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0});
@@ -238,12 +238,12 @@ TEST_F(InputTest, testButtonHover) {
 	bool button_hover = false;
 	event_manager.subscribe<ButtonEnterEvent>([&](const ButtonEnterEvent & event) {
 		button_hover = true;
-		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
+		EXPECT_EQ(event.metadata.game_object_id, button_obj.id);
 		return false;
 	});
 	event_manager.subscribe<ButtonExitEvent>([&](const ButtonExitEvent & event) {
 		button_hover = false;
-		EXPECT_EQ(event.meta_data.game_object_id, button_obj.id);
+		EXPECT_EQ(event.metadata.game_object_id, button_obj.id);
 		return false;
 	});
 	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0});
-- 
cgit v1.2.3