From 3bb3b0d3d55d40ccd6a35dca53fbb16b6aa2134b Mon Sep 17 00:00:00 2001 From: Axel Date: Tue, 22 Dec 2020 15:31:04 +0100 Subject: [PATCH] Revert "Fixed tm loosing control of cars with low fps" This reverts commit 30fc87a11a455e627cd8d2c5340fa86e4a1fbfa7. --- LibCarla/source/carla/trafficmanager/TrafficManagerLocal.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LibCarla/source/carla/trafficmanager/TrafficManagerLocal.cpp b/LibCarla/source/carla/trafficmanager/TrafficManagerLocal.cpp index b6531c973..7e7609dd1 100644 --- a/LibCarla/source/carla/trafficmanager/TrafficManagerLocal.cpp +++ b/LibCarla/source/carla/trafficmanager/TrafficManagerLocal.cpp @@ -128,6 +128,7 @@ void TrafficManagerLocal::Run() { while (run_traffic_manger.load()) { bool synchronous_mode = parameters.GetSynchronousMode(); + bool hybrid_physics_mode = parameters.GetHybridPhysicsMode(); // Wait for external trigger to initiate cycle in synchronous mode. if (synchronous_mode) { @@ -137,7 +138,7 @@ void TrafficManagerLocal::Run() { } // Skipping velocity update if elapsed time is less than 0.05s in asynchronous, hybrid mode. - if (!synchronous_mode) { + if (!synchronous_mode && hybrid_physics_mode) { TimePoint current_instance = chr::system_clock::now(); chr::duration elapsed_time = current_instance - previous_update_instance; chr::duration time_to_wait = chr::duration(HYBRID_MODE_DT) - elapsed_time;