fix(physics): do fixed updates correctly

GameDevTecnico · Nov 26, 2024 · fba21ee · fba21ee
1 parent 49e590f
commit fba21ee
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed delta time not used in some physics systems and simulations exploding after being frozen for too long (**@joaomanita**).
 - Crash in ecs when removing or destroying components with observers (#1348, **@SrGesus**).
 - Crash when opening the Play Pause menu (**SrGesus**).
 - Duplicated destructor call in AnyVector which caused double free crashes on multiple samples (**@RiscadoA**).

diff --git a/engine/samples/collisions/main.cpp b/engine/samples/collisions/main.cpp
@@ -147,7 +147,6 @@ int main(int argc, char** argv)
 
     cubos.system("move colliders")
         .tagged(physicsApplyForcesTag)
-        .before(transformUpdateTag)
         .call(
             [](State& state, const Options& options, const Input& input, Query<Position&, Rotation&, Velocity&> query) {
                 auto [aPos, aRot, aVel] = *query.at(state.a);

diff --git a/engine/samples/voxel-shape-collisions/main.cpp b/engine/samples/voxel-shape-collisions/main.cpp
@@ -121,7 +121,7 @@ int main()
     });
 
     cubos.system("move colliders")
-        .before(transformUpdateTag)
+        .tagged(physicsApplyForcesTag)
         .call([](State& state, Query<Position&, Rotation&, Velocity&> query) {
             auto [aPos, aRot, aVel] = *query.at(state.a);
             auto [bPos, bRot, bVel] = *query.at(state.b);

diff --git a/engine/src/fixed_step/plugin.cpp b/engine/src/fixed_step/plugin.cpp
@@ -26,7 +26,9 @@ void cubos::engine::fixedStepPlugin(Cubos& cubos)
         return false;
     });
 
-    cubos.system("accumulate time resource").before(fixedStepTag).call([](AccumulatedTime& timer, const DeltaTime& dt) {
-        timer.value += dt.value();
-    });
+    cubos.system("accumulate time resource")
+        .before(fixedStepTag)
+        .call([](AccumulatedTime& timer, const DeltaTime& dt, const FixedDeltaTime& step) {
+            timer.value += std::min(dt.value(), 2 * step.value);
+        });
 }
diff --git a/engine/src/physics/plugin.cpp b/engine/src/physics/plugin.cpp
@@ -238,5 +238,5 @@ void cubos::engine::physicsPlugin(Cubos& cubos)
             }
         });
 
-    cubos.tag(physicsApplyForcesTag);
+    cubos.tag(physicsApplyForcesTag).tagged(fixedStepTag);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,5 +238,5 @@ void cubos::engine::physicsPlugin(Cubos& cubos) @@
                 }
             });
-        cubos.tag(physicsApplyForcesTag);
+        cubos.tag(physicsApplyForcesTag).tagged(fixedStepTag);
     }