Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-component

7 files changed, 207 insertions, 79 deletions

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 7196404..11b4ca9 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,6 +15,8 @@ target_sources(test_main PUBLIC
 	ValueBrokerTest.cpp
 	DBTest.cpp
 	Vector2Test.cpp
+	LoopManagerTest.cpp
+	LoopTimerTest.cpp
 	InputTest.cpp
 	ScriptEventTest.cpp
 	ScriptSceneTest.cpp
diff --git a/src/test/CollisionTest.cpp b/src/test/CollisionTest.cpp
index dd45eb6..5dbc670 100644
--- a/src/test/CollisionTest.cpp
+++ b/src/test/CollisionTest.cpp
@@ -50,6 +50,7 @@ public:
 class CollisionTest : public Test {
 public:
 	Mediator m;
+	EventManager event_mgr{m};
 	ComponentManager mgr{m};
 	CollisionSystem collision_sys{m};
 	ScriptSystem script_sys{m};
diff --git a/src/test/EventTest.cpp b/src/test/EventTest.cpp
index 4a4872d..82272b5 100644
--- a/src/test/EventTest.cpp
+++ b/src/test/EventTest.cpp
@@ -1,56 +1,41 @@
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <crepe/api/Event.h>
-#include <crepe/api/IKeyListener.h>
-#include <crepe/api/IMouseListener.h>
 #include <crepe/manager/EventManager.h>
-
+#include <crepe/manager/Mediator.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 using namespace std;
 using namespace std::chrono_literals;
 using namespace crepe;
 
 class EventManagerTest : public ::testing::Test {
 protected:
+	Mediator mediator;
+	EventManager event_mgr{mediator};
 	void SetUp() override {
 		// Clear any existing subscriptions or events before each test
-		EventManager::get_instance().clear();
+		event_mgr.clear();
 	}
 
 	void TearDown() override {
 		// Ensure cleanup after each test
-		EventManager::get_instance().clear();
+		event_mgr.clear();
 	}
 };
-class MockKeyListener : public IKeyListener {
-public:
-	MOCK_METHOD(bool, on_key_pressed, (const KeyPressEvent & event), (override));
-	MOCK_METHOD(bool, on_key_released, (const KeyReleaseEvent & event), (override));
-};
-
-class MockMouseListener : public IMouseListener {
-public:
-	MOCK_METHOD(bool, on_mouse_clicked, (const MouseClickEvent & event), (override));
-	MOCK_METHOD(bool, on_mouse_pressed, (const MousePressEvent & event), (override));
-	MOCK_METHOD(bool, on_mouse_released, (const MouseReleaseEvent & event), (override));
-	MOCK_METHOD(bool, on_mouse_moved, (const MouseMoveEvent & event), (override));
-};
-
 TEST_F(EventManagerTest, EventSubscription) {
 	EventHandler<KeyPressEvent> key_handler = [](const KeyPressEvent & e) { return true; };
 
 	// Subscribe to KeyPressEvent
-	EventManager::get_instance().subscribe<KeyPressEvent>(key_handler, 1);
+	event_mgr.subscribe<KeyPressEvent>(key_handler, 1);
 
 	// Verify subscription (not directly verifiable; test by triggering event)
 
-	EventManager::get_instance().trigger_event<KeyPressEvent>(
+	event_mgr.trigger_event<KeyPressEvent>(
 		KeyPressEvent{
 			.repeat = true,
 			.key = Keycode::A,
 		},
 		1);
-	EventManager::get_instance().trigger_event<KeyPressEvent>(
+	event_mgr.trigger_event<KeyPressEvent>(
 		KeyPressEvent{
 			.repeat = true,
 			.key = Keycode::A,
@@ -68,13 +53,11 @@ TEST_F(EventManagerTest, EventManagerTest_trigger_all_channels) {
 		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
 		return false;
 	};
-	EventManager::get_instance().subscribe<MouseClickEvent>(mouse_handler,
-															EventManager::CHANNEL_ALL);
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler, EventManager::CHANNEL_ALL);
 
 	MouseClickEvent click_event{
 		.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE};
-	EventManager::get_instance().trigger_event<MouseClickEvent>(click_event,
-																EventManager::CHANNEL_ALL);
+	event_mgr.trigger_event<MouseClickEvent>(click_event, EventManager::CHANNEL_ALL);
 
 	EXPECT_TRUE(triggered);
 }
@@ -88,19 +71,17 @@ TEST_F(EventManagerTest, EventManagerTest_trigger_one_channel) {
 		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
 		return false;
 	};
-	EventManager::get_instance().subscribe<MouseClickEvent>(mouse_handler, test_channel);
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler, test_channel);
 
 	MouseClickEvent click_event{
 		.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE};
-	EventManager::get_instance().trigger_event<MouseClickEvent>(click_event,
-																EventManager::CHANNEL_ALL);
+	event_mgr.trigger_event<MouseClickEvent>(click_event, EventManager::CHANNEL_ALL);
 
 	EXPECT_FALSE(triggered);
-	EventManager::get_instance().trigger_event<MouseClickEvent>(click_event, test_channel);
+	event_mgr.trigger_event<MouseClickEvent>(click_event, test_channel);
 }
 
 TEST_F(EventManagerTest, EventManagerTest_callback_propagation) {
-	EventManager & event_manager = EventManager::get_instance();
 
 	// Flags to track handler calls
 	bool triggered_true = false;
@@ -126,11 +107,11 @@ TEST_F(EventManagerTest, EventManagerTest_callback_propagation) {
 	// Test event
 	MouseClickEvent click_event{
 		.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE};
-	event_manager.subscribe<MouseClickEvent>(mouse_handler_true, EventManager::CHANNEL_ALL);
-	event_manager.subscribe<MouseClickEvent>(mouse_handler_false, EventManager::CHANNEL_ALL);
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler_true, EventManager::CHANNEL_ALL);
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler_false, EventManager::CHANNEL_ALL);
 
 	// Trigger event
-	event_manager.trigger_event<MouseClickEvent>(click_event, EventManager::CHANNEL_ALL);
+	event_mgr.trigger_event<MouseClickEvent>(click_event, EventManager::CHANNEL_ALL);
 
 	// Check that only the true handler was triggered
 	EXPECT_TRUE(triggered_true);
@@ -139,12 +120,12 @@ TEST_F(EventManagerTest, EventManagerTest_callback_propagation) {
 	// Reset and clear
 	triggered_true = false;
 	triggered_false = false;
-	event_manager.clear();
-	event_manager.subscribe<MouseClickEvent>(mouse_handler_false, EventManager::CHANNEL_ALL);
-	event_manager.subscribe<MouseClickEvent>(mouse_handler_true, EventManager::CHANNEL_ALL);
+	event_mgr.clear();
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler_false, EventManager::CHANNEL_ALL);
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler_true, EventManager::CHANNEL_ALL);
 
 	// Trigger event again
-	event_manager.trigger_event<MouseClickEvent>(click_event, EventManager::CHANNEL_ALL);
+	event_mgr.trigger_event<MouseClickEvent>(click_event, EventManager::CHANNEL_ALL);
 
 	// Check that both handlers were triggered
 	EXPECT_TRUE(triggered_true);
@@ -152,47 +133,37 @@ TEST_F(EventManagerTest, EventManagerTest_callback_propagation) {
 }
 
 TEST_F(EventManagerTest, EventManagerTest_queue_dispatch) {
-	EventManager & event_manager = EventManager::get_instance();
 	bool triggered1 = false;
 	bool triggered2 = false;
 	int test_channel = 1;
-
-	// Adjusted to use KeyPressEvent with repeat as the first variable
-	EventHandler<KeyPressEvent> key_handler1 = [&](const KeyPressEvent & e) {
+	EventHandler<MouseClickEvent> mouse_handler1 = [&](const MouseClickEvent & e) {
 		triggered1 = true;
-		EXPECT_EQ(e.repeat, false); // Expecting repeat to be false
-		EXPECT_EQ(e.key, Keycode::A); // Adjust expected key code
+		EXPECT_EQ(e.mouse_x, 100);
+		EXPECT_EQ(e.mouse_y, 200);
+		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
 		return false; // Allows propagation
 	};
-
-	EventHandler<KeyPressEvent> key_handler2 = [&](const KeyPressEvent & e) {
+	EventHandler<MouseClickEvent> mouse_handler2 = [&](const MouseClickEvent & e) {
 		triggered2 = true;
-		EXPECT_EQ(e.repeat, false); // Expecting repeat to be false
-		EXPECT_EQ(e.key, Keycode::A); // Adjust expected key code
+		EXPECT_EQ(e.mouse_x, 100);
+		EXPECT_EQ(e.mouse_y, 200);
+		EXPECT_EQ(e.button, MouseButton::LEFT_MOUSE);
 		return false; // Allows propagation
 	};
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler1);
+	event_mgr.subscribe<MouseClickEvent>(mouse_handler2, test_channel);
 
-	// Subscribe handlers to KeyPressEvent
-	event_manager.subscribe<KeyPressEvent>(key_handler1);
-	event_manager.subscribe<KeyPressEvent>(key_handler2, test_channel);
-
-	// Queue a KeyPressEvent instead of KeyDownEvent
-	event_manager.queue_event<KeyPressEvent>(KeyPressEvent{
-		.repeat = false, .key = Keycode::A}); // Adjust event with repeat flag first
-
-	event_manager.queue_event<KeyPressEvent>(
-		KeyPressEvent{.repeat = false,
-					  .key = Keycode::A}, // Adjust event for second subscription
+	event_mgr.queue_event<MouseClickEvent>(
+		MouseClickEvent{.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE});
+	event_mgr.queue_event<MouseClickEvent>(
+		MouseClickEvent{.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE},
 		test_channel);
-
-	event_manager.dispatch_events();
-
+	event_mgr.dispatch_events();
 	EXPECT_TRUE(triggered1);
 	EXPECT_TRUE(triggered2);
 }
 
 TEST_F(EventManagerTest, EventManagerTest_unsubscribe) {
-	EventManager & event_manager = EventManager::get_instance();
 
 	// Flags to track if handlers are triggered
 	bool triggered1 = false;
@@ -215,15 +186,15 @@ TEST_F(EventManagerTest, EventManagerTest_unsubscribe) {
 		return false; // Allows propagation
 	};
 	// Subscribe handlers
-	subscription_t handler1_id = event_manager.subscribe<MouseClickEvent>(mouse_handler1);
-	subscription_t handler2_id = event_manager.subscribe<MouseClickEvent>(mouse_handler2);
+	subscription_t handler1_id = event_mgr.subscribe<MouseClickEvent>(mouse_handler1);
+	subscription_t handler2_id = event_mgr.subscribe<MouseClickEvent>(mouse_handler2);
 
 	// Queue events
-	event_manager.queue_event<MouseClickEvent>(
+	event_mgr.queue_event<MouseClickEvent>(
 		MouseClickEvent{.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE});
 
 	// Dispatch events - both handlers should be triggered
-	event_manager.dispatch_events();
+	event_mgr.dispatch_events();
 	EXPECT_TRUE(triggered1); // Handler 1 should be triggered
 	EXPECT_TRUE(triggered2); // Handler 2 should be triggered
 
@@ -232,14 +203,14 @@ TEST_F(EventManagerTest, EventManagerTest_unsubscribe) {
 	triggered2 = false;
 
 	// Unsubscribe handler1
-	event_manager.unsubscribe(handler1_id);
+	event_mgr.unsubscribe(handler1_id);
 
 	// Queue the same event again
-	event_manager.queue_event<MouseClickEvent>(
+	event_mgr.queue_event<MouseClickEvent>(
 		MouseClickEvent{.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE});
 
 	// Dispatch events - only handler 2 should be triggered, handler 1 should NOT
-	event_manager.dispatch_events();
+	event_mgr.dispatch_events();
 	EXPECT_FALSE(triggered1); // Handler 1 should NOT be triggered
 	EXPECT_TRUE(triggered2); // Handler 2 should be triggered
 
@@ -247,14 +218,14 @@ TEST_F(EventManagerTest, EventManagerTest_unsubscribe) {
 	triggered2 = false;
 
 	// Unsubscribe handler2
-	event_manager.unsubscribe(handler2_id);
+	event_mgr.unsubscribe(handler2_id);
 
 	// Queue the event again
-	event_manager.queue_event<MouseClickEvent>(
+	event_mgr.queue_event<MouseClickEvent>(
 		MouseClickEvent{.mouse_x = 100, .mouse_y = 200, .button = MouseButton::LEFT_MOUSE});
 
 	// Dispatch events - no handler should be triggered
-	event_manager.dispatch_events();
+	event_mgr.dispatch_events();
 	EXPECT_FALSE(triggered1); // Handler 1 should NOT be triggered
 	EXPECT_FALSE(triggered2); // Handler 2 should NOT be triggered
 }
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 4c05e56..29ef941 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -27,8 +27,7 @@ public:
 	SDLContext sdl_context{mediator};
 
 	InputSystem input_system{mediator};
-
-	EventManager & event_manager = EventManager::get_instance();
+	EventManager event_manager{mediator};
 	//GameObject camera;
 
 protected:
diff --git a/src/test/LoopManagerTest.cpp b/src/test/LoopManagerTest.cpp
new file mode 100644
index 0000000..af89d64
--- /dev/null
+++ b/src/test/LoopManagerTest.cpp
@@ -0,0 +1,76 @@
+#include <chrono>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <thread>
+#define private public
+#define protected public
+#include <crepe/api/LoopManager.h>
+#include <crepe/manager/EventManager.h>
+#include <crepe/manager/LoopTimerManager.h>
+using namespace std::chrono;
+using namespace crepe;
+
+class LoopManagerTest : public ::testing::Test {
+protected:
+	class TestGameLoop : public crepe::LoopManager {
+	public:
+		MOCK_METHOD(void, fixed_update, (), (override));
+		MOCK_METHOD(void, frame_update, (), (override));
+	};
+
+	TestGameLoop test_loop;
+	void SetUp() override {}
+};
+
+TEST_F(LoopManagerTest, FixedUpdate) {
+	// Arrange
+	test_loop.loop_timer.set_target_framerate(60);
+
+	// Set expectations for the mock calls
+	EXPECT_CALL(test_loop, frame_update).Times(::testing::Between(55, 65));
+	EXPECT_CALL(test_loop, fixed_update).Times(::testing::Between(48, 52));
+
+	// Start the loop in a separate thread
+	std::thread loop_thread([&]() { test_loop.start(); });
+
+	// Let the loop run for exactly 1 second
+	std::this_thread::sleep_for(std::chrono::seconds(1));
+
+	// Stop the game loop
+	test_loop.game_running = false;
+	// Wait for the loop thread to finish
+	loop_thread.join();
+
+	// Test finished
+}
+TEST_F(LoopManagerTest, ScaledFixedUpdate) {
+	// Arrange
+	test_loop.loop_timer.set_target_framerate(60);
+
+	// Set expectations for the mock calls
+	EXPECT_CALL(test_loop, frame_update).Times(::testing::Between(55, 65));
+	EXPECT_CALL(test_loop, fixed_update).Times(::testing::Between(48, 52));
+
+	// Start the loop in a separate thread
+	std::thread loop_thread([&]() { test_loop.start(); });
+
+	// Let the loop run for exactly 1 second
+	std::this_thread::sleep_for(std::chrono::seconds(1));
+
+	// Stop the game loop
+	test_loop.game_running = false;
+	// Wait for the loop thread to finish
+	loop_thread.join();
+
+	// Test finished
+}
+TEST_F(LoopManagerTest, ShutDown) {
+	// Arrange
+	test_loop.loop_timer.set_target_framerate(60);
+	// Start the loop in a separate thread
+	std::thread loop_thread([&]() { test_loop.start(); });
+	std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	test_loop.event_manager.trigger_event<ShutDownEvent>(ShutDownEvent{});
+	// Wait for the loop thread to finish
+	loop_thread.join();
+}
diff --git a/src/test/LoopTimerTest.cpp b/src/test/LoopTimerTest.cpp
new file mode 100644
index 0000000..5e1eccf
--- /dev/null
+++ b/src/test/LoopTimerTest.cpp
@@ -0,0 +1,78 @@
+#include <chrono>
+#include <gtest/gtest.h>
+#include <thread>
+#define private public
+#define protected public
+#include <crepe/manager/LoopTimerManager.h>
+#include <crepe/manager/Mediator.h>
+using namespace std::chrono;
+using namespace crepe;
+
+class LoopTimerTest : public ::testing::Test {
+protected:
+	Mediator mediator;
+	LoopTimerManager loop_timer{mediator};
+
+	void SetUp() override { loop_timer.start(); }
+};
+
+TEST_F(LoopTimerTest, EnforcesTargetFrameRate) {
+	// Set the target FPS to 60 (which gives a target time per frame of ~16.67 ms)
+	loop_timer.set_target_framerate(60);
+
+	auto start_time = steady_clock::now();
+	loop_timer.enforce_frame_rate();
+
+	auto elapsed_time = steady_clock::now() - start_time;
+	auto elapsed_ms = duration_cast<milliseconds>(elapsed_time).count();
+
+	// For 60 FPS, the target frame time is around 16.67ms
+	ASSERT_NEAR(elapsed_ms, 16.7, 1);
+}
+
+TEST_F(LoopTimerTest, SetTargetFps) {
+	// Set the target FPS to 120
+	loop_timer.set_target_framerate(120);
+
+	// Calculate the expected frame time (~8.33ms per frame)
+	duration_t expected_frame_time = std::chrono::duration<float>(1.0 / 120.0);
+
+	ASSERT_NEAR(loop_timer.frame_target_time.count(), expected_frame_time.count(), 0.001);
+}
+
+TEST_F(LoopTimerTest, DeltaTimeCalculation) {
+	// Set the target FPS to 60 (16.67 ms per frame)
+	loop_timer.set_target_framerate(60);
+
+	auto start_time = steady_clock::now();
+	loop_timer.update();
+	auto end_time = steady_clock::now();
+
+	// Check the delta time
+	duration_t delta_time = loop_timer.get_delta_time();
+
+	auto elapsed_time = duration_cast<seconds>(end_time - start_time).count();
+
+	// Assert that delta_time is close to the elapsed time
+	ASSERT_NEAR(delta_time.count(), elapsed_time, 1);
+}
+
+TEST_F(LoopTimerTest, getCurrentTime) {
+	// Set the target FPS to 60 (16.67 ms per frame)
+	loop_timer.set_target_framerate(60);
+
+	auto start_time = steady_clock::now();
+
+	// Sleep
+	std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+	loop_timer.update();
+
+	auto end_time = steady_clock::now();
+
+	// Get the elapsed time in seconds as a double
+	auto elapsed_time
+		= std::chrono::duration_cast<elapsed_time_t>(end_time - start_time).count();
+
+	ASSERT_NEAR(loop_timer.get_elapsed_time().count(), elapsed_time, 5);
+}
diff --git a/src/test/ScriptTest.h b/src/test/ScriptTest.h
index 309e016..31fa7c9 100644
--- a/src/test/ScriptTest.h
+++ b/src/test/ScriptTest.h
@@ -6,8 +6,8 @@
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Script.h>
 #include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/EventManager.h>
 #include <crepe/system/ScriptSystem.h>
-
 class ScriptTest : public testing::Test {
 protected:
 	crepe::Mediator mediator;
@@ -16,6 +16,7 @@ protected:
 public:
 	crepe::ComponentManager component_manager{mediator};
 	crepe::ScriptSystem system{mediator};
+	crepe::EventManager event_mgr{mediator};
 	crepe::GameObject entity = component_manager.new_object(OBJ_NAME);
 
 	class MyScript : public crepe::Script {