From 34218886689a57004576486976038027732d8bcc Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Thu, 28 Nov 2024 09:02:02 +0100 Subject: make format --- src/crepe/api/Button.cpp | 4 +-- src/crepe/api/Button.h | 8 +++--- src/crepe/system/InputSystem.cpp | 57 ++++++++++++++++++++-------------------- src/test/InputTest.cpp | 8 +++--- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp index a27ff53..d325014 100644 --- a/src/crepe/api/Button.cpp +++ b/src/crepe/api/Button.cpp @@ -2,8 +2,8 @@ namespace crepe { -Button::Button(game_object_id_t id, int width, int height, std::function on_click, bool is_toggle - ) +Button::Button(game_object_id_t id, int width, int height, std::function on_click, + bool is_toggle) : UiObject(id, width, height), is_toggle(is_toggle), on_click(on_click) {} diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h index 1410529..18f3def 100644 --- a/src/crepe/api/Button.h +++ b/src/crepe/api/Button.h @@ -24,7 +24,8 @@ public: * \param is_toggle Optional flag to indicate if the button is a toggle button. Defaults to false. * \param on_click callback function that will be invoked when the button is clicked. */ - Button(game_object_id_t id, int width, int height, std::function on_click, bool is_toggle = false); + Button(game_object_id_t id, int width, int height, std::function on_click, + bool is_toggle = false); /** * \brief Indicates if the button is a toggle button (can be pressed and released). @@ -41,7 +42,7 @@ public: * function that matches the signature `void()`. */ std::function on_click; - + /** * \brief Callback function to be executed when the mouse enters the button's boundaries. * @@ -57,7 +58,8 @@ public: * allowing custom actions like resetting visual effects or playing exit-related effects. */ std::function on_exit; - private: + +private: friend class InputSystem; /** * \brief Indicates whether the button is currently pressed. diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index 4695620..beeef87 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -80,46 +80,45 @@ void InputSystem::update() { } void InputSystem::handle_move(const SDLContext::EventData & event_data) { - ComponentManager & mgr = this->component_manager; + ComponentManager & mgr = this->component_manager; - RefVector