feat(engine): add fixedStep plugin

GameDevTecnico · Feb 21, 2024 · 1a00426 · 1a00426
1 parent 89ceb5a
commit 1a00426
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 47 deletions.
diff --git a/engine/src/fixedstep/plugin.cpp b/engine/src/fixedstep/plugin.cpp
@@ -1,26 +1,24 @@
-#include <cubos/engine/fixedstep/plugin.hpp>
 #include <cubos/engine/fixedstep/accumulated_time.hpp>
-
+#include <cubos/engine/fixedstep/plugin.hpp>
 
 using namespace cubos::engine;
 
-const float frametime = 1/60;
-
-
+const float frametime = 0.01F;
 
 void cubos::engine::fixedStepPlugin(Cubos& cubos)
 {
     cubos.addResource<AccumulatedTime>();
 
-    cubos.system("accumulate time resource").call([](AccumulatedTime& timer, const DeltaTime& dt) {
-            timer.value += dt.value;
-        });
+    cubos.system("accumulate time resource")
+        .tagged("accumulator")
+        .call([](AccumulatedTime& timer, const DeltaTime& dt) { timer.value += dt.value; });
 
     cubos.tag("cubos.fixedStep").repeatWhile([](AccumulatedTime& timer) {
-            if (timer.value >= frametime) {
-                timer.value -= frametime;
-                return true;
-            }
-            return false;
-        });
+        if (timer.value >= frametime)
+        {
+            timer.value -= frametime;
+            return true;
+        }
+        return false;
+    });
 }
diff --git a/engine/src/physics/physics_accumulator.hpp b/engine/src/physics/physics_accumulator.hpp
diff --git a/engine/src/physics/plugin.cpp b/engine/src/physics/plugin.cpp
@@ -1,13 +1,11 @@
 #include <glm/glm.hpp>
 
 #include <cubos/engine/collisions/plugin.hpp>
+#include <cubos/engine/fixedstep/plugin.hpp>
 #include <cubos/engine/physics/plugin.hpp>
 #include <cubos/engine/physics/solver/solver.hpp>
 #include <cubos/engine/settings/plugin.hpp>
 #include <cubos/engine/transform/plugin.hpp>
-#include <cubos/engine/fixedstep/plugin.hpp>
-
-#include "physics_accumulator.hpp"
 
 using namespace cubos::engine;
 
@@ -62,12 +60,10 @@ CUBOS_REFLECT_IMPL(PhysicsBundle)
         .build();
 }
 
-
 void cubos::engine::physicsPlugin(Cubos& cubos)
 {
     cubos.addResource<FixedDeltaTime>();
     cubos.addResource<Substeps>();
-    cubos.addResource<PhysicsAccumulator>();
     cubos.addResource<Damping>();
 
     cubos.addComponent<Velocity>();
@@ -106,10 +102,7 @@ void cubos::engine::physicsPlugin(Cubos& cubos)
             }
         });
 
-
-    cubos.tag("cubos.physics.apply_forces")
-        .after("cubos.physics.simulation.prepare")
-        .before("cubos.physics.simulation.substeps.integrate");
+    cubos.tag("cubos.physics.apply_forces").after("accumulator").before("cubos.physics.simulation.substeps.integrate");
 
     cubos.system("apply impulses")
         .tagged("cubos.physics.simulation.apply_impulses")
@@ -125,7 +118,7 @@ void cubos::engine::physicsPlugin(Cubos& cubos)
 
     cubos.system("integrate position")
         .tagged("cubos.physics.simulation.substeps.integrate")
-        .after("cubos.physics.simulation.prepare")
+        .after("accumulator")
         .tagged("cubos.fixedStep")
         .call([](Query<Position&, PreviousPosition&, Velocity&, const Force&, const Mass&> query,
                  const Damping& damping, const FixedDeltaTime& fixedDeltaTime, const Substeps& substeps) {
@@ -202,12 +195,4 @@ void cubos::engine::physicsPlugin(Cubos& cubos)
                 impulse.clear();
             }
         });
-
-    cubos.system("decrease fixed-step accumulator")
-        .tagged("cubos.physics.simulation.decrease_accumulator")
-        .after("cubos.physics.simulation.clear_forces")
-        .tagged("cubos.fixedStep")
-        .call([](PhysicsAccumulator& accumulator, const FixedDeltaTime& fixedDeltaTime) {
-            accumulator.value -= fixedDeltaTime.value;
-        });
 }