From 45c799f71e6f0db1de27bdd601c0d441f0012468 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 18 Dec 2024 14:43:41 +0100
Subject: camera space working

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

(limited to 'src/test')

diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 2d844d4..a7b1b25 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -37,10 +37,10 @@ public:
 	RenderSystem render{mediator};
 	EventManager event_manager{mediator};
 	//GameObject camera;
-
+	int offset = 100;
 protected:
 	void SetUp() override {
-		GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
+		GameObject obj = mgr.new_object("camera", "camera", vec2{offset, offset}, 0, 1);
 		auto & camera
 			= obj.add_component<Camera>(ivec2{500, 500}, vec2{500, 500},
 										Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
@@ -76,8 +76,8 @@ TEST_F(InputTest, MouseDown) {
 	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
 		mouse_triggered = true;
 		//middle of the screen = 0,0
-		EXPECT_EQ(event.mouse_pos.x, 0);
-		EXPECT_EQ(event.mouse_pos.y, 0);
+		EXPECT_EQ(event.mouse_pos.x, offset);
+		EXPECT_EQ(event.mouse_pos.y, offset);
 		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
 		return false;
 	};
@@ -101,8 +101,8 @@ TEST_F(InputTest, MouseUp) {
 	bool function_triggered = false;
 	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
 		function_triggered = true;
-		EXPECT_EQ(e.mouse_pos.x, 0);
-		EXPECT_EQ(e.mouse_pos.y, 0);
+		EXPECT_EQ(e.mouse_pos.x, offset);
+		EXPECT_EQ(e.mouse_pos.y, offset);
 		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
 		return false;
 	};
@@ -125,8 +125,8 @@ TEST_F(InputTest, MouseMove) {
 	bool function_triggered = false;
 	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
 		function_triggered = true;
-		EXPECT_EQ(e.mouse_pos.x, 0);
-		EXPECT_EQ(e.mouse_pos.y, 0);
+		EXPECT_EQ(e.mouse_pos.x, offset);
+		EXPECT_EQ(e.mouse_pos.y, offset);
 		EXPECT_EQ(e.mouse_delta.x, 10);
 		EXPECT_EQ(e.mouse_delta.y, 10);
 		return false;
@@ -199,8 +199,8 @@ TEST_F(InputTest, MouseClick) {
 	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
 		on_click_triggered = true;
 		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
-		EXPECT_EQ(event.mouse_pos.x, 0);
-		EXPECT_EQ(event.mouse_pos.y, 0);
+		EXPECT_EQ(event.mouse_pos.x, offset);
+		EXPECT_EQ(event.mouse_pos.y, offset);
 		return false;
 	};
 	event_manager.subscribe<MouseClickEvent>(on_mouse_click);
@@ -215,8 +215,8 @@ TEST_F(InputTest, testButtonClick) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
-	auto & button = button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0}, on_click);
-
+	auto & button = button_obj.add_component<Button>(vec2{10, 10}, vec2{0, 0}, on_click);
+	// button.world_space = 
 	bool hover = false;
 	button.active = true;
 	this->simulate_mouse_click(999, 999, SDL_BUTTON_LEFT);
@@ -229,7 +229,42 @@ TEST_F(InputTest, testButtonClick) {
 	event_manager.dispatch_events();
 	EXPECT_TRUE(button_clicked);
 }
+TEST_F(InputTest, buttonPositionCamera) {
+	GameObject button_obj = mgr.new_object("body", "person", vec2{50, 50}, 0, 1);
+	bool button_clicked = false;
+	std::function<void()> on_click = [&]() { button_clicked = true; };
+	auto & button = button_obj.add_component<Button>(vec2{10, 10}, vec2{0, 0}, on_click);
+	button.world_space = false;
+	bool hover = false;
+	button.active = true;
+	this->simulate_mouse_click(999, 999, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_FALSE(button_clicked);
+
+	this->simulate_mouse_click(300, 300, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_TRUE(button_clicked);
+}
+TEST_F(InputTest, buttonPositionWorld) {
+	GameObject button_obj = mgr.new_object("body", "person", vec2{50, 50}, 0, 1);
+	bool button_clicked = false;
+	std::function<void()> on_click = [&]() { button_clicked = true; };
+	auto & button = button_obj.add_component<Button>(vec2{10, 10}, vec2{0, 0}, on_click);
+	button.world_space = true;
+	bool hover = false;
+	button.active = true;
+	this->simulate_mouse_click(999, 999, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_FALSE(button_clicked);
 
+	this->simulate_mouse_click(300, 300, SDL_BUTTON_LEFT);
+	input_system.update();
+	event_manager.dispatch_events();
+	EXPECT_FALSE(button_clicked);
+}
 TEST_F(InputTest, testButtonHover) {
 	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
 	bool button_clicked = false;
-- 
cgit v1.2.3


From e20263f4c6b4c354baa301b21a6ac1fb0a7d5848 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 18 Dec 2024 14:44:01 +0100
Subject: make format

---
 src/crepe/system/InputSystem.cpp | 39 ++++++++++++++++++++++++---------------
 src/crepe/system/InputSystem.h   |  6 ++++--
 src/test/InputTest.cpp           |  3 ++-
 3 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'src/test')

diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index 12437f7..2d21572 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -26,8 +26,9 @@ void InputSystem::update() {
 	if (!curr_cam_ref) return;
 
 	Camera & current_cam = curr_cam_ref;
-	Transform & cam_transform = mgr.get_components_by_id<Transform>(current_cam.game_object_id).front();
-	
+	Transform & cam_transform
+		= mgr.get_components_by_id<Transform>(current_cam.game_object_id).front();
+
 	vec2 camera_origin = cam_transform.position + current_cam.data.postion_offset
 						 - (current_cam.viewport_size / 2);
 
@@ -83,7 +84,8 @@ void InputSystem::handle_mouse_event(const EventData & event, const vec2 & camer
 					.mouse_pos = adjusted_mouse,
 					.button = event.data.mouse_data.mouse_button,
 				});
-				this->handle_click(event.data.mouse_data.mouse_button, adjusted_mouse,current_cam);
+				this->handle_click(event.data.mouse_data.mouse_button, adjusted_mouse,
+								   current_cam);
 			}
 			break;
 		}
@@ -93,7 +95,7 @@ void InputSystem::handle_mouse_event(const EventData & event, const vec2 & camer
 				.mouse_pos = adjusted_mouse,
 				.mouse_delta = event.data.mouse_data.rel_mouse_move,
 			});
-			this->handle_move(event, adjusted_mouse,current_cam);
+			this->handle_move(event, adjusted_mouse, current_cam);
 			break;
 
 		case EventType::MOUSE_WHEEL:
@@ -151,7 +153,8 @@ void InputSystem::handle_non_mouse_event(const EventData & event) {
 	}
 }
 
-void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_pos, const Camera & current_cam) {
+void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_pos,
+							  const Camera & current_cam) {
 	ComponentManager & mgr = this->mediator.component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
@@ -159,10 +162,11 @@ void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_p
 	for (Button & button : buttons) {
 		if (!button.active) continue;
 
-		Transform & transform = mgr.get_components_by_id<Transform>(button.game_object_id).front();
-		Transform & cam_transform = mgr.get_components_by_id<Transform>(current_cam.game_object_id).front();
-		if(!button.world_space){
-
+		Transform & transform
+			= mgr.get_components_by_id<Transform>(button.game_object_id).front();
+		Transform & cam_transform
+			= mgr.get_components_by_id<Transform>(current_cam.game_object_id).front();
+		if (!button.world_space) {
 		}
 		bool was_hovering = button.hover;
 
@@ -183,11 +187,13 @@ void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_p
 	}
 }
 
-void InputSystem::handle_click(const MouseButton & mouse_button, const vec2 & mouse_pos, const Camera & current_cam) {
+void InputSystem::handle_click(const MouseButton & mouse_button, const vec2 & mouse_pos,
+							   const Camera & current_cam) {
 	ComponentManager & mgr = this->mediator.component_manager;
 
 	RefVector<Button> buttons = mgr.get_components_by_type<Button>();
-	Transform & cam_transform = mgr.get_components_by_id<Transform>(current_cam.game_object_id).front();
+	Transform & cam_transform
+		= mgr.get_components_by_id<Transform>(current_cam.game_object_id).front();
 	for (Button & button : buttons) {
 		if (!button.active) continue;
 		if (!button.on_click) continue;
@@ -202,13 +208,16 @@ void InputSystem::handle_click(const MouseButton & mouse_button, const vec2 & mo
 }
 
 bool InputSystem::is_mouse_inside_button(const vec2 & mouse_pos, const Button & button,
-										 const Transform & transform, const Transform & cam_transform) {
+										 const Transform & transform,
+										 const Transform & cam_transform) {
 	vec2 actual_pos = transform.position + button.offset;
-	if(!button.world_space){
+	if (!button.world_space) {
 		actual_pos += cam_transform.position;
 	}
 	vec2 half_dimensions = button.dimensions / 2;
 
-	return mouse_pos.x >= actual_pos.x - half_dimensions.x && mouse_pos.x <= actual_pos.x + half_dimensions.x
-		   && mouse_pos.y >= actual_pos.y - half_dimensions.y && mouse_pos.y <= actual_pos.y + half_dimensions.y;
+	return mouse_pos.x >= actual_pos.x - half_dimensions.x
+		   && mouse_pos.x <= actual_pos.x + half_dimensions.x
+		   && mouse_pos.y >= actual_pos.y - half_dimensions.y
+		   && mouse_pos.y <= actual_pos.y + half_dimensions.y;
 }
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 52b1cc4..9ab76f6 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -65,7 +65,8 @@ private:
 	*
 	* This method processes the mouse click event and triggers the corresponding button action.
 	*/
-	void handle_click(const MouseButton & mouse_button, const vec2 & mouse_pos,const Camera & current_cam);
+	void handle_click(const MouseButton & mouse_button, const vec2 & mouse_pos,
+					  const Camera & current_cam);
 
 	/**
 	* \brief Handles the mouse movement event.
@@ -76,7 +77,8 @@ private:
 	*
 	* This method processes the mouse movement event and updates the button hover state.
 	*/
-	void handle_move(const EventData & event_data, const vec2 & mouse_pos,const Camera & current_cam);
+	void handle_move(const EventData & event_data, const vec2 & mouse_pos,
+					 const Camera & current_cam);
 
 	/**
 	* \brief Checks if the mouse position is inside the bounds of the button.
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index a7b1b25..975dbd6 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -38,6 +38,7 @@ public:
 	EventManager event_manager{mediator};
 	//GameObject camera;
 	int offset = 100;
+
 protected:
 	void SetUp() override {
 		GameObject obj = mgr.new_object("camera", "camera", vec2{offset, offset}, 0, 1);
@@ -216,7 +217,7 @@ TEST_F(InputTest, testButtonClick) {
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
 	auto & button = button_obj.add_component<Button>(vec2{10, 10}, vec2{0, 0}, on_click);
-	// button.world_space = 
+	// button.world_space =
 	bool hover = false;
 	button.active = true;
 	this->simulate_mouse_click(999, 999, SDL_BUTTON_LEFT);
-- 
cgit v1.2.3


From ee6bf92b661a3762fa3886409641958f32544f88 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Wed, 18 Dec 2024 21:36:34 +0100
Subject: made test better by seperating x and y values

---
 src/test/InputTest.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/test')

diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 975dbd6..1d29cee 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -37,11 +37,11 @@ public:
 	RenderSystem render{mediator};
 	EventManager event_manager{mediator};
 	//GameObject camera;
-	int offset = 100;
-
+	int offset_x = 100;
+	int offset_y = 200;
 protected:
 	void SetUp() override {
-		GameObject obj = mgr.new_object("camera", "camera", vec2{offset, offset}, 0, 1);
+		GameObject obj = mgr.new_object("camera", "camera", vec2{offset_x, offset_y}, 0, 1);
 		auto & camera
 			= obj.add_component<Camera>(ivec2{500, 500}, vec2{500, 500},
 										Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
@@ -77,8 +77,8 @@ TEST_F(InputTest, MouseDown) {
 	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
 		mouse_triggered = true;
 		//middle of the screen = 0,0
-		EXPECT_EQ(event.mouse_pos.x, offset);
-		EXPECT_EQ(event.mouse_pos.y, offset);
+		EXPECT_EQ(event.mouse_pos.x, offset_x);
+		EXPECT_EQ(event.mouse_pos.y, offset_y);
 		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
 		return false;
 	};
@@ -102,8 +102,8 @@ TEST_F(InputTest, MouseUp) {
 	bool function_triggered = false;
 	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
 		function_triggered = true;
-		EXPECT_EQ(e.mouse_pos.x, offset);
-		EXPECT_EQ(e.mouse_pos.y, offset);
+		EXPECT_EQ(e.mouse_pos.x, offset_x);
+		EXPECT_EQ(e.mouse_pos.y, offset_y);
 		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
 		return false;
 	};
@@ -126,8 +126,8 @@ TEST_F(InputTest, MouseMove) {
 	bool function_triggered = false;
 	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
 		function_triggered = true;
-		EXPECT_EQ(e.mouse_pos.x, offset);
-		EXPECT_EQ(e.mouse_pos.y, offset);
+		EXPECT_EQ(e.mouse_pos.x, offset_x);
+		EXPECT_EQ(e.mouse_pos.y, offset_y);
 		EXPECT_EQ(e.mouse_delta.x, 10);
 		EXPECT_EQ(e.mouse_delta.y, 10);
 		return false;
@@ -200,8 +200,8 @@ TEST_F(InputTest, MouseClick) {
 	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
 		on_click_triggered = true;
 		EXPECT_EQ(event.button, MouseButton::LEFT_MOUSE);
-		EXPECT_EQ(event.mouse_pos.x, offset);
-		EXPECT_EQ(event.mouse_pos.y, offset);
+		EXPECT_EQ(event.mouse_pos.x, offset_x);
+		EXPECT_EQ(event.mouse_pos.y, offset_y);
 		return false;
 	};
 	event_manager.subscribe<MouseClickEvent>(on_mouse_click);
@@ -217,7 +217,6 @@ TEST_F(InputTest, testButtonClick) {
 	bool button_clicked = false;
 	std::function<void()> on_click = [&]() { button_clicked = true; };
 	auto & button = button_obj.add_component<Button>(vec2{10, 10}, vec2{0, 0}, on_click);
-	// button.world_space =
 	bool hover = false;
 	button.active = true;
 	this->simulate_mouse_click(999, 999, SDL_BUTTON_LEFT);
-- 
cgit v1.2.3


From 31ffbbbab541760b0574c6e6819a99575c1ce8b1 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Thu, 19 Dec 2024 21:28:38 +0100
Subject: make format

---
 src/crepe/api/Script.cpp | 1 -
 src/test/InputTest.cpp   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/test')

diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 85016f5..7531388 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -40,4 +40,3 @@ bool Script::get_key_state(Keycode key) const noexcept {
 		return false;
 	}
 }
-
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 25a1eeb..7cff34b 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -38,6 +38,7 @@ public:
 	//GameObject camera;
 	int offset_x = 100;
 	int offset_y = 200;
+
 protected:
 	void SetUp() override {
 		GameObject obj = mgr.new_object("camera", "camera", vec2{offset_x, offset_y}, 0, 1);
-- 
cgit v1.2.3