Call widget update method of selected widget on user input

Linked: #92

src/game/components/Controlable.hpp

@@ -10,20 +10,28 @@
 
 #include <functional>
 #include "ecs/Component.hpp"
+#include "ecs/System.hpp"
 #include "game/Users.hpp"
 
 namespace game
 {
     /// Controlable entity, may be a widget or a player
     struct Controlable : public ecs::Component {
-        using Callback = std::function<bool(const Users::ActionEvent &)>;
+        /// Callback called when an action with the matching @c userId is detected.
+        ///
+        /// @param ecs::Entity entity @a owning the controlable component.
+        /// @param ecs::SystemData view on the world.
+        /// @param const Users::ActionEvent& informations about the action detected.
+        /// @retval true if the action was consumed.
+        /// @retval false otherwise.
+        using ActionCallback = std::function<bool(ecs::Entity, ecs::SystemData, const Users::ActionEvent &)>;
 
         /// Id of the user controlling the widget
         User::UserId userId;
-        Callback callback;
+        ActionCallback callback;
 
         Controlable(User::UserId id) : userId(id) {}
-        Controlable(User::UserId id, Callback pcallback) : userId(id), callback(pcallback) {}
+        Controlable(User::UserId id, ActionCallback pcallback) : userId(id), callback(pcallback) {}
     };
 } // namespace game
 

src/game/gui/components/CMakeLists.txt

@@ -5,7 +5,7 @@ set (SRC
 	${SRC}
 	${SRCROOT}/Checkable.hpp
 	${SRCROOT}/Clickable.hpp
-	${SRCROOT}/Selectable.hpp
+	${SRCROOT}/Widget.cpp
 	${SRCROOT}/Widget.hpp
 	PARENT_SCOPE)
 

src/game/gui/components/Widget.cpp

@@ -0,0 +1,27 @@
+/*
+** EPITECH PROJECT, 2022
+** Bomberman
+** File description:
+** Widget
+*/
+
+#include "Widget.hpp"
+
+#include "logger/Logger.hpp"
+
+namespace game
+{
+    namespace gui
+    {
+        bool Widget::update(ecs::Entity self, ecs::SystemData data, const Users::ActionEvent &event)
+        {
+            (void)self;
+            (void)data;
+            (void)event;
+
+            Logger::logger.log(Logger::Severity::Debug, "Update widget");
+
+            return false;
+        }
+    } // namespace gui
+} // namespace game

src/game/gui/components/Widget.hpp

@@ -24,11 +24,14 @@ namespace game
 
             WidgetTag previous;
             WidgetTag next;
+            bool selected;
 
-            Widget(WidgetTag ptag, WidgetTag pprevious = NullTag, WidgetTag pnext = NullTag)
-                : tag(ptag), previous(pprevious), next(pnext)
+            Widget(WidgetTag ptag, WidgetTag pprevious = NullTag, WidgetTag pnext = NullTag, bool pselected = false)
+                : tag(ptag), previous(pprevious), next(pnext), selected(pselected)
             {
             }
+
+            bool update(ecs::Entity self, ecs::SystemData data, const Users::ActionEvent &event);
         };
     } // namespace gui
 } // namespace game

src/game/systems/InputManager.cpp

@@ -37,17 +37,18 @@ namespace game
     {
         auto optionnalWidgets = ecs::maybe(data.getStorage<gui::Widget>());
 
-        for (auto [widget, controlable, _] :
+        for (auto [widget, controlable, entity] :
             ecs::join(optionnalWidgets, data.getStorage<Controlable>(), data.getResource<ecs::Entities>())) {
+            /// This entity doesn't listen the sender of the event.
             if (controlable.userId != event.user)
                 continue;
-            if (!widget) {
-                Logger::logger.log(Logger::Severity::Debug, "non Widget event");
-                if (controlable.callback && controlable.callback(event))
-                    return;
-            } else {
-                Logger::logger.log(Logger::Severity::Debug, "Widget event");
-            }
+            /// The widget consumed the event.
+            if (widget && widget->selected && widget->update(entity, data, event))
+                return;
+            /// The entity isn't a widget (or hasn't consumed the event) and has a custom callback.
+            if (controlable.callback && controlable.callback(entity, data, event))
+                return;
         }
     }
+
 } // namespace game

src/main.cpp

@@ -111,21 +111,16 @@ int main()
                        .with<game::Position>(0.f, 0.f)
                        .with<game::Textual>("Hello ECS", 40, raylib::core::Color::RED)
                        .with<game::Controlable>(game::User::UserId::User1)
-                       .with<game::gui::Widget>(0, game::gui::Widget::NullTag, 1)
-                       .build();
-
-    auto widget2 = world.addEntity()
-                       .with<game::Position>(0.f, 0.f)
-                       .with<game::Textual>("Hello Widgets", 40, raylib::core::Color::RED)
-                       .with<game::Controlable>(game::User::UserId::User1)
-                       .with<game::gui::Widget>(1, 0)
+                       .with<game::gui::Widget>(0, game::gui::Widget::NullTag, 1, true)
                        .build();
 
     auto text = world.addEntity()
                     .with<game::Position>(0.f, 0.f)
                     .with<game::Textual>("Hello ECS", 40, raylib::core::Color::RED)
                     .with<game::Controlable>(game::User::UserId::User1,
-                        [](const game::Users::ActionEvent &event) {
+                        [](ecs::Entity self, ecs::SystemData data, const game::Users::ActionEvent &event) {
+                            (void)self;
+                            (void)data;
                             (void)event;
                             Logger::logger.log(Logger::Severity::Debug, [&](std::ostream &writer) {
                                 writer << "Text control! " << event.value << ", " << static_cast<size_t>(event.action);
@@ -134,6 +129,13 @@ int main()
                         })
                     .build();
 
+    auto widget2 = world.addEntity()
+                       .with<game::Position>(0.f, 0.f)
+                       .with<game::Textual>("Hello Widgets", 40, raylib::core::Color::RED)
+                       .with<game::Controlable>(game::User::UserId::User1)
+                       .with<game::gui::Widget>(1, 0)
+                       .build();
+
 #if defined(PLATFORM_WEB)
     // We cannot use the WindowShouldClose() loop on the web,
     // since there is no such thing as a window.