From ea7d7ec301968f3a542de93f487f9501b70c0cd4 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Mon, 25 Nov 2024 11:48:01 +0100 Subject: code standard fixing --- src/crepe/api/Button.cpp | 5 ++ src/crepe/api/Button.h | 49 +++++++++++---- src/crepe/api/CMakeLists.txt | 2 + src/crepe/api/EventManager.hpp | 2 +- src/crepe/api/UiObject.cpp | 5 ++ src/crepe/api/UiObject.h | 32 +++++++--- src/crepe/facade/SDLContext.cpp | 4 +- src/crepe/system/InputSystem.cpp | 131 +++++++++++++++++++-------------------- src/crepe/system/InputSystem.h | 74 ++++++++++++++++++---- src/test/inputTest.cpp | 22 ++++--- 10 files changed, 216 insertions(+), 110 deletions(-) create mode 100644 src/crepe/api/Button.cpp create mode 100644 src/crepe/api/UiObject.cpp diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp new file mode 100644 index 0000000..70f749d --- /dev/null +++ b/src/crepe/api/Button.cpp @@ -0,0 +1,5 @@ +#include "Button.h" + +using namespace crepe; + +Button::Button(game_object_id_t id) : UiObject(id){} diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h index f533452..f769d58 100644 --- a/src/crepe/api/Button.h +++ b/src/crepe/api/Button.h @@ -1,19 +1,44 @@ #pragma once + #include -#include "Component.h" -#include "api/EventHandler.h" -#include "api/UiObject.h" +#include "UiObject.h" + namespace crepe { -class Button : public UiObject{ + +/** + * \class Button + * \brief Represents a clickable UI button, derived from the UiObject class. + */ +class Button : public UiObject { public: - Button(game_object_id_t id) : UiObject(id){}; - bool interactable = true; - bool is_toggle = false; - bool is_pressed = false; - bool hover = false; - std::function on_click; + /** + * \brief Constructs a Button with the specified game object ID. + * \param id The unique ID of the game object associated with this button. + */ + Button(game_object_id_t id); + + //! Indicates if the button is interactable (can be clicked). + bool interactable = true; + + //! Indicates if the button is a toggle button (can be pressed and released). + bool is_toggle = false; + + //! Indicates whether the button is currently pressed. + bool is_pressed = false; + + //! Indicates whether the mouse is currently hovering over the button. + bool hover = false; + + //! The callback function to be executed when the button is clicked. + std::function on_click; + public: -virtual int get_instances_max() const { return 1; } + /** + * \brief Retrieves the maximum number of instances allowed for this button type. + * \return Always returns 1, as only a single instance is allowed. + */ + virtual int get_instances_max() const override { return 1; } }; -} + +} // namespace crepe diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index fc27fa0..aeb451d 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -23,6 +23,8 @@ target_sources(crepe PUBLIC Asset.cpp EventHandler.cpp Script.cpp + Button.cpp + UiObject.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES diff --git a/src/crepe/api/EventManager.hpp b/src/crepe/api/EventManager.hpp index 3eae90a..a5f4556 100644 --- a/src/crepe/api/EventManager.hpp +++ b/src/crepe/api/EventManager.hpp @@ -1,5 +1,5 @@ #pragma once -#include + #include "EventManager.h" namespace crepe { diff --git a/src/crepe/api/UiObject.cpp b/src/crepe/api/UiObject.cpp new file mode 100644 index 0000000..1c11fc3 --- /dev/null +++ b/src/crepe/api/UiObject.cpp @@ -0,0 +1,5 @@ +#include "UiObject.h" + +using namespace crepe; + +UiObject::UiObject(game_object_id_t id) : Component(id){}; diff --git a/src/crepe/api/UiObject.h b/src/crepe/api/UiObject.h index 82140a0..ae2e744 100644 --- a/src/crepe/api/UiObject.h +++ b/src/crepe/api/UiObject.h @@ -1,17 +1,33 @@ #pragma once -#include "Component.h" +#include "../Component.h" -#include "api/EventHandler.h" namespace crepe { -class UiObject : public Component{ +/** + * @class UiObject + * \brief Represents a UI object in the game, derived from the Component class. + */ +class UiObject : public Component { public: - UiObject(game_object_id_t id) : Component(id){}; - int width = 0; - int height = 0; + /** + * \brief Constructs a UiObject with the specified game object ID. + * \param id The unique ID of the game object associated with this UI object. + */ + UiObject(game_object_id_t id); + + //! The width of the UI object. + int width = 0; + + //! The height of the UI object. + int height = 0; + public: -virtual int get_instances_max() const { return 1; } + /** + * \brief Retrieves the maximum number of instances allowed for this UI object type. + * /return Always returns 1, as only a single instance is allowed. + */ + virtual int get_instances_max() const override { return 1; } }; -} +} // namespace crepe diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 6371a51..a37392f 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -360,8 +360,8 @@ std::vector SDLContext::get_events(){ { event_list.push_back(EventData{ .event_type = SDLContext::Event::MOUSEMOVE, - .mouse_position = {event.button.x,event.button.y}, - .rel_mouse_move = {event.motion.yrel,event.motion.xrel} + .mouse_position = {event.motion.x,event.motion.y}, + .rel_mouse_move = {event.motion.xrel,event.motion.yrel} }); } break; diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index a3e28e4..1b455cd 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -1,25 +1,22 @@ -#include "ComponentManager.h" +#include "ComponentManager.h" #include "../api/EventManager.h" - -#include "../facade/SDLContext.h" #include "../api/Event.h" + #include "system/InputSystem.h" using namespace crepe; - - void InputSystem::update() { - EventManager& event_mgr = EventManager::get_instance(); + EventManager &event_mgr = EventManager::get_instance(); std::vector event_list = SDLContext::get_instance().get_events(); - - for (SDLContext::EventData event : event_list) { + + for (const SDLContext::EventData &event : event_list) { switch (event.event_type) { case SDLContext::Event::KEYDOWN: { event_mgr.queue_event(KeyPressEvent{ - .repeat = event.key_repeat, + .repeat = event.key_repeat, .key = event.key, }); break; @@ -36,51 +33,49 @@ void InputSystem::update() { .mouse_y = event.mouse_position.second, .button = event.mouse_button, }); - last_mouse_down_position = {event.mouse_position.first,event.mouse_position.second}; - last_mouse_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(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{ + .mouse_x = event.mouse_position.first, + .mouse_y = event.mouse_position.second, + .button = event.mouse_button, + }); + + handle_click(event); + } 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(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; - - // Ensure last_mouse_button is properly set and matches the current mouse button - if (last_mouse_button == event.mouse_button && - std::abs(delta_x) <= click_tolerance && - std::abs(delta_y) <= click_tolerance) { - event_mgr.queue_event(MouseClickEvent{ - .mouse_x = event.mouse_position.first, - .mouse_y = event.mouse_position.second, - .button = event.mouse_button, - }); - - this->handle_click(mouse_release_event); - } - - break; - } case SDLContext::Event::MOUSEMOVE: { event_mgr.queue_event(MouseMoveEvent{ .mouse_x = event.mouse_position.first, .mouse_y = event.mouse_position.second, - .rel_x = event.rel_mouse_move.first, + .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{ - .scroll_x = event.mouse_position.first, - .scroll_y = event.mouse_position.second, + .scroll_x = event.wheel_delta, + .scroll_y = 0, .direction = event.wheel_delta, }); break; @@ -95,43 +90,43 @@ void InputSystem::update() { } } -void InputSystem::handle_move(const MouseMoveEvent){ - ComponentManager &mgr = this->component_manager; +void InputSystem::handle_move(const SDLContext::EventData &event_data) { + ComponentManager &mgr = this->component_manager; - // Get the buttons and transforms std::vector> buttons = mgr.get_components_by_type