Merge pull request #6 from X-R-G-B/refactor/RB-23-refactor-ecs

Refactor/rb 23 refactor ecs

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-set(PROJECT_NAME poc)
+set(PROJECT_NAME client)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -20,7 +20,21 @@ add_executable(
 
 add_subdirectory(deps)
 
-add_subdirectory(src/poc)
+if(MSVC)
+    target_compile_options(
+        ${PROJECT_NAME}
+        PRIVATE
+        /W4
+    )
+else()
+    target_compile_options(
+        ${PROJECT_NAME}
+        PRIVATE
+        -Wall -Wextra -pedantic
+    )
+endif()
+
+add_subdirectory(src)
 
 if (WIN32)
     add_custom_command(

src/poc/src/CMakeLists.txt → src/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
 
-add_subdirectory(system)
-add_subdirectory(EventManager)
-
 target_include_directories(
     ${PROJECT_NAME}
     PRIVATE
@@ -14,3 +11,6 @@ target_sources(
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
+
+add_subdirectory(Client)
+add_subdirectory(ECS)

src/poc/src/system/managers/CMakeLists.txt → src/Client/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.27)
+cmake_minimum_required(VERSION 3.15)
 
 target_include_directories(
     ${PROJECT_NAME}
@@ -10,5 +10,6 @@ target_sources(
     ${PROJECT_NAME}
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager.cpp
 )
+
+add_subdirectory(Systems)

src/Client/Systems/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.15)
+
+target_include_directories(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_sources(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/ClientSystems.cpp
+)
+
+add_subdirectory(Managers)

src/Client/Systems/ClientSystems.cpp

@@ -0,0 +1,40 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** Systems implementation
+*/
+
+#include <iostream>
+#include "raylib.h"
+#include "ClientSystems.hpp"
+#include "Registry.hpp"
+#include "CustomTypes.hpp"
+
+void GraphicSystems::pixelRenderer(std::size_t)
+{
+    Registry::array<Pixel> arrPixel = Registry::getInstance().getComponents<Pixel>();
+    for (auto begin = arrPixel.begin(); begin != arrPixel.end(); begin++) {
+        for (int i = 0; i < 50; i++) {
+            for (int j = 0; j < 50 ; j++) {
+                DrawPixel(begin->x + i, begin->y + j, PURPLE);
+            }
+        }
+    }
+}
+
+void EventsSystems::playerMovement(std::size_t)
+{
+    Registry::array<Pixel> arrPixel = Registry::getInstance().getComponents<Pixel>();
+
+    for (auto &pixel : arrPixel) {
+        if (IsKeyDown(KEY_RIGHT))
+            pixel.x += 1;
+        if (IsKeyDown(KEY_LEFT))
+            pixel.x -= 1;
+        if (IsKeyDown(KEY_UP))
+            pixel.y -= 1;
+        if (IsKeyDown(KEY_DOWN))
+            pixel.y += 1;
+    }
+}

src/Client/Systems/ClientSystems.hpp

@@ -0,0 +1,16 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** Systems
+*/
+
+#pragma once
+
+namespace GraphicSystems {
+    void pixelRenderer(std::size_t);
+}
+
+namespace EventsSystems {
+    void playerMovement(std::size_t);
+}

src/Client/Systems/Managers/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.15)
+
+target_include_directories(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_sources(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/GraphicManager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/SystemEventsManager.cpp
+)

src/Client/Systems/Managers/GraphicManager.cpp

@@ -0,0 +1,54 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** GraphicManager
+*/
+
+#include <iostream>
+#include "raylib.h"
+#include "GraphicManager.hpp"
+#include "CustomTypes.hpp"
+#include "ClientSystems.hpp"
+
+namespace Systems {
+    GraphicManager GraphicManager::_instance = GraphicManager();
+
+    GraphicManager::GraphicManager()
+    {
+        const int screenWidth = 800;
+        const int screenHeight = 450;
+        InitWindow(screenWidth, screenHeight, "Poc ECS");
+        SetTargetFPS(60);
+
+        addSystem(GraphicSystems::pixelRenderer);
+    }
+
+    GraphicManager::~GraphicManager()
+    {
+        CloseWindow();
+    }
+
+    GraphicManager &GraphicManager::getInstance()
+    {
+        return _instance;
+    }
+
+    void GraphicManager::updateSystems()
+    {
+        BeginDrawing();
+        ClearBackground(RAYWHITE);
+        ASystemManager::updateSystems();
+        EndDrawing();
+    }
+
+    void GraphicManager::addSystem(std::function<void(std::size_t)> sys)
+    {
+        ASystemManager::addSystem(sys);
+    }
+
+    void GraphicManager::removeSystem(std::size_t id)
+    {
+        ASystemManager::removeSystem(id);
+    }
+}

src/Client/Systems/Managers/GraphicManager.hpp

@@ -0,0 +1,24 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** GraphicManager
+*/
+
+#pragma once
+
+#include "ASystemManager.hpp"
+
+namespace Systems {
+    class GraphicManager : public ASystemManager {
+        public:
+            static GraphicManager &getInstance();
+            void updateSystems();
+            void addSystem(std::function<void(std::size_t)>);
+            void removeSystem(std::size_t);
+        private:
+            GraphicManager();
+            ~GraphicManager();
+            static GraphicManager _instance;
+    };
+}

src/Client/Systems/Managers/SystemEventsManager.cpp

@@ -0,0 +1,40 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** SystemEventsManager
+*/
+
+#include <iostream>
+#include "SystemEventsManager.hpp"
+#include "CustomTypes.hpp"
+#include "ClientSystems.hpp"
+
+namespace Systems {
+    SystemEventsManager SystemEventsManager::_instance = SystemEventsManager();
+
+    SystemEventsManager::SystemEventsManager()
+    {
+        addSystem(EventsSystems::playerMovement);
+    }
+
+    SystemEventsManager &SystemEventsManager::getInstance()
+    {
+        return _instance;
+    }
+
+    void SystemEventsManager::updateSystems()
+    {
+        ASystemManager::updateSystems();
+    }
+
+    void SystemEventsManager::addSystem(std::function<void(std::size_t)> sys)
+    {
+        ASystemManager::addSystem(sys);
+    }
+
+    void SystemEventsManager::removeSystem(std::size_t id)
+    {
+        ASystemManager::removeSystem(id);
+    }
+}

src/Client/Systems/Managers/SystemEventsManager.hpp

@@ -0,0 +1,23 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** SystemEventsManager
+*/
+
+#pragma once
+
+#include "ASystemManager.hpp"
+
+namespace Systems {
+    class SystemEventsManager : public ASystemManager {
+        public:
+            static SystemEventsManager &getInstance();
+            void updateSystems();
+            void addSystem(std::function<void(std::size_t)>);
+            void removeSystem(std::size_t);
+        private:
+            SystemEventsManager();
+            static SystemEventsManager _instance;
+    };
+}

src/ECS/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.15)
+
+add_subdirectory(EventManager)
+add_subdirectory(Systems)
+
+target_include_directories(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_sources(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Registry.cpp
+)

src/ECS/Registry.cpp

@@ -0,0 +1,15 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** Registry
+*/
+
+#include "Registry.hpp"
+
+Registry Registry::_instance = Registry();
+
+Registry &Registry::getInstance() {
+    return _instance;
+}
+

src/poc/src/Registry.hpp → src/ECS/Registry.hpp

@@ -11,37 +11,48 @@
 #include <typeinfo>
 #include <typeindex>
 #include <unordered_map>
-#include "SparseArray.hpp"
 #include <memory>
+#include <iostream>
+#include "SparseArray.hpp"
 
 class Registry {
+
     public:
         template <class Component>
-        using array = std::shared_ptr<SparseArray<Component>>;
+        using array = SparseArray<Component> &;
+
+        static Registry &getInstance();
 
         template <class Component>
         array<Component> registerComponent()
         {
             if (_data.find(typeid(Component)) == _data.end()) {
-                _data[typeid(Component)] = std::make_shared<SparseArray<Component>>();
+                _data[typeid(Component)] = SparseArray<Component>();
             }
             return castReturn<Component>();
-        };
+        }
+
         template <class Component>
         array<Component> getComponents()
         {
             return castReturn<Component>();
-        };
+        }
+
         template <class Component>
         array<Component> const &getComponents() const
         {
             return castReturn<Component>();
-        };
+        }
     private:
+        Registry() = default;
+
         template<class Component>
         array<Component> castReturn()
         {
             return std::any_cast<array<Component>>(_data[typeid(Component)]);
         }
+
+        static Registry _instance;
+        Registry& operator=(const Registry&) = delete;
         std::unordered_map<std::type_index, std::any> _data;
 };

src/ECS/Systems/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.15)
+
+target_include_directories(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_sources(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/Systems.cpp
+)
+
+add_subdirectory(Managers)