fix: fixed update accumulator

Author: gilmar-sales

CMakeLists.txt

@@ -27,7 +27,7 @@ if (FREYR_PROFILING)
     add_subdirectory(vendor/perfetto)
 endif (FREYR_PROFILING)
 
-project(freyr LANGUAGES C CXX VERSION 0.20.7)
+project(freyr LANGUAGES C CXX VERSION 0.20.8)
 
 if (FREYR_BUILD_EXAMPLES)
     add_subdirectory(examples)

benchmarks/ComponentArray/src/main.cpp

@@ -10,7 +10,7 @@ struct Position : fr::Component
 
 static void ComponentArrayIteration(benchmark::State& state)
 {
-    auto options       = fr::FreyrOptionsBuilder().SetArchetypeChunkCapacity(state.range(0)).Build();
+    auto options       = fr::FreyrOptionsBuilder().WithArchetypeChunkCapacity(state.range(0)).Build();
     auto positionArray = fr::ComponentArray<Position>(options);
 
     for (auto _ : state)
@@ -24,7 +24,7 @@ static void ComponentArrayIteration(benchmark::State& state)
 
 static void ArchetypeChunkIteration(benchmark::State& state)
 {
-    auto options     = fr::FreyrOptionsBuilder().SetArchetypeChunkCapacity(state.range(0)).Build();
+    auto options     = fr::FreyrOptionsBuilder().WithArchetypeChunkCapacity(state.range(0)).Build();
     auto taskCounter = skr::MakeRef<fr::TaskCounter>();
     auto taskManager = skr::MakeRef<fr::TaskManager>(
         options, skr::MakeRef<skr::Logger<fr::TaskManager>>(skr::MakeRef<skr::LoggerOptions>()), taskCounter);

include/Freyr/Builders/FreyrOptionsBuilder.hpp

@@ -7,30 +7,37 @@ namespace FREYR_NAMESPACE
     class FreyrOptionsBuilder
     {
       public:
-        FreyrOptionsBuilder() {}
+        FreyrOptionsBuilder() = default;
 
-        FreyrOptionsBuilder& SetMaxEntities(const size_t maxEntities)
+        FreyrOptionsBuilder& WithMaxEntities(const size_t maxEntities)
         {
             mMaxEntities = maxEntities;
 
             return *this;
         }
 
-        FreyrOptionsBuilder& SetArchetypeChunkCapacity(const size_t archetypeChunkCapacity)
+        FreyrOptionsBuilder& WithArchetypeChunkCapacity(const size_t archetypeChunkCapacity)
         {
             mArchetypeChunkCapacity = archetypeChunkCapacity;
 
             return *this;
         }
 
-        FreyrOptionsBuilder& SetThreadCount(const size_t threadCount)
+        FreyrOptionsBuilder& WithFixedDeltaTime(const float fixedDeltaTime)
+        {
+            mFixedDeltaTime = fixedDeltaTime;
+
+            return *this;
+        }
+
+        FreyrOptionsBuilder& WithThreadCount(const size_t threadCount)
         {
             mThreadCount = threadCount;
 
             return *this;
         }
 
-        Ref<FreyrOptions> Build() const
+        [[nodiscard]] Ref<FreyrOptions> Build() const
         {
             auto options = skr::MakeRef<FreyrOptions>();
 
@@ -45,12 +52,16 @@ namespace FREYR_NAMESPACE
             else
                 options->ArchetypeChunkCapacity = options->MaxEntities / (options->ThreadCount * options->ThreadCount);
 
+            if (mFixedDeltaTime.has_value())
+                options->FixedDeltaTime = mFixedDeltaTime.value();
+
             return options;
         }
 
       private:
         std::optional<size_t> mMaxEntities;
         std::optional<size_t> mArchetypeChunkCapacity;
+        std::optional<float> mFixedDeltaTime;
         std::optional<size_t> mThreadCount;
     };
 } // namespace FREYR_NAMESPACE

src/Core/Scene.cpp

@@ -119,14 +119,12 @@ namespace FREYR_NAMESPACE
 
         const auto provider = mServiceProvider.lock()->CreateServiceScope()->GetServiceProvider();
 
-        constexpr int maxFixedSteps = 5;
         mFixedDeltaTimeAccumulator += deltaTime;
 
-        int stepCount = 0;
-        while (mFixedDeltaTimeAccumulator >= mOptions->FixedDeltaTime && stepCount < maxFixedSteps)
+        while (mFixedDeltaTimeAccumulator >= mOptions->FixedDeltaTime)
         {
-            mFixedDeltaTimeAccumulator -= mOptions->FixedDeltaTime;
-            stepCount++;
+            mFixedDeltaTimeAccumulator =
+                std::min(mOptions->FixedDeltaTime, mFixedDeltaTimeAccumulator - mOptions->FixedDeltaTime);
 
             FREYR_PROFILING_BEGIN("FREYR", "PreFixedUpdate", perfetto::Track(0));
             mTaskManager->StartWorkers();
@@ -150,11 +148,6 @@ namespace FREYR_NAMESPACE
             FREYR_PROFILING_END("FREYR", perfetto::Track(0));
         }
 
-        if (stepCount >= maxFixedSteps)
-        {
-            mFixedDeltaTimeAccumulator = 0.0f;
-        }
-
         FREYR_PROFILING_BEGIN("FREYR", "PreUpdate", perfetto::Track(0), "TotalEntities",
                               mEntityManager->LivingEntities());
         mTaskManager->StartWorkers();

test/src/Builders/ArchetypeBuilderSpec.cpp

@@ -12,7 +12,7 @@ class ArchetypeBuilderSpec : public ::testing::Test
     void SetUp() override
     {
         auto app = skr::ApplicationBuilder().AddExtension<fr::FreyrExtension>([](fr::FreyrExtension& freyr) {
-            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.SetArchetypeChunkCapacity(102); });
+            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.WithArchetypeChunkCapacity(102); });
         });
 
         mServiceProvider = app.GetServiceCollection().CreateServiceProvider();

test/src/Containers/ArchetypeChunkSpec.cpp

@@ -12,7 +12,7 @@ class ArchetypeChunkSpec : public ::testing::Test
         auto app = skr::ApplicationBuilder()
             .AddExtension<fr::FreyrExtension>([](fr::FreyrExtension& freyr) {
                 freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) {
-                    builder.SetArchetypeChunkCapacity(2048);
+                    builder.WithArchetypeChunkCapacity(2048);
                 });
             });
 

test/src/Containers/ArchetypeSpec.cpp

@@ -10,7 +10,7 @@ class ArchetypeSpec : public ::testing::Test
     void SetUp() override
     {
         auto app = skr::ApplicationBuilder().AddExtension<fr::FreyrExtension>([](fr::FreyrExtension& freyr) {
-            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.SetArchetypeChunkCapacity(2048); });
+            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.WithArchetypeChunkCapacity(2048); });
         });
 
         const auto provider = app.GetServiceCollection().CreateServiceProvider();

test/src/Core/ComponentManagerSpec.cpp

@@ -11,7 +11,7 @@ class ComponentManagerSpec : public ::testing::Test
     void SetUp() override
     {
         auto app = skr::ApplicationBuilder().AddExtension<fr::FreyrExtension>([](fr::FreyrExtension& freyr) {
-            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.SetArchetypeChunkCapacity(1024); });
+            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.WithArchetypeChunkCapacity(1024); });
         });
 
         mServiceProvider = app.GetServiceCollection().CreateServiceProvider();

test/src/Core/EntityManagerSpec.cpp

@@ -8,7 +8,7 @@ class EntityManagerSpec : public ::testing::Test
     void SetUp() override
     {
         auto app = skr::ApplicationBuilder().AddExtension<fr::FreyrExtension>([](fr::FreyrExtension& freyr) {
-            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.SetArchetypeChunkCapacity(1024); });
+            freyr.WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.WithArchetypeChunkCapacity(1024); });
         });
 
         const auto provider = app.GetServiceCollection().CreateServiceProvider();

test/src/Core/SceneSpec.cpp

@@ -29,7 +29,7 @@ class SceneSpec : public ::testing::Test
                         .AddComponent<DecayComponent>()
                         .AddSystem<DecaySystem>()
                         .AddSystem<MovementSystem>()
-                        .WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.SetArchetypeChunkCapacity(2048); });
+                        .WithOptions([](fr::FreyrOptionsBuilder& builder) { builder.WithArchetypeChunkCapacity(2048); });
                 })
                 .Build<App>();