Merge branch 'feat/all-command' of github.com:maelbecel/R-Type into f…

…eat/all-command

Client/src/Layer/RTypeLayer.cpp

@@ -77,6 +77,7 @@ namespace RType {
         Scenes[GAME]->RegisterSystem(new AnimationSystem());
         Scenes[GAME]->RegisterSystem(new MovingSystem(1.5f));
         Scenes[GAME]->RegisterSystem(collisionSystem);
+        Scenes[GAME]->RegisterSystem(new ClockSystem());
         // Scenes[GAME]->Subscribe<Events::OnEntityCreated>(subscribe);
         // Scenes[GAME]->Subscribe<Events::OnEntityDestroyed>(subscribe);
         Scenes[GAME]->Subscribe<Exodia::Events::OnCollisionEntered>(collisionSystem);

GameEngine/src/Exodia/ECS/Component/DefaultComponents/RendererComponents.hpp

@@ -106,7 +106,6 @@ namespace Exodia {
                 buffer.Write(&hasTexture, sizeof(bool));
 
                 if (Texture) {
-                    EXODIA_CORE_ERROR("Has texture {0}", hasTexture);
                     buffer.Resize(buffer.Size + sizeof(Texture->GetAssetHandle()) + sizeof(Texture->GetCoords()) +
                                   sizeof(Texture->GetTextureCellSize()) + sizeof(Texture->GetTextureSpriteSize()));
 
@@ -147,10 +146,8 @@ namespace Exodia {
                 else
                     hasTexture = false;
                 offset += sizeof(bool);
-                std::cout << "Has texture " << hasTexture << std::endl;
 
                 if (!hasTexture) {
-                    EXODIA_CORE_ERROR("Hasnt texture");
                     return;
                 }
                 Exodia::AssetHandle assetHandle;

R-Type/CMakeLists.txt

@@ -22,6 +22,7 @@ set(SOURCES_GAME_ENGINE
         # -- System source files
 
         src/System/AnimationSystem.cpp
+        src/System/ClockSystem.cpp
 
         # -- Script source files
 

R-Type/R-Type.hpp

@@ -27,6 +27,7 @@
 #include "src/Scripts/Star/Star.hpp"
 
 #include "src/System/AnimationSystem.hpp"
+#include "src/System/ClockSystem.hpp"
 
 #include "src/Event/EntityEventSubscriber.hpp"
 #include "src/Event/TakeDamage.hpp"

R-Type/src/Scripts/Pata-pata/Pata-pata.cpp

@@ -192,7 +192,6 @@ namespace RType {
         float &mytime = clock.Get().ElapsedTime;
 
         if (_State == State::ALIVE) {
-            mytime += ts.GetSeconds();
             body.Get().Velocity.y = (float)(amplitude * sin(frequency * mytime * PI));
         }
     }

R-Type/src/Scripts/Star/Star.cpp

@@ -64,16 +64,14 @@ namespace RType {
     }
 
     void Star::OnUpdate(Timestep ts) {
-        ComponentHandle<Clock> clock = GetComponent<Clock>();
         ComponentHandle<TransformComponent> transform = GetComponent<TransformComponent>();
         ComponentHandle<CircleRendererComponent> circle = GetComponent<CircleRendererComponent>();
         World *world = HandleEntity->GetWorld();
-        if (!transform || !circle || !clock || !world) {
-            EXODIA_WARN("No transform, circle, clock or world");
+        if (!transform || !circle || !world) {
+            EXODIA_WARN("No transform, circle or world");
             return;
         }
 
-        float &mytime = clock.Get().ElapsedTime;
         Entity *camera = world->GetEntityByTag("Camera");
         if (!camera) {
             EXODIA_WARN("No camera");
@@ -86,8 +84,6 @@ namespace RType {
             return;
         }
 
-        mytime += ts.GetMilliseconds();
-
         CircleRendererComponent &cc = circle.Get();
 
         float seconds = ts.GetSeconds();

R-Type/src/System/ClockSystem.cpp

@@ -0,0 +1,29 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Type
+** File description:
+** ClockSystem
+*/
+
+#include "ClockSystem.hpp"
+#include "Component/Clock.hpp"
+
+namespace RType {
+
+    using namespace Exodia;
+
+    /////////////
+    // Methods //
+    /////////////
+
+    void ClockSystem::Update(World *world, Timestep ts) {
+
+        world->LockMutex();
+        world->ForEach<Clock>([&](Entity *entity, auto clock) {
+            clock->ElapsedTime += ts;
+            EXODIA_INFO("ClockSystem: ElapsedTime: {0} from entity {1}", clock->ElapsedTime,
+                        entity->GetComponent<TagComponent>().Get().Tag);
+        });
+        world->UnlockMutex();
+    }
+}; // namespace RType

R-Type/src/System/ClockSystem.hpp

@@ -0,0 +1,33 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Type
+** File description:
+** AnimationSystem
+*/
+
+#ifndef CLOCKSYSTEM_HPP_
+#define CLOCKSYSTEM_HPP_
+
+// R-Type Events includes
+#include "Event/AnimationEvent.hpp"
+
+namespace RType {
+
+    class ClockSystem : public Exodia::EntitySystem {
+
+        //////////////////////////////
+        // Constructor & Destructor //
+        //////////////////////////////
+      public:
+        ClockSystem() = default;
+        ~ClockSystem() = default;
+
+        /////////////
+        // Methods //
+        /////////////
+      public:
+        void Update(Exodia::World *world, Exodia::Timestep ts) override;
+    };
+}; // namespace RType
+
+#endif /* !CLOCKSYSTEM_HPP_ */

Server/src/Server.cpp

@@ -132,8 +132,10 @@ namespace Exodia {
         RType::EntityEventSubscriber *subscribe = new RType::EntityEventSubscriber(_Network);
         CollisionSystem *collisionSystem = new CollisionSystem();
         RType::TakeDamageSubscriber *takeDamage = new RType::TakeDamageSubscriber();
+        ClockSystem *clockSystem = new ClockSystem();
 
         systems.push_back(collisionSystem);
+        systems.push_back(clockSystem);
 
         InitScene(GAME, systems);