Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputSystem

1 files changed, 12 insertions, 33 deletions

diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index a6e60b5..7a28882 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -1,3 +1,4 @@
+#include "system/RenderSystem.h"
 #include <gtest/gtest.h>
 #define protected public
 #define private public
@@ -27,11 +28,21 @@ public:
 	SDLContext sdl_context{mediator};
 
 	InputSystem input_system{mediator};
+	RenderSystem render{mediator};
 	EventManager event_manager{mediator};
 	//GameObject camera;
 
 protected:
-	void SetUp() override { event_manager.clear(); }
+	void SetUp() override {
+		GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
+		auto & camera
+			= obj.add_component<Camera>(ivec2{500, 500}, vec2{500, 500},
+										Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		render.update();
+		//mediator.event_manager = event_manager;
+		//mediator.component_manager = mgr;
+		//event_manager.clear();
+	}
 
 	void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
 		SDL_Event event;
@@ -55,10 +66,6 @@ protected:
 };
 
 TEST_F(InputTest, MouseDown) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	bool mouse_triggered = false;
 	EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
 		mouse_triggered = true;
@@ -85,10 +92,6 @@ TEST_F(InputTest, MouseDown) {
 }
 
 TEST_F(InputTest, MouseUp) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	bool function_triggered = false;
 	EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
 		function_triggered = true;
@@ -113,10 +116,6 @@ TEST_F(InputTest, MouseUp) {
 }
 
 TEST_F(InputTest, MouseMove) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	bool function_triggered = false;
 	EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
 		function_triggered = true;
@@ -143,10 +142,6 @@ TEST_F(InputTest, MouseMove) {
 }
 
 TEST_F(InputTest, KeyDown) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	bool function_triggered = false;
 
 	// Define event handler for KeyPressEvent
@@ -174,10 +169,6 @@ TEST_F(InputTest, KeyDown) {
 }
 
 TEST_F(InputTest, KeyUp) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	bool function_triggered = false;
 	EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent & event) {
 		function_triggered = true;
@@ -198,10 +189,6 @@ TEST_F(InputTest, KeyUp) {
 }
 
 TEST_F(InputTest, MouseClick) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	bool on_click_triggered = false;
 	EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
 		on_click_triggered = true;
@@ -219,10 +206,6 @@ TEST_F(InputTest, MouseClick) {
 }
 
 TEST_F(InputTest, testButtonClick) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	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; };
@@ -243,10 +226,6 @@ TEST_F(InputTest, testButtonClick) {
 }
 
 TEST_F(InputTest, testButtonHover) {
-	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
-	auto & camera = obj.add_component<Camera>(
-		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
-	camera.active = true;
 	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; };