From 62a48ca68939ff50fa212370d0e1894521cee4a9 Mon Sep 17 00:00:00 2001 From: iFuSiiOnzZ Date: Tue, 16 Oct 2018 18:24:16 +0200 Subject: [PATCH] Add diferent route options to the RoutePlanner --- .../CarlaUE4/Plugins/Carla/Source/Carla/OpenDriveActor.cpp | 4 ++-- .../Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDriveActor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDriveActor.cpp index 2c591b1f4..b5ca74dc9 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDriveActor.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDriveActor.cpp @@ -57,7 +57,7 @@ void AOpenDriveActor::BeginPlay() processed.Add(id); } - /*std::vector successorIds = map.GetRoad(id)->GetSuccessorsIds(); + std::vector successorIds = map.GetRoad(id)->GetSuccessorsIds(); if (successorIds.size()) { ARoutePlanner *routePlaner = GetWorld()->SpawnActor(); @@ -67,7 +67,7 @@ void AOpenDriveActor::BeginPlay() fnc_generate_points(map.GetRoad(successorID), routePlaner); processed.Add(successorID); } - }*/ + } } } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp index 341ffb864..9a9b70ba3 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/RoutePlanner.cpp @@ -124,12 +124,6 @@ void ARoutePlanner::Init() } } -void ARoutePlanner::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - UE_LOG(LogCarla, Log, TEXT("%f %f %f\n"), GetActorLocation().X, GetActorLocation().Y, GetActorLocation().Z); -} - void ARoutePlanner::BeginPlay() { Super::BeginPlay();