Feat/ecs/bullet systems

src/demo/Demo.cpp

@@ -20,7 +20,7 @@
     #include "components/EnemyAI.hpp"
     #include "systems/Draw.hpp"
     #include "systems/HandleSFMLEvents.hpp"
-    #include "systems/HandleSFMLMovements.hpp"
+    #include "systems/HandleSFMLKeys.hpp"
     #include "systems/ManageClientEvents.hpp"
 #endif
 
@@ -37,19 +37,19 @@ ecs::World getGameWorld(ecs::Engine &engine)
     world.addSystem(ecs::systems::movement);
 
 #ifdef CLIENT_COMPILATION_MODE
+    std::filesystem::path playerPath = ecs::crossPlatformPath("src", "demo", "assets", "textures", "players.gif");
     world.registry.addComponent<ecs::component::Controllable>(
         player, {sf::Keyboard::Z, sf::Keyboard::Q, sf::Keyboard::S, sf::Keyboard::D});
-    world.registry.addComponent<ecs::component::Drawable>(
-        player, {"src/demo/assets/textures/players.gif", {1, 1, 32, 16}});
+    world.registry.addComponent<ecs::component::Drawable>(player, {playerPath, {1, 1, 32, 16}});
+    world.registry.addComponent<ecs::component::Shootable>(player, {sf::Keyboard::Space});
 
     ecs::Entity enemy = world.registry.spawn_entity();
     world.registry.addComponent<ecs::component::Position>(enemy, {500, 500});
     world.registry.addComponent<ecs::component::Size>(enemy, {5, 5});
     world.registry.addComponent<ecs::component::EnemyAI>(enemy, {});
-    world.registry.addComponent<ecs::component::Drawable>(
-        enemy, {"src/demo/assets/textures/players.gif", {1, 18, 32, 16}});
+    world.registry.addComponent<ecs::component::Drawable>(enemy, {playerPath, {1, 18, 32, 16}});
     world.addSystem(ecs::systems::handleSFMLEvents);
-    world.addSystem(ecs::systems::handleSFMLMovements);
+    world.addSystem(ecs::systems::handleSFMLKeys);
 
     world.addSystem(ecs::systems::manageClientEvents);
     world.addSystem(ecs::systems::draw);

src/ecs/AssetManager.hpp

@@ -0,0 +1,20 @@
+/*
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** AssetManager
+*/
+
+#pragma once
+
+#include <filesystem>
+
+namespace ecs
+{
+    inline std::filesystem::path crossPlatformPath(std::filesystem::path path) { return path; }
+    template <class... Args>
+    std::filesystem::path crossPlatformPath(std::filesystem::path path, std::string_view next, Args... args)
+    {
+        return crossPlatformPath(path.append(next), args...);
+    }
+} // namespace ecs

src/ecs/CMakeLists.txt

@@ -10,6 +10,7 @@ add_subdirectory(utils)
 set(ECS_SRC
     ${COMPONENTS_SRC}
     ${SYSTEMS_SRC}
+    ${SRCROOT}/AssetManager.hpp
     ${SRCROOT}/Constant.hpp
     ${SRCROOT}/Engine.hpp
     ${SRCROOT}/Entity.hpp

src/ecs/Engine.hpp

@@ -1,21 +1,31 @@
 /*
- * File: Engine.hpp
- * Project: ecs
- * File Created: Tuesday, 4th October 2022 6:33:43 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Wednesday, 5th October 2022 2:05:52 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Engine
+*/
 
 #pragma once
 
+#include <filesystem>
 #include <memory>
+#include "AssetManager.hpp"
 #include "Engine.hpp"
 #include "Registry.hpp"
 #include "World.hpp"
+#include "components/Controllable.hpp"
+#include "components/Drawable.hpp"
+#include "components/EnemyAI.hpp"
+#include "components/Position.hpp"
+#include "components/Shootable.hpp"
+#include "components/Size.hpp"
+#include "components/Velocity.hpp"
+#include "systems/Draw.hpp"
+#include "systems/HandleSFMLEvents.hpp"
+#include "systems/HandleSFMLKeys.hpp"
+#include "systems/ManageClientEvents.hpp"
+#include "systems/Movement.hpp"
+#include "systems/PositionLogger.hpp"
 
 namespace ecs
 {

src/ecs/Event.hpp

@@ -1,14 +1,9 @@
 /*
- * File: Event.hpp
- * Project: ecs
- * File Created: Tuesday, 4th October 2022 7:31:30 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Wednesday, 5th October 2022 2:01:45 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Event
+*/
 
 #pragma once
 

src/ecs/World.hpp

@@ -1,14 +1,9 @@
 /*
- * File: World.hpp
- * Project: ecs
- * File Created: Tuesday, 4th October 2022 6:33:43 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Wednesday, 5th October 2022 1:57:31 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** World
+*/
 
 #pragma once
 

src/ecs/components/CMakeLists.txt

@@ -3,9 +3,12 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/src/ecs/components)
 
 set(COMPONENTS_SRC
     ${SRCROOT}/Controllable.hpp
+    ${SRCROOT}/Damage.hpp
     ${SRCROOT}/Drawable.hpp
     ${SRCROOT}/EnemyAI.hpp
+    ${SRCROOT}/Health.hpp
     ${SRCROOT}/Position.hpp
+    ${SRCROOT}/Shootable.hpp
     ${SRCROOT}/Size.hpp
     ${SRCROOT}/Velocity.hpp
     PARENT_SCOPE

src/ecs/components/Controllable.hpp

@@ -1,14 +1,9 @@
 /*
- * File: Controllable.hpp
- * Project: components
- * File Created: Monday, 3rd October 2022 6:17:46 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Tuesday, 4th October 2022 7:26:15 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Controllable
+*/
 
 #pragma once
 

src/ecs/components/Damage.hpp

@@ -0,0 +1,15 @@
+/*
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Damage
+*/
+
+#pragma once
+
+namespace ecs::component
+{
+    struct Damage {
+        int damage;
+    };
+} // namespace ecs::component

src/ecs/components/Direction.hpp

@@ -1,14 +1,9 @@
 /*
- * File: Direction.hpp
- * Project: components
- * File Created: Tuesday, 4th October 2022 7:10:05 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Tuesday, 4th October 2022 7:22:19 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Direction
+*/
 
 #pragma once
 

src/ecs/components/Drawable.hpp

@@ -1,14 +1,9 @@
 /*
- * File: Drawable.hpp
- * Project: components
- * File Created: Monday, 3rd October 2022 6:32:42 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Wednesday, 5th October 2022 2:09:12 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Drawable
+*/
 
 #pragma once
 

src/ecs/components/EnemyAI.hpp

@@ -1,14 +1,9 @@
 /*
- * File: EnemyAI.hpp
- * Project: components
- * File Created: Tuesday, 4th October 2022 6:59:11 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Tuesday, 4th October 2022 7:26:25 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** EnemyAI
+*/
 
 #pragma once
 

src/ecs/components/Health.hpp

@@ -0,0 +1,15 @@
+/*
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Health
+*/
+
+#pragma once
+
+namespace ecs::component
+{
+    struct Health {
+        int health;
+    };
+} // namespace ecs::component

src/ecs/components/Position.hpp

@@ -1,14 +1,9 @@
 /*
- * File: Position.hpp
- * Project: components
- * File Created: Monday, 3rd October 2022 3:37:48 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Tuesday, 4th October 2022 7:26:30 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Position
+*/
 
 #pragma once
 

src/ecs/components/Shootable.hpp

@@ -0,0 +1,24 @@
+/*
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Shootable
+*/
+
+#pragma once
+
+#include "SFML/Window/Keyboard.hpp"
+
+namespace ecs::component
+{
+    struct Shootable {
+        Shootable(sf::Keyboard::Key shoot, sf::Keyboard::Key shootSecondary = sf::Keyboard::Key::Unknown)
+            : Shoot(shoot), ShootSecondary(shootSecondary)
+        {
+        }
+
+        sf::Keyboard::Key Shoot;
+
+        sf::Keyboard::Key ShootSecondary;
+    };
+} // namespace ecs::component

src/ecs/systems/CMakeLists.txt

@@ -4,7 +4,7 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/src/ecs/systems)
 set(SYSTEMS_SRC
     ${SRCROOT}/Draw.hpp
     ${SRCROOT}/HandleSFMLEvents.hpp
-    ${SRCROOT}/HandleSFMLMovements.hpp
+    ${SRCROOT}/HandleSFMLKeys.hpp
     ${SRCROOT}/ManageClientEvents.hpp
     ${SRCROOT}/Movement.hpp
     ${SRCROOT}/PositionLogger.hpp

src/ecs/systems/Draw.hpp

@@ -1,14 +1,9 @@
 /*
- * File: Draw.hpp
- * Project: systems
- * File Created: Tuesday, 4th October 2022 6:33:43 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Wednesday, 5th October 2022 2:07:38 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** Draw
+*/
 
 #pragma once
 

src/ecs/systems/HandleSFMLEvents.hpp

@@ -1,20 +1,14 @@
 /*
- * File: HandleSFMLEvents.hpp
- * Project: systems
- * File Created: Tuesday, 4th October 2022 7:34:35 pm
- * Author: Aurèle Nicolas ([email protected])
- * -----
- * Last Modified: Wednesday, 5th October 2022 2:07:14 pm
- * Modified By: Aurèle Nicolas ([email protected]>)
- * -----
- * Copyright 2022 - 2022 Your Company, Your Company
- */
+** EPITECH PROJECT, 2022
+** RTYPE
+** File description:
+** HandleSFMLEvents
+*/
 
 #pragma once
 
 #include <functional>
 #include "World.hpp"
-#include "components/Controllable.hpp"
 
 namespace ecs::systems
 {
@@ -30,7 +24,17 @@ namespace ecs::systems
         while (world.getWindow().pollEvent(event)) {
             switch (event.type) {
                 case sf::Event::Closed: world.getWindow().close(); break;
-                case sf::Event::KeyPressed: break;
+                case sf::Event::KeyPressed: {
+                    auto const &shootables = world.registry.getComponents<component::Shootable>();
+
+                    for (size_t i = 0; i < shootables.size(); ++i) {
+                        auto const &shoot = shootables[i];
+                        if (shoot) {
+                            if (event.key.code == shoot.value().Shoot || event.key.code == shoot.value().ShootSecondary)
+                                world.pushEvent(ecs::Event(ecs::Event::EventType::Shoot));
+                        }
+                    }
+                } break;
                 default: break;
             }
         }