diff options
Diffstat (limited to 'src/crepe/system')
-rw-r--r-- | src/crepe/system/InputSystem.cpp | 6 | ||||
-rw-r--r-- | src/crepe/system/InputSystem.h | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index 5d1537d..e42eaeb 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -155,7 +155,7 @@ void InputSystem::handle_non_mouse_event(const EventData & event) { void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_pos) { ComponentManager & mgr = this->mediator.component_manager; - EventManager& event_mgr = this->mediator.event_manager; + EventManager & event_mgr = this->mediator.event_manager; RefVector<Button> buttons = mgr.get_components_by_type<Button>(); for (Button & button : buttons) { @@ -183,9 +183,9 @@ void InputSystem::handle_move(const EventData & event_data, const vec2 & mouse_p void InputSystem::handle_click(const MouseButton & mouse_button, const vec2 & mouse_pos) { ComponentManager & mgr = this->mediator.component_manager; - EventManager& event_mgr = this->mediator.event_manager; + EventManager & event_mgr = this->mediator.event_manager; RefVector<Button> buttons = mgr.get_components_by_type<Button>(); - + for (Button & button : buttons) { if (!button.active) continue; RefVector<Metadata> metadata_vec diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h index 9cad178..5afe641 100644 --- a/src/crepe/system/InputSystem.h +++ b/src/crepe/system/InputSystem.h @@ -3,11 +3,10 @@ #include "../api/Config.h" #include "../facade/EventData.h" +#include "../api/Event.h" +#include "../api/Metadata.h" #include "../types.h" #include "../util/OptionalRef.h" -#include "../api/Metadata.h" -#include "../api/Event.h" - #include "System.h" @@ -21,18 +20,19 @@ class Transform; */ class ButtonPressEvent : public Event { public: - const Metadata& meta_data; - ButtonPressEvent(const Metadata& meta_data) : meta_data(meta_data){};; + const Metadata & meta_data; + ButtonPressEvent(const Metadata & meta_data) : meta_data(meta_data){}; + ; }; class ButtonEnterEvent : public Event { public: - const Metadata& meta_data; - ButtonEnterEvent(const Metadata& meta_data) : meta_data(meta_data){}; + const Metadata & meta_data; + ButtonEnterEvent(const Metadata & meta_data) : meta_data(meta_data){}; }; class ButtonExitEvent : public Event { public: - const Metadata& meta_data; - ButtonExitEvent(const Metadata& meta_data) : meta_data(meta_data){}; + const Metadata & meta_data; + ButtonExitEvent(const Metadata & meta_data) : meta_data(meta_data){}; }; /** |