added loopTimer and eventManager to mediator and removed the singletons

9 files changed, 15 insertions, 397 deletions

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 7da9dca..60d9dc5 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -13,10 +13,7 @@ target_sources(crepe PUBLIC
 	Metadata.cpp
 	Camera.cpp
 	Animator.cpp
-	IKeyListener.cpp
-	IMouseListener.cpp
 	LoopManager.cpp
-	LoopTimer.cpp
 	Asset.cpp
 	EventHandler.cpp
 	Script.cpp
@@ -45,9 +42,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	EventHandler.h
 	EventHandler.hpp
 	Event.h
-	IKeyListener.h
-	IMouseListener.h
 	LoopManager.h
-	LoopTimer.h
 	Asset.h
 )
diff --git a/src/crepe/api/IKeyListener.cpp b/src/crepe/api/IKeyListener.cpp
deleted file mode 100644
index 8642655..0000000
--- a/src/crepe/api/IKeyListener.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "IKeyListener.h"
-
-using namespace crepe;
-
-// Constructor with specified channel
-IKeyListener::IKeyListener(event_channel_t channel)
-	: event_manager(EventManager::get_instance()) {
-	this->press_id = event_manager.subscribe<KeyPressEvent>(
-		[this](const KeyPressEvent & event) { return this->on_key_pressed(event); }, channel);
-	this->release_id = event_manager.subscribe<KeyReleaseEvent>(
-		[this](const KeyReleaseEvent & event) { return this->on_key_released(event); },
-		channel);
-}
-
-// Destructor, unsubscribe events
-IKeyListener::~IKeyListener() {
-	event_manager.unsubscribe(this->press_id);
-	event_manager.unsubscribe(this->release_id);
-}
diff --git a/src/crepe/api/IKeyListener.h b/src/crepe/api/IKeyListener.h
deleted file mode 100644
index 6ded107..0000000
--- a/src/crepe/api/IKeyListener.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include "../manager/EventManager.h"
-
-#include "Event.h"
-#include "EventHandler.h"
-
-namespace crepe {
-
-/**
- * \class IKeyListener
- * \brief Interface for keyboard event handling in the application.
- */
-class IKeyListener {
-public:
-	/**
-     * \brief Constructs an IKeyListener with a specified channel.
-     * \param channel The channel ID for event handling.
-     */
-	IKeyListener(event_channel_t channel = EventManager::CHANNEL_ALL);
-	virtual ~IKeyListener();
-	IKeyListener(const IKeyListener &) = delete;
-	IKeyListener & operator=(const IKeyListener &) = delete;
-	IKeyListener & operator=(IKeyListener &&) = delete;
-	IKeyListener(IKeyListener &&) = delete;
-
-	/**
-     * \brief Pure virtual function to handle key press events.
-     * \param event The key press event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
-	virtual bool on_key_pressed(const KeyPressEvent & event) = 0;
-
-	/**
-     * \brief Pure virtual function to handle key release events.
-     * \param event The key release event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
-	virtual bool on_key_released(const KeyReleaseEvent & event) = 0;
-
-private:
-	//! Key press event id
-	subscription_t press_id = -1;
-	//! Key release event id
-	subscription_t release_id = -1;
-	//! EventManager reference
-	EventManager & event_manager;
-};
-
-} // namespace crepe
diff --git a/src/crepe/api/IMouseListener.cpp b/src/crepe/api/IMouseListener.cpp
deleted file mode 100644
index 989aeb3..0000000
--- a/src/crepe/api/IMouseListener.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "IMouseListener.h"
-
-using namespace crepe;
-
-IMouseListener::IMouseListener(event_channel_t channel)
-	: event_manager(EventManager::get_instance()) {
-	this->click_id = event_manager.subscribe<MouseClickEvent>(
-		[this](const MouseClickEvent & event) { return this->on_mouse_clicked(event); },
-		channel);
-
-	this->press_id = event_manager.subscribe<MousePressEvent>(
-		[this](const MousePressEvent & event) { return this->on_mouse_pressed(event); },
-		channel);
-
-	this->release_id = event_manager.subscribe<MouseReleaseEvent>(
-		[this](const MouseReleaseEvent & event) { return this->on_mouse_released(event); },
-		channel);
-
-	this->move_id = event_manager.subscribe<MouseMoveEvent>(
-		[this](const MouseMoveEvent & event) { return this->on_mouse_moved(event); }, channel);
-}
-
-IMouseListener::~IMouseListener() {
-	// Unsubscribe event handlers
-	event_manager.unsubscribe(this->click_id);
-	event_manager.unsubscribe(this->press_id);
-	event_manager.unsubscribe(this->release_id);
-	event_manager.unsubscribe(this->move_id);
-}
diff --git a/src/crepe/api/IMouseListener.h b/src/crepe/api/IMouseListener.h
deleted file mode 100644
index 9e4fdf7..0000000
--- a/src/crepe/api/IMouseListener.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma once
-
-#include "../manager/EventManager.h"
-
-#include "Event.h"
-#include "EventHandler.h"
-
-namespace crepe {
-
-/**
- * \class IMouseListener
- * \brief Interface for mouse event handling in the application.
- */
-class IMouseListener {
-public:
-	/**
-     * \brief Constructs an IMouseListener with a specified channel.
-     * \param channel The channel ID for event handling.
-     */
-	IMouseListener(event_channel_t channel = EventManager::CHANNEL_ALL);
-	virtual ~IMouseListener();
-	IMouseListener & operator=(const IMouseListener &) = delete;
-	IMouseListener(const IMouseListener &) = delete;
-	IMouseListener & operator=(const IMouseListener &&) = delete;
-	IMouseListener(IMouseListener &&) = delete;
-
-	/**
-     * \brief Move assignment operator (deleted).
-     */
-	IMouseListener & operator=(IMouseListener &&) = delete;
-
-	/**
-     * \brief Handles a mouse click event.
-     * \param event The mouse click event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
-	virtual bool on_mouse_clicked(const MouseClickEvent & event) = 0;
-
-	/**
-     * \brief Handles a mouse press event.
-     * \param event The mouse press event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
-	virtual bool on_mouse_pressed(const MousePressEvent & event) = 0;
-
-	/**
-     * \brief Handles a mouse release event.
-     * \param event The mouse release event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
-	virtual bool on_mouse_released(const MouseReleaseEvent & event) = 0;
-
-	/**
-     * \brief Handles a mouse move event.
-     * \param event The mouse move event to handle.
-     * \return True if the event was handled, false otherwise.
-     */
-	virtual bool on_mouse_moved(const MouseMoveEvent & event) = 0;
-
-private:
-	//! Mouse click event id
-	subscription_t click_id = -1;
-	//! Mouse press event id
-	subscription_t press_id = -1;
-	//! Mouse release event id
-	subscription_t release_id = -1;
-	//! Mouse move event id
-	subscription_t move_id = -1;
-	//! EventManager reference
-	EventManager & event_manager;
-};
-
-} //namespace crepe
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 454afe8..69cbfaf 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -1,3 +1,4 @@
+#include <iostream>
 #include "../facade/SDLContext.h"
 
 #include "../manager/EventManager.h"
@@ -20,10 +21,8 @@ LoopManager::LoopManager() {
 	this->load_system<PhysicsSystem>();
 	this->load_system<RenderSystem>();
 	this->load_system<ScriptSystem>();
-	EventManager::get_instance().subscribe<ShutDownEvent>(
+	this->event_manager.subscribe<ShutDownEvent>(
 		[this](const ShutDownEvent & event) { return this->on_shutdown(event); });
-	this->loop_timer = make_unique<LoopTimer>();
-	this->mediator.loop_timer = *loop_timer;
 }
 
 void LoopManager::process_input() { 
@@ -38,27 +37,28 @@ void LoopManager::start() {
 void LoopManager::fixed_update() {}
 
 void LoopManager::loop() {
-	this->loop_timer->start();
+	
 
 	while (game_running) {
-		this->loop_timer->update();
+		this->loop_timer.update();
 
-		while (this->loop_timer->get_lag() >= this->loop_timer->get_fixed_delta_time()) {
+		while (this->loop_timer.get_lag() >= this->loop_timer.get_fixed_delta_time()) {
 			this->process_input();
+			event_manager.dispatch_events();
 			this->fixed_update();
-			this->loop_timer->advance_fixed_update();
+			this->loop_timer.advance_fixed_update();
 		}
 
 		this->update();
 		this->render();
-		this->loop_timer->enforce_frame_rate();
+		this->loop_timer.enforce_frame_rate();
 	}
 }
 
 void LoopManager::setup() {
 
 	this->game_running = true;
-	this->loop_timer->start();
+	this->loop_timer.start();
 }
 
 void LoopManager::render() {
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 2161dff..00f5409 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -5,10 +5,11 @@
 #include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/SceneManager.h"
+#include "../manager/EventManager.h"
+#include "../manager/LoopTimerManager.h"
 #include "../system/System.h"
 
 #include "api/Event.h"
-#include "api/LoopTimer.h"
 
 namespace crepe {
 /**
@@ -96,8 +97,10 @@ private:
 
 	//! SDL context \todo no more singletons!
 	SDLContext & sdl_context = SDLContext::get_instance();
-	//! loop timer instance
-	std::unique_ptr<LoopTimer> loop_timer;
+	//! LoopTimer instance
+	LoopTimerManager loop_timer{mediator};
+	//! EventManager instance
+	EventManager event_manager{mediator};
 
 private:
 	/**
diff --git a/src/crepe/api/LoopTimer.cpp b/src/crepe/api/LoopTimer.cpp
deleted file mode 100644
index 8fb7ce8..0000000
--- a/src/crepe/api/LoopTimer.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <chrono>
-#include <thread>
-
-#include "../facade/SDLContext.h"
-#include "../util/Log.h"
-
-#include "LoopTimer.h"
-
-using namespace crepe;
-
-LoopTimer::LoopTimer() { dbg_trace(); }
-
-void LoopTimer::start() {
-	this->last_frame_time = std::chrono::steady_clock::now();
-
-	this->elapsed_time = std::chrono::milliseconds(0);
-	// by starting the elapsed_fixed_time at (0 - fixed_delta_time) in milliseconds it calls a fixed update at the start of the loop.
-	this->elapsed_fixed_time
-		= -std::chrono::duration_cast<std::chrono::milliseconds>(fixed_delta_time);
-	this->delta_time = std::chrono::milliseconds(0);
-}
-
-void LoopTimer::update() {
-	auto current_frame_time = std::chrono::steady_clock::now();
-	// Convert to duration in seconds for delta time
-	this->delta_time = std::chrono::duration_cast<std::chrono::duration<double>>(
-		current_frame_time - last_frame_time);
-
-	if (this->delta_time > this->maximum_delta_time) {
-		this->delta_time = this->maximum_delta_time;
-	}
-	this->actual_fps = 1.0 / this->delta_time.count();
-
-	this->delta_time *= this->game_scale;
-	this->elapsed_time += this->delta_time;
-	this->last_frame_time = current_frame_time;
-}
-
-double LoopTimer::get_delta_time() const { return this->delta_time.count(); }
-
-double LoopTimer::get_current_time() const { return this->elapsed_time.count(); }
-
-void LoopTimer::advance_fixed_update() { this->elapsed_fixed_time += this->fixed_delta_time; }
-
-double LoopTimer::get_fixed_delta_time() const { return this->fixed_delta_time.count(); }
-
-void LoopTimer::set_target_fps(int fps) {
-	this->target_fps = fps;
-	// target time per frame in seconds
-	this->frame_target_time = std::chrono::duration<double>(1.0) / this->target_fps;
-}
-
-int LoopTimer::get_fps() const { return this->actual_fps; }
-
-void LoopTimer::set_game_scale(double value) { this->game_scale = value; }
-
-double LoopTimer::get_game_scale() const { return this->game_scale; }
-void LoopTimer::enforce_frame_rate() {
-	auto current_frame_time = std::chrono::steady_clock::now();
-	auto frame_duration = current_frame_time - this->last_frame_time;
-
-	// Check if frame duration is less than the target frame time
-	if (frame_duration < this->frame_target_time) {
-		auto delay_time = std::chrono::duration_cast<std::chrono::microseconds>(
-			this->frame_target_time - frame_duration);
-
-		if (delay_time.count() > 0) {
-			std::this_thread::sleep_for(delay_time);
-		}
-	}
-}
-
-double LoopTimer::get_lag() const {
-	return (this->elapsed_time - this->elapsed_fixed_time).count();
-}
diff --git a/src/crepe/api/LoopTimer.h b/src/crepe/api/LoopTimer.h
deleted file mode 100644
index c4294d7..0000000
--- a/src/crepe/api/LoopTimer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#pragma once
-
-#include <chrono>
-
-namespace crepe {
-
-class LoopTimer {
-public:
-	LoopTimer();
-	/**
-	 * \brief Get the current delta time for the current frame.
-	 *
-	 * \return Delta time in seconds since the last frame.
-	 */
-	double get_delta_time() const;
-
-	/**
-	 * \brief Get the current game time.
-	 *
-	 * \note The current game time may vary from real-world elapsed time. It is the cumulative
-	 * sum of each frame's delta time.
-	 *
-	 * \return Elapsed game time in seconds.
-	 */
-	double get_current_time() const;
-
-	/**
-	 * \brief Set the target frames per second (FPS).
-	 *
-	 * \param fps The desired frames rendered per second.
-	 */
-	void set_target_fps(int fps);
-
-	/**
-	 * \brief Get the current frames per second (FPS).
-	 *
-	 * \return Current FPS.
-	 */
-	int get_fps() const;
-
-	/**
-	 * \brief Get the current game scale.
-	 *
-	 * \return The current game scale, where 0 = paused, 1 = normal speed, and values > 1 speed
-	 * up the game.
-	 */
-	double get_game_scale() const;
-
-	/**
-	 * \brief Set the game scale.
-	 *
-	 * \param game_scale The desired game scale (0 = pause, 1 = normal speed, > 1 = speed up).
-	 */
-	void set_game_scale(double game_scale);
-
-private:
-	friend class LoopManager;
-
-	/**
-	 * \brief Start the loop timer.
-	 *
-	 * Initializes the timer to begin tracking frame times.
-	 */
-	void start();
-	/**
-	 * \brief Enforce the frame rate limit.
-	 *
-	 * Ensures that the game loop does not exceed the target FPS by delaying frame updates as
-	 * necessary.
-	 */
-	void enforce_frame_rate();
-
-	/**
-	 * \brief Get the fixed delta time for consistent updates.
-	 *
-	 * Fixed delta time is used for operations that require uniform time steps, such as physics
-	 * calculations.
-	 *
-	 * \return Fixed delta time in seconds.
-	 */
-	double get_fixed_delta_time() const;
-
-	/**
-	 * \brief Get the accumulated lag in the game loop.
-	 *
-	 * Lag represents the difference between the target frame time and the actual frame time,
-	 * useful for managing fixed update intervals.
-	 *
-	 * \return Accumulated lag in seconds.
-	 */
-	double get_lag() const;
-
-	/**
-	 * \brief Update the timer to the current frame.
-	 *
-	 * Calculates and updates the delta time for the current frame and adds it to the cumulative
-	 * game time.
-	 */
-	void update();
-
-	/**
-	 * \brief Advance the game loop by a fixed update interval.
-	 *
-	 * This method progresses the game state by a consistent, fixed time step, allowing for
-	 * stable updates independent of frame rate fluctuations.
-	 */
-	void advance_fixed_update();
-
-private:
-	//! Target frames per second
-	int target_fps = 50;
-	//! Actual frames per second
-	int actual_fps = 0;
-	//! Current game scale
-	double game_scale = 1;
-	//! Maximum delta time in seconds to avoid large jumps
-	std::chrono::duration<double> maximum_delta_time{0.25};
-	//! Delta time for the current frame in seconds
-	std::chrono::duration<double> delta_time{0.0};
-	//! Target time per frame in seconds
-	std::chrono::duration<double> frame_target_time
-		= std::chrono::duration<double>(1.0) / target_fps;
-	//! Fixed delta time for fixed updates in seconds
-	std::chrono::duration<double> fixed_delta_time = std::chrono::duration<double>(1.0) / 50.0;
-	//! Total elapsed game time in seconds
-	std::chrono::duration<double> elapsed_time{0.0};
-	//! Total elapsed time for fixed updates in seconds
-	std::chrono::duration<double> elapsed_fixed_time{0.0};
-	//! Time of the last frame
-	std::chrono::steady_clock::time_point last_frame_time;
-};
-
-} // namespace crepe