Merge pull request #4385 from zimmy87/fix-4350

fix scaling of pause period in car mode
microsoft · Mar 31, 2022 · 9208ce4 · 9208ce4
2 parents efa1873 + 8a78b5c
commit 9208ce4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/AirLib/include/common/ClockBase.hpp b/AirLib/include/common/ClockBase.hpp
@@ -48,6 +48,12 @@ namespace airlib
             return elapsed;
         }
 
+        virtual TTimePoint stepBy(TTimeDelta amount)
+        {
+            unused(amount);
+            return step();
+        }
+
         virtual TTimePoint step()
         {
             //by default step doesn't do anything

diff --git a/AirLib/include/common/SteppableClock.hpp b/AirLib/include/common/SteppableClock.hpp
@@ -30,7 +30,7 @@ namespace airlib
 
         virtual ~SteppableClock() {}
 
-        TTimePoint stepBy(TTimeDelta amount)
+        virtual TTimePoint stepBy(TTimeDelta amount) override
         {
             current_ = addTo(current_, amount);
             return current_;

diff --git a/Unreal/Plugins/AirSim/Source/Vehicles/Car/SimModeCar.cpp b/Unreal/Plugins/AirSim/Source/Vehicles/Car/SimModeCar.cpp
@@ -28,7 +28,7 @@ void ASimModeCar::initializePauseState()
 void ASimModeCar::continueForTime(double seconds)
 {
     pause_period_start_ = ClockFactory::get()->nowNanos();
-    pause_period_ = seconds;
+    pause_period_ = seconds * current_clockspeed_;
     pause(false);
 }
 
@@ -54,6 +54,9 @@ void ASimModeCar::Tick(float DeltaSeconds)
 {
     Super::Tick(DeltaSeconds);
 
+    if (!isPaused())
+        ClockFactory::get()->stepBy(DeltaSeconds);
+
     if (pause_period_start_ > 0) {
         if (ClockFactory::get()->elapsedSince(pause_period_start_) >= pause_period_) {
             if (!isPaused())