Add checkable widget component

Linked: #92
MisterPeModder · Jun 9, 2022 · 52a9cc0 · 52a9cc0
1 parent c6a861a
commit 52a9cc0
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 20 deletions.
diff --git a/src/game/gui/components/CMakeLists.txt b/src/game/gui/components/CMakeLists.txt
@@ -3,9 +3,11 @@ set(SRCROOT ${SRCROOT}/components)
 
 set (SRC
 	${SRC}
+	${SRCROOT}/Checkable.cpp
 	${SRCROOT}/Checkable.hpp
 	${SRCROOT}/Clickable.cpp
 	${SRCROOT}/Clickable.hpp
+	${SRCROOT}/IWidgetComponent.hpp
 	${SRCROOT}/Widget.cpp
 	${SRCROOT}/Widget.hpp
 	PARENT_SCOPE)

diff --git a/src/game/gui/components/Checkable.cpp b/src/game/gui/components/Checkable.cpp
@@ -0,0 +1,27 @@
+/*
+** EPITECH PROJECT, 2022
+** Bomberman
+** File description:
+** Checkable
+*/
+
+#include "Checkable.hpp"
+
+namespace game
+{
+    namespace gui
+    {
+        bool Checkable::update(ecs::Entity self, ecs::SystemData data, const Users::ActionEvent &event)
+        {
+            if (event.action != GameAction::ACTION)
+                return false;
+
+            if (event.value == 0.f) {
+                checked = !checked;
+                if (onStateChanged)
+                    onStateChanged(self, checked);
+            }
+            return true;
+        };
+    } // namespace gui
+} // namespace game
diff --git a/src/game/gui/components/Checkable.hpp b/src/game/gui/components/Checkable.hpp
@@ -5,22 +5,30 @@
 ** Checkable
 */
 
-#ifndef GAME_GUI_COMPONENTS_CLICKABLE_HPP_
-#define GAME_GUI_COMPONENTS_CLICKABLE_HPP_
+#ifndef GAME_GUI_COMPONENTS_CHECKABLE_HPP_
+#define GAME_GUI_COMPONENTS_CHECKABLE_HPP_
 
-#include "ecs/Component.hpp"
-#include "ecs/Entity.hpp"
+#include <functional>
+#include "IWidgetComponent.hpp"
 
 namespace game
 {
     namespace gui
     {
-        struct Checkable : public ecs::Component {
+        struct Checkable final : public IWidgetComponent {
+            using OnStateChanged = std::function<void(ecs::Entity, bool)>;
+
+            OnStateChanged onStateChanged;
             bool checked;
 
-            Checkable(bool startChecked = false) : checked(startChecked) {}
+            Checkable(OnStateChanged ponStateChanged, bool startChecked = false)
+                : onStateChanged(ponStateChanged), checked(startChecked)
+            {
+            }
+
+            bool update(ecs::Entity self, ecs::SystemData data, const Users::ActionEvent &event) override final;
         };
     } // namespace gui
 } // namespace game
 
-#endif /* !GAME_GUI_COMPONENTS_CLICKABLE_HPP_ */
+#endif /* !GAME_GUI_COMPONENTS_CHECKABLE_HPP_ */
diff --git a/src/game/gui/components/Clickable.cpp b/src/game/gui/components/Clickable.cpp
@@ -27,9 +27,8 @@ namespace game
                     onStateChanged(self, state);
                 if (newState == State::Default && onClick)
                     onClick(self);
-                return true;
-            } else
-                return false;
+            }
+            return true;
         };
     } // namespace gui
 } // namespace game
diff --git a/src/game/gui/components/Clickable.hpp b/src/game/gui/components/Clickable.hpp
@@ -9,16 +9,13 @@
 #define GAME_GUI_COMPONENTS_CLICKABLE_HPP_
 
 #include <functional>
-#include "ecs/Component.hpp"
-#include "ecs/Entity.hpp"
-#include "ecs/System.hpp"
-#include "game/Users.hpp"
+#include "IWidgetComponent.hpp"
 
 namespace game
 {
     namespace gui
     {
-        struct Clickable : public ecs::Component {
+        struct Clickable final : public IWidgetComponent {
             enum class State { Default, Pressed };
 
             using OnClick = std::function<void(ecs::Entity)>;
@@ -34,7 +31,7 @@ namespace game
             {
             }
 
-            bool update(ecs::Entity self, ecs::SystemData data, const Users::ActionEvent &event);
+            bool update(ecs::Entity self, ecs::SystemData data, const Users::ActionEvent &event) override final;
         };
     } // namespace gui
 } // namespace game

diff --git a/src/game/gui/components/IWidgetComponent.hpp b/src/game/gui/components/IWidgetComponent.hpp
@@ -0,0 +1,28 @@
+/*
+** EPITECH PROJECT, 2022
+** Bomberman
+** File description:
+** IWidgetComponent
+*/
+
+#ifndef GAME_GUI_IWIDGETCOMPONENT_HPP_
+#define GAME_GUI_IWIDGETCOMPONENT_HPP_
+
+#include "ecs/Component.hpp"
+#include "ecs/Entity.hpp"
+#include "ecs/System.hpp"
+#include "game/Users.hpp"
+
+
+namespace game
+{
+    namespace gui
+    {
+        class IWidgetComponent : public ecs::Component {
+          public:
+            virtual bool update(ecs::Entity self, ecs::SystemData data, const Users::ActionEvent &event) = 0;
+        };
+    } // namespace gui
+} // namespace game
+
+#endif /* !GAME_GUI_IWIDGETCOMPONENT_HPP_ */
diff --git a/src/game/gui/components/Widget.cpp b/src/game/gui/components/Widget.cpp
@@ -7,10 +7,9 @@
 
 #include "Widget.hpp"
 
+#include "Checkable.hpp"
 #include "Clickable.hpp"
 
-#include "logger/Logger.hpp"
-
 namespace game
 {
     namespace gui
@@ -19,6 +18,8 @@ namespace game
         {
             if (tryUpdate<Clickable>(self, data, event))
                 return true;
+            if (tryUpdate<Checkable>(self, data, event))
+                return true;
             return false;
         }
     } // namespace gui

diff --git a/src/game/systems/InputManager.cpp b/src/game/systems/InputManager.cpp
@@ -14,8 +14,6 @@
 #include "game/Users.hpp"
 #include "game/gui/components/Widget.hpp"
 
-#include "logger/Logger.hpp"
-
 namespace game
 {
     void InputManager::run(ecs::SystemData data)