diff options
author | JAROWMR <jarorutjes07@gmail.com> | 2024-12-11 20:12:12 +0100 |
---|---|---|
committer | JAROWMR <jarorutjes07@gmail.com> | 2024-12-11 20:12:12 +0100 |
commit | c90423d5c9d38ae426c168e52994a4fd63e6f266 (patch) | |
tree | fa18eae598cf0fccbb0f2dffd3e1d76fedaed53a /src/crepe/manager/Mediator.h | |
parent | 9b4f6f24f29e8873a14989ba8c9fccfbc460af7f (diff) | |
parent | 194ee3f192c3343c3ccc28dfa97fed180503ffd4 (diff) |
merge master
Diffstat (limited to 'src/crepe/manager/Mediator.h')
-rw-r--r-- | src/crepe/manager/Mediator.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h index 8094d80..a336410 100644 --- a/src/crepe/manager/Mediator.h +++ b/src/crepe/manager/Mediator.h @@ -2,16 +2,15 @@ #include "../util/OptionalRef.h" -// TODO: remove these singletons: -#include "../facade/SDLContext.h" -#include "EventManager.h" -#include "SaveManager.h" -#include "api/LoopTimer.h" - namespace crepe { class ComponentManager; class SceneManager; +class EventManager; +class LoopTimerManager; +class SaveManager; +class ResourceManager; +class SDLContext; /** * Struct to pass references to classes that would otherwise need to be singletons down to @@ -26,12 +25,13 @@ class SceneManager; * \warning This class should never be directly accessible from the API */ struct Mediator { + OptionalRef<SDLContext> sdl_context; OptionalRef<ComponentManager> component_manager; OptionalRef<SceneManager> scene_manager; - OptionalRef<SaveManager> save_manager = SaveManager::get_instance(); - OptionalRef<EventManager> event_manager = EventManager::get_instance(); - OptionalRef<SDLContext> sdl_context = SDLContext::get_instance(); - OptionalRef<LoopTimer> timer = LoopTimer::get_instance(); + OptionalRef<EventManager> event_manager; + OptionalRef<LoopTimerManager> loop_timer; + OptionalRef<SaveManager> save_manager; + OptionalRef<ResourceManager> resource_manager; }; } // namespace crepe |