merge master

1 files changed, 10 insertions, 10 deletions

diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index a7c0157..29ef941 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -24,10 +24,10 @@ class InputTest : public ::testing::Test {
 public:
 	Mediator mediator;
 	ComponentManager mgr{mediator};
+	SDLContext sdl_context{mediator};
 
 	InputSystem input_system{mediator};
-
-	EventManager & event_manager = EventManager::get_instance();
+	EventManager event_manager{mediator};
 	//GameObject camera;
 
 protected:
@@ -61,7 +61,7 @@ protected:
 TEST_F(InputTest, MouseDown) {
 	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
 	auto & camera = obj.add_component<Camera>(
-		ivec2{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		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) {
@@ -91,7 +91,7 @@ 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{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		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) {
@@ -119,7 +119,7 @@ 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{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		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) {
@@ -149,7 +149,7 @@ 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{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
 	camera.active = true;
 	bool function_triggered = false;
 
@@ -180,7 +180,7 @@ 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{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		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) {
@@ -204,7 +204,7 @@ 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{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		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) {
@@ -225,7 +225,7 @@ 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{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		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;
@@ -252,7 +252,7 @@ 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{100, 100}, vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+		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;