diff options
author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-11-25 11:48:39 +0100 |
---|---|---|
committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-11-25 11:48:39 +0100 |
commit | 48015cd425b26eb68eb07f4e4b1adf71e81e11b1 (patch) | |
tree | 95725bd476cf92c5749e27c44c5134902dedfc66 /src/crepe/system | |
parent | ea7d7ec301968f3a542de93f487f9501b70c0cd4 (diff) |
make format
Diffstat (limited to 'src/crepe/system')
-rw-r--r-- | src/crepe/system/InputSystem.cpp | 259 | ||||
-rw-r--r-- | src/crepe/system/InputSystem.h | 43 |
2 files changed, 153 insertions, 149 deletions
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index 1b455cd..7f7f9ec 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -1,154 +1,155 @@ -#include "ComponentManager.h" -#include "../api/EventManager.h" #include "../api/Event.h" - +#include "../api/EventManager.h" +#include "ComponentManager.h" #include "system/InputSystem.h" using namespace crepe; void InputSystem::update() { - EventManager &event_mgr = EventManager::get_instance(); - std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events(); - - for (const SDLContext::EventData &event : event_list) { - switch (event.event_type) { - case SDLContext::Event::KEYDOWN: { - event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{ - .repeat = event.key_repeat, - .key = event.key, - }); - break; - } - case SDLContext::Event::KEYUP: { - event_mgr.queue_event<KeyReleaseEvent>(KeyReleaseEvent{ - .key = event.key, - }); - break; - } - case SDLContext::Event::MOUSEDOWN: { - event_mgr.queue_event<MousePressEvent>(MousePressEvent{ - .mouse_x = event.mouse_position.first, - .mouse_y = event.mouse_position.second, - .button = event.mouse_button, - }); - last_mouse_down_position = event.mouse_position; - last_mouse_button = event.mouse_button; - break; - } - case SDLContext::Event::MOUSEUP: { - MouseReleaseEvent mouse_release_event = MouseReleaseEvent{ - .mouse_x = event.mouse_position.first, - .mouse_y = event.mouse_position.second, - .button = event.mouse_button, - }; - event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event); - - // Calculate deltas for click detection - int delta_x = event.mouse_position.first - last_mouse_down_position.first; - int delta_y = event.mouse_position.second - last_mouse_down_position.second; - - if (last_mouse_button == event.mouse_button && - std::abs(delta_x) <= click_tolerance && - std::abs(delta_y) <= click_tolerance) { - event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{ - .mouse_x = event.mouse_position.first, - .mouse_y = event.mouse_position.second, - .button = event.mouse_button, - }); - - handle_click(event); - } - break; - } - case SDLContext::Event::MOUSEMOVE: { - event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{ - .mouse_x = event.mouse_position.first, - .mouse_y = event.mouse_position.second, - .rel_x = event.rel_mouse_move.first, - .rel_y = event.rel_mouse_move.second, - }); - handle_move(event); - break; - } - case SDLContext::Event::MOUSEWHEEL: { - event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{ - .scroll_x = event.wheel_delta, - .scroll_y = 0, - .direction = event.wheel_delta, - }); - break; - } - case SDLContext::Event::SHUTDOWN: { - event_mgr.queue_event<ShutDownEvent>(ShutDownEvent{}); - break; - } - default: - break; - } - } + EventManager & event_mgr = EventManager::get_instance(); + std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events(); + + for (const SDLContext::EventData & event : event_list) { + switch (event.event_type) { + case SDLContext::Event::KEYDOWN: { + event_mgr.queue_event<KeyPressEvent>(KeyPressEvent{ + .repeat = event.key_repeat, + .key = event.key, + }); + break; + } + case SDLContext::Event::KEYUP: { + event_mgr.queue_event<KeyReleaseEvent>(KeyReleaseEvent{ + .key = event.key, + }); + break; + } + case SDLContext::Event::MOUSEDOWN: { + event_mgr.queue_event<MousePressEvent>(MousePressEvent{ + .mouse_x = event.mouse_position.first, + .mouse_y = event.mouse_position.second, + .button = event.mouse_button, + }); + last_mouse_down_position = event.mouse_position; + last_mouse_button = event.mouse_button; + break; + } + case SDLContext::Event::MOUSEUP: { + MouseReleaseEvent mouse_release_event = MouseReleaseEvent{ + .mouse_x = event.mouse_position.first, + .mouse_y = event.mouse_position.second, + .button = event.mouse_button, + }; + event_mgr.queue_event<MouseReleaseEvent>(mouse_release_event); + + // Calculate deltas for click detection + int delta_x = event.mouse_position.first - last_mouse_down_position.first; + int delta_y = event.mouse_position.second - last_mouse_down_position.second; + + if (last_mouse_button == event.mouse_button + && std::abs(delta_x) <= click_tolerance + && std::abs(delta_y) <= click_tolerance) { + event_mgr.queue_event<MouseClickEvent>(MouseClickEvent{ + .mouse_x = event.mouse_position.first, + .mouse_y = event.mouse_position.second, + .button = event.mouse_button, + }); + + handle_click(event); + } + break; + } + case SDLContext::Event::MOUSEMOVE: { + event_mgr.queue_event<MouseMoveEvent>(MouseMoveEvent{ + .mouse_x = event.mouse_position.first, + .mouse_y = event.mouse_position.second, + .rel_x = event.rel_mouse_move.first, + .rel_y = event.rel_mouse_move.second, + }); + handle_move(event); + break; + } + case SDLContext::Event::MOUSEWHEEL: { + event_mgr.queue_event<MouseScrollEvent>(MouseScrollEvent{ + .scroll_x = event.wheel_delta, + .scroll_y = 0, + .direction = event.wheel_delta, + }); + break; + } + case SDLContext::Event::SHUTDOWN: { + event_mgr.queue_event<ShutDownEvent>(ShutDownEvent{}); + break; + } + default: + break; + } + } } -void InputSystem::handle_move(const SDLContext::EventData &event_data) { - ComponentManager &mgr = this->component_manager; +void InputSystem::handle_move(const SDLContext::EventData & event_data) { + ComponentManager & mgr = this->component_manager; - std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>(); - std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>(); + std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>(); + std::vector<std::reference_wrapper<Transform>> transforms + = mgr.get_components_by_type<Transform>(); - for (Button &button : buttons) { - Transform *transform = find_transform_for_button(button, transforms); - if (!transform) - continue; + for (Button & button : buttons) { + Transform * transform = find_transform_for_button(button, transforms); + if (!transform) continue; - if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) { - button.hover = true; - } else { - button.hover = false; - } - } + if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) { + button.hover = true; + } else { + button.hover = false; + } + } } -void InputSystem::handle_click(const SDLContext::EventData &event_data) { - ComponentManager &mgr = this->component_manager; +void InputSystem::handle_click(const SDLContext::EventData & event_data) { + ComponentManager & mgr = this->component_manager; - std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>(); - std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>(); + std::vector<std::reference_wrapper<Button>> buttons = mgr.get_components_by_type<Button>(); + std::vector<std::reference_wrapper<Transform>> transforms + = mgr.get_components_by_type<Transform>(); - for (Button &button : buttons) { - Transform *transform = find_transform_for_button(button, transforms); - if (!transform) - continue; + for (Button & button : buttons) { + Transform * transform = find_transform_for_button(button, transforms); + if (!transform) continue; - if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) { - handle_button_press(button); - } - } + if (button.interactable && is_mouse_inside_button(event_data, button, *transform)) { + handle_button_press(button); + } + } } -Transform *InputSystem::find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms) { - for (Transform &transform : transforms) { - if (button.game_object_id == transform.game_object_id) { - return &transform; - } - } - return nullptr; +Transform * InputSystem::find_transform_for_button( + Button & button, std::vector<std::reference_wrapper<Transform>> & transforms) { + for (Transform & transform : transforms) { + if (button.game_object_id == transform.game_object_id) { + return &transform; + } + } + return nullptr; } -bool InputSystem::is_mouse_inside_button(const SDLContext::EventData &event_data, const Button &button, const Transform &transform) { - return event_data.mouse_position.first >= transform.position.x && - event_data.mouse_position.first <= transform.position.x + button.width && - event_data.mouse_position.second >= transform.position.y && - event_data.mouse_position.second <= transform.position.y + button.height; +bool InputSystem::is_mouse_inside_button(const SDLContext::EventData & event_data, + const Button & button, const Transform & transform) { + return event_data.mouse_position.first >= transform.position.x + && event_data.mouse_position.first <= transform.position.x + button.width + && event_data.mouse_position.second >= transform.position.y + && event_data.mouse_position.second <= transform.position.y + button.height; } -void InputSystem::handle_button_press(Button &button) { - if (button.is_toggle) { - if (!button.is_pressed && button.on_click) { - button.on_click(); - } - button.is_pressed = !button.is_pressed; - } else if (button.on_click) { - button.on_click(); - } +void InputSystem::handle_button_press(Button & button) { + if (button.is_toggle) { + if (!button.is_pressed && button.on_click) { + button.on_click(); + } + button.is_pressed = !button.is_pressed; + } else if (button.on_click) { + button.on_click(); + } } diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h index 672f225..5f94446 100644 --- a/src/crepe/system/InputSystem.h +++ b/src/crepe/system/InputSystem.h @@ -2,8 +2,8 @@ #include "System.h" -#include "../api/Event.h" #include "../api/Button.h" +#include "../api/Event.h" #include "../api/Transform.h" #include "../facade/SDLContext.h" @@ -19,64 +19,67 @@ namespace crepe { */ class InputSystem : public System { public: - using System::System; + using System::System; - /** + /** * \brief Updates the system, processing all input events. * This method processes all events and triggers corresponding actions. */ - void update() override; + void update() override; private: - //! Stores the last position of the mouse when the button was pressed. - std::pair<int, int> last_mouse_down_position{-1, -1}; + //! Stores the last position of the mouse when the button was pressed. + std::pair<int, int> last_mouse_down_position{-1, -1}; - //! Stores the last mouse button pressed. - MouseButton last_mouse_button = MouseButton::NONE; + //! Stores the last mouse button pressed. + MouseButton last_mouse_button = MouseButton::NONE; - //! The tolerance in pixels for detecting a mouse click. - const int click_tolerance = 5; + //! The tolerance in pixels for detecting a mouse click. + const int click_tolerance = 5; - /** + /** * \brief Handles the click event. * \param eventData The event data containing information about the mouse click. * * This method processes the mouse click event and triggers the corresponding button action. */ - void handle_click(const SDLContext::EventData &eventData); + void handle_click(const SDLContext::EventData & eventData); - /** + /** * \brief Handles the mouse movement event. * \param eventData The event data containing information about the mouse movement. * * This method processes the mouse movement event and updates the button hover state. */ - void handle_move(const SDLContext::EventData &eventData); + void handle_move(const SDLContext::EventData & eventData); - /** + /** * \brief Finds the transform component associated with a button. * \param button The button to find the associated transform for. * \param transforms A list of transforms to search through. * \return A pointer to the transform of the button, or nullptr if not found. */ - Transform* find_transform_for_button(Button &button, std::vector<std::reference_wrapper<Transform>> &transforms); + Transform * + find_transform_for_button(Button & button, + std::vector<std::reference_wrapper<Transform>> & transforms); - /** + /** * \brief Checks if the mouse position is inside the bounds of the button. * \param eventData The event data containing the mouse position. * \param button The button to check. * \param transform The transform component of the button. * \return True if the mouse is inside the button, false otherwise. */ - bool is_mouse_inside_button(const SDLContext::EventData &eventData, const Button &button, const Transform &transform); + bool is_mouse_inside_button(const SDLContext::EventData & eventData, const Button & button, + const Transform & transform); - /** + /** * \brief Handles the button press event, calling the on_click callback if necessary. * \param button The button being pressed. * * This method triggers the on_click action for the button when it is pressed. */ - void handle_button_press(Button &button); + void handle_button_press(Button & button); }; } // namespace crepe |