diff options
| author | HampusM <hampus@hampusmat.com> | 2022-04-30 16:28:13 +0200 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2022-06-13 17:56:58 +0200 |
| commit | 40d02748924aa7c48b04cf948204d8dacdfbbc74 (patch) | |
| tree | 4d07a3703207295799b02cef52618a8f0c820542 /src/engine | |
| parent | db6edcd473a684420e9a7611b24462df21165c1b (diff) | |
refactor: replace DI files with the yacppdic library
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/engine.hpp | 5 | ||||
| -rw-r--r-- | src/engine/graphics/window.hpp | 5 | ||||
| -rw-r--r-- | src/engine/user/cursor.hpp | 5 | ||||
| -rw-r--r-- | src/engine/user/input.hpp | 6 |
4 files changed, 13 insertions, 8 deletions
diff --git a/src/engine/engine.hpp b/src/engine/engine.hpp index c13245f..cf162d9 100644 --- a/src/engine/engine.hpp +++ b/src/engine/engine.hpp @@ -1,6 +1,5 @@ #pragma once -#include "DI/auto_wirable.hpp" #include "interfaces/command.hpp" #include "interfaces/cursor.hpp" #include "interfaces/engine.hpp" @@ -9,11 +8,13 @@ #include "interfaces/scene.hpp" #include "interfaces/window.hpp" +#include <yacppdic/auto_wirable.hpp> + #include <memory> #include <unordered_map> class CLIGameEngine : public ICLIGameEngine, - public AutoWirable< + public yacppdic::AutoWirable< ICLIGameEngine, CLIGameEngine, IGameFactory, diff --git a/src/engine/graphics/window.hpp b/src/engine/graphics/window.hpp index 69c04c3..9284e5e 100644 --- a/src/engine/graphics/window.hpp +++ b/src/engine/graphics/window.hpp @@ -1,11 +1,12 @@ #pragma once -#include "DI/auto_wirable.hpp" #include "interfaces/window.hpp" #include "engine/data/bounds.hpp" -class Window : public IWindow, public AutoWirable<IWindow, Window> +#include <yacppdic/auto_wirable.hpp> + +class Window : public IWindow, public yacppdic::AutoWirable<IWindow, Window> { public: Window() noexcept = default; diff --git a/src/engine/user/cursor.hpp b/src/engine/user/cursor.hpp index 9d614f1..080321e 100644 --- a/src/engine/user/cursor.hpp +++ b/src/engine/user/cursor.hpp @@ -1,11 +1,12 @@ #pragma once -#include "DI/auto_wirable.hpp" #include "interfaces/cursor.hpp" #include "engine/data/vector2.hpp" #include <fmt/core.h> +#include <yacppdic/auto_wirable.hpp> + #include <memory> #include <string_view> #include <unordered_map> @@ -30,7 +31,7 @@ const std::unordered_map<Vector2, std::string_view, Vector2Hasher> { Vector2::right(), MOVE_CURSOR_RIGHT } }; class CursorController : public ICursorController, - public AutoWirable<ICursorController, CursorController> + public yacppdic::AutoWirable<ICursorController, CursorController> { public: CursorController() noexcept; diff --git a/src/engine/user/input.hpp b/src/engine/user/input.hpp index 6a7bf26..c88809d 100644 --- a/src/engine/user/input.hpp +++ b/src/engine/user/input.hpp @@ -1,16 +1,18 @@ #pragma once -#include "DI/auto_wirable.hpp" #include "interfaces/input.hpp" #include "interfaces/subscriber.hpp" +#include <yacppdic/auto_wirable.hpp> + #include <array> #include <climits> #include <memory> #include <termios.h> #include <vector> -class InputHandler : public IInputHandler, public AutoWirable<IInputHandler, InputHandler> +class InputHandler : public IInputHandler, + public yacppdic::AutoWirable<IInputHandler, InputHandler> { public: InputHandler() noexcept = default; |