merge master

3 files changed, 33 insertions, 29 deletions

diff --git a/src/crepe/manager/ComponentManager.h b/src/crepe/manager/ComponentManager.h
index ad37586..44429d9 100644
--- a/src/crepe/manager/ComponentManager.h
+++ b/src/crepe/manager/ComponentManager.h
@@ -16,7 +16,7 @@ class GameObject;
 
 /**
  * \brief Manages all components
- * 
+ *
  * This class manages all components. It provides methods to add, delete and get components.
  */
 class ComponentManager : public Manager {
@@ -56,10 +56,10 @@ protected:
 	friend class GameObject;
 	/**
 	 * \brief Add a component to the ComponentManager
-	 * 
+	 *
 	 * This method adds a component to the ComponentManager. The component is created with the
 	 * given arguments and added to the ComponentManager.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \tparam Args The types of the arguments
 	 * \param id The id of the GameObject this component belongs to
@@ -70,9 +70,9 @@ protected:
 	T & add_component(game_object_id_t id, Args &&... args);
 	/**
 	 * \brief Delete all components of a specific type and id
-	 * 
+	 *
 	 * This method deletes all components of a specific type and id.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \param id The id of the GameObject this component belongs to
 	 */
@@ -80,24 +80,24 @@ protected:
 	void delete_components_by_id(game_object_id_t id);
 	/**
 	 * \brief Delete all components of a specific type
-	 * 
+	 *
 	 * This method deletes all components of a specific type.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 */
 	template <typename T>
 	void delete_components();
 	/**
 	 * \brief Delete all components of a specific id
-	 * 
+	 *
 	 * This method deletes all components of a specific id.
-	 * 
+	 *
 	 * \param id The id of the GameObject this component belongs to
 	 */
 	void delete_all_components_of_id(game_object_id_t id);
 	/**
 	 * \brief Delete all components
-	 * 
+	 *
 	 * This method deletes all components.
 	 */
 	void delete_all_components();
@@ -115,9 +115,9 @@ protected:
 public:
 	/**
 	 * \brief Get all components of a specific type and id
-	 * 
+	 *
 	 * This method gets all components of a specific type and id.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \param id The id of the GameObject this component belongs to
 	 * \return A vector of all components of the specific type and id
@@ -126,9 +126,9 @@ public:
 	RefVector<T> get_components_by_id(game_object_id_t id) const;
 	/**
 	 * \brief Get all components of a specific type
-	 * 
+	 *
 	 * This method gets all components of a specific type.
-	 * 
+	 *
 	 * \tparam T The type of the component
 	 * \return A vector of all components of the specific type
 	 */
@@ -138,7 +138,7 @@ public:
 private:
 	/**
 	 * \brief The components
-	 * 
+	 *
 	 * This unordered_map stores all components. The key is the type of the component and the
 	 * value is a vector of vectors of unique pointers to the components.
 	 *
diff --git a/src/crepe/manager/EventManager.h b/src/crepe/manager/EventManager.h
index d634f54..ba5e98b 100644
--- a/src/crepe/manager/EventManager.h
+++ b/src/crepe/manager/EventManager.h
@@ -24,7 +24,7 @@ typedef size_t event_channel_t;
 /**
  * \class EventManager
  * \brief Manages event subscriptions, triggers, and queues, enabling decoupled event handling.
- * 
+ *
  * The `EventManager` acts as a centralized event system. It allows for registering callbacks
  * for specific event types, triggering events synchronously, queueing events for later
  * processing, and managing subscriptions via unique identifiers.
@@ -35,20 +35,20 @@ public:
 
 	/**
 	 * \brief Get the singleton instance of the EventManager.
-	 * 
+	 *
 	 * This method returns the unique instance of the EventManager, creating it if it
 	 * doesn't already exist. Ensures only one instance is active in the program.
-	 * 
+	 *
 	 * \return Reference to the singleton instance of the EventManager.
 	 */
 	static EventManager & get_instance();
 
 	/**
 	 * \brief Subscribe to a specific event type.
-	 * 
+	 *
 	 * Registers a callback for a given event type and optional channel. Each callback
 	 * is assigned a unique subscription ID that can be used for later unsubscription.
-	 * 
+	 *
 	 * \tparam EventType The type of the event to subscribe to.
 	 * \param callback The callback function to be invoked when the event is triggered.
 	 * \param channel The channel number to subscribe to (default is CHANNEL_ALL, which listens to all channels).
@@ -60,18 +60,18 @@ public:
 
 	/**
 	 * \brief Unsubscribe a previously registered callback.
-	 * 
+	 *
 	 * Removes a callback from the subscription list based on its unique subscription ID.
-	 * 
+	 *
 	 * \param event_id The unique subscription ID of the callback to remove.
 	 */
 	void unsubscribe(subscription_t event_id);
 
 	/**
 	 * \brief Trigger an event immediately.
-	 * 
+	 *
 	 * Synchronously invokes all registered callbacks for the given event type on the specified channel.
-	 * 
+	 *
 	 * \tparam EventType The type of the event to trigger.
 	 * \param event The event instance to pass to the callbacks.
 	 * \param channel The channel to trigger the event on (default is CHANNEL_ALL, which triggers on all channels).
@@ -81,9 +81,9 @@ public:
 
 	/**
 	 * \brief Queue an event for later processing.
-	 * 
+	 *
 	 * Adds an event to the event queue to be processed during the next call to `dispatch_events`.
-	 * 
+	 *
 	 * \tparam EventType The type of the event to queue.
 	 * \param event The event instance to queue.
 	 * \param channel The channel to associate with the event (default is CHANNEL_ALL).
@@ -93,7 +93,7 @@ public:
 
 	/**
 	 * \brief Process all queued events.
-	 * 
+	 *
 	 * Iterates through the event queue and triggers callbacks for each queued event.
 	 * Events are removed from the queue once processed.
 	 */
@@ -101,7 +101,7 @@ public:
 
 	/**
 	 * \brief Clear all subscriptions.
-	 * 
+	 *
 	 * Removes all registered event handlers and clears the subscription list.
 	 */
 	void clear();
@@ -109,7 +109,7 @@ public:
 private:
 	/**
 	 * \brief Default constructor for the EventManager.
-	 * 
+	 *
 	 * Constructor is private to enforce the singleton pattern.
 	 */
 	EventManager() = default;
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index e9c10b1..ba0b41f 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -3,8 +3,10 @@
 #include "../util/OptionalRef.h"
 
 // TODO: remove these singletons:
+#include "../facade/SDLContext.h"
 #include "EventManager.h"
 #include "SaveManager.h"
+#include "api/LoopTimer.h"
 
 namespace crepe {
 
@@ -30,6 +32,8 @@ struct Mediator {
 	OptionalRef<SaveManager> save_manager = SaveManager::get_instance();
 	OptionalRef<EventManager> event_manager = EventManager::get_instance();
 	OptionalRef<ResourceManager> resource_manager;
+	OptionalRef<SDLContext> sdl_context = SDLContext::get_instance();
+	OptionalRef<LoopTimer> timer = LoopTimer::get_instance();
 };
 
 } // namespace crepe