p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixed tm loosing control of cars with low fps" 

This reverts commit 30fc87a11a.
This commit is contained in:
Axel 2020-12-22 15:31:04 +01:00 committed by bernat
parent 3f4eed2239
commit 3bb3b0d3d5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LibCarla/source/carla/trafficmanager/TrafficManagerLocal.cpp
View File

@ -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<float> elapsed_time = current_instance - previous_update_instance;
chr::duration<float> time_to_wait = chr::duration<float>(HYBRID_MODE_DT) - elapsed_time;