feat: enhance Timer functionality and integrate with System class

Author: timschwartz

include/libecs-cpp/System.hpp

@@ -2,12 +2,44 @@
 
 #include <string>
 #include <queue>
+#include <functional>
 #include <libecs-cpp/Timing.hpp>
 
 namespace ecs
 {
     class Container;
 
+    class Timer
+    {
+      public:
+        Timer(std::string name,
+          std::function<void()> callback,
+          uint32_t interval = 30 /* seconds */,
+          bool repeat = true)
+          : Repeat(repeat)
+        {
+            this->Name = name;
+            this->callback = callback;
+            this->timing.SetFrequency(1000000 * interval); // Convert seconds to microseconds
+        }
+
+        bool CallbackRun()
+        {
+            if (this->timing.ShouldUpdate() && this->callback)
+            {
+                this->callback();
+                return true;
+            }
+            return false;
+        }
+        std::string Name;
+        bool Repeat;
+
+      private:
+        ecs::Timing timing;
+        std::function<void()> callback = nullptr;
+    };
+
     class System
     {
       public:
@@ -16,6 +48,7 @@ namespace ecs
         virtual void Initialize();
         virtual void Configure(nlohmann::json config);
         virtual void Update() {};
+        void UpdateSystem();
         std::string Handle;
         ecs::Container *Container = nullptr;
         void MessageSubmit(nlohmann::json);
@@ -24,10 +57,13 @@ namespace ecs
         ecs::Timing Timing;
         const size_t MessagesWaiting();
         const uint32_t DeltaTimeGet();
+        void TimerClear(std::string name);
+        void TimerAdd(Timer timer);
       protected:
         std::queue<nlohmann::json> messages;
         std::chrono::steady_clock::time_point LastTime = std::chrono::steady_clock::now();
         std::unordered_map<std::string, std::vector<std::string>> ComponentsToDelete;
         void ComponentsClear();
+        std::vector<ecs::Timer> Timers;
     };
 }

src/Container.cpp

@@ -114,7 +114,7 @@ namespace ecs
         for(auto &Handle : this->SystemsGet())
         {
             if(this->Systems[Handle]->Timing.ShouldUpdate())
-                this->Systems[Handle]->Update();
+                this->Systems[Handle]->UpdateSystem();
         }
     }
 

src/Makefile.am

@@ -12,7 +12,7 @@ pkginclude_HEADERS = \
 	../include/libecs-cpp/uuid_v4.h \
 	../include/libecs-cpp/endianness.h \
 	../include/libecs-cpp/json.hpp \
-	../include/libecs-cpp/Timing.hpp
+    ../include/libecs-cpp/Timing.hpp
 
 if BUILTIN_UUID
 libecs_cpp_la_CXXFLAGS = -std=c++20 -I../include -Werror -Wall -Wno-psabi -mssse3 -mavx2

src/System.cpp

@@ -1,16 +1,42 @@
 #include <libecs-cpp/Component.hpp>
 #include <libecs-cpp/ecs.hpp>
+#include <iostream>
+#include <vector>
 
 namespace ecs
 {
     System::System():
-        Handle(ecs::Uuid().Get()) {}
+        Handle(ecs::Uuid().Get()) 
+    {
+    }
 
     System::System(std::string Handle):
-        Handle(Handle) {}
+        Handle(Handle) 
+    {
+    }
 
     void System::Initialize() {}
 
+    void System::UpdateSystem()
+    {
+        std::vector<std::string> timersToRemove;
+        for(auto &timer : this->Timers)
+        {
+            if(timer.CallbackRun() && !timer.Repeat)
+            {
+                timersToRemove.push_back(timer.Name);
+            }
+        }
+
+        // Remove timers after iteration to avoid modifying container during iteration
+        for(const auto &timerName : timersToRemove)
+        {
+            this->TimerClear(timerName);
+        }
+
+        this->Update();
+    }
+
     void System::Configure(nlohmann::json config) {}
 
     void System::MessageSubmit(nlohmann::json message)
@@ -33,6 +59,12 @@ namespace ecs
 
     void System::ComponentsClear()
     {
+        if (!this->Container)
+        {
+            std::cout << "Warning: Container is null in ComponentsClear()" << std::endl;
+            return;
+        }
+
         for(auto &[type, entities] : this->ComponentsToDelete)
         {
             for(const auto &entity : entities)
@@ -42,4 +74,17 @@ namespace ecs
         }
         this->ComponentsToDelete.clear();
     }
+
+    void System::TimerClear(std::string name)
+    {
+        this->Timers.erase(
+            std::remove_if(this->Timers.begin(), this->Timers.end(),
+                [&name](const Timer &timer) { return timer.Name == name; }),
+            this->Timers.end());
+    }
+
+    void System::TimerAdd(Timer timer)
+    {
+        this->Timers.push_back(timer);
+    }
 }