From e0eaff89b5f3f289bf5d560ea64b969c90d32d18 Mon Sep 17 00:00:00 2001 From: HampusM Date: Tue, 8 Mar 2022 17:00:18 +0100 Subject: refactor: add cursor controller interface --- src/game/input_configurator.cpp | 4 ++-- src/game/input_configurator.hpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/game') diff --git a/src/game/input_configurator.cpp b/src/game/input_configurator.cpp index ea1ee75..76e5b66 100644 --- a/src/game/input_configurator.cpp +++ b/src/game/input_configurator.cpp @@ -8,7 +8,7 @@ void exit_success() exit(EXIT_SUCCESS); } -auto move_cursor(const Vector2 &direction, CursorController &cursor_controller) +auto move_cursor(const Vector2 &direction, ICursorController &cursor_controller) { return [direction, &cursor_controller]() { @@ -18,7 +18,7 @@ auto move_cursor(const Vector2 &direction, CursorController &cursor_controller) } // namespace InputActions -InputConfigurator::InputConfigurator(std::shared_ptr cursor_controller) +InputConfigurator::InputConfigurator(std::shared_ptr cursor_controller) : _cursor_controller(std::move(cursor_controller)) { } diff --git a/src/game/input_configurator.hpp b/src/game/input_configurator.hpp index 8e5b9bf..fa501c7 100644 --- a/src/game/input_configurator.hpp +++ b/src/game/input_configurator.hpp @@ -1,11 +1,11 @@ #pragma once #include "DI/auto_wirable.hpp" +#include "interfaces/cursor.hpp" #include "interfaces/input.hpp" #include "interfaces/input_configurator.hpp" #include "engine/data/vector2.hpp" -#include "engine/user/cursor.hpp" #include #include @@ -13,7 +13,7 @@ namespace InputActions { -auto move_cursor(const Vector2 &direction, CursorController &cursor_controller); +auto move_cursor(const Vector2 &direction, ICursorController &cursor_controller); void exit_success(); @@ -21,13 +21,13 @@ void exit_success(); class InputConfigurator : public IInputConfigurator, - public AutoWirable + public AutoWirable { public: - explicit InputConfigurator(std::shared_ptr cursor_controller); + explicit InputConfigurator(std::shared_ptr cursor_controller); void configure(IInputHandler &input_handler) override; private: - std::shared_ptr _cursor_controller; + std::shared_ptr _cursor_controller; }; -- cgit v1.2.3-18-g5258