From 2c6483d1948a2d6e61a7fa1a9760c8fbbd3e92e5 Mon Sep 17 00:00:00 2001 From: Axel1092 Date: Mon, 23 Mar 2020 10:18:34 +0100 Subject: [PATCH] Fixed warning in GenerateTriggerBox function. --- .../Carla/Source/Carla/Traffic/TrafficLightManager.cpp | 7 +++---- .../Carla/Source/Carla/Traffic/TrafficLightManager.h | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp index e447a5cb9..2e699e0cd 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp @@ -325,15 +325,14 @@ std::vector GenerateRange(int a, int b) return result; } -void ATrafficLightManager::GenerateTriggerBox(const carla::road::Map &Map, - const carla::road::element::Waypoint &waypoint, +void ATrafficLightManager::GenerateTriggerBox(const carla::road::element::Waypoint &waypoint, UTrafficLightComponent* TrafficLightComponent, float BoxSize) { // convert from m to cm float UEBoxSize = 100 * BoxSize; AActor *ParentActor = TrafficLightComponent->GetOwner(); - FTransform ReferenceTransform = Map.ComputeTransform(waypoint); + FTransform ReferenceTransform = GetMap()->ComputeTransform(waypoint); UBoxComponent *BoxComponent = NewObject(ParentActor); BoxComponent->RegisterComponent(); BoxComponent->AttachToComponent( @@ -401,7 +400,7 @@ void ATrafficLightManager::GenerateTriggerBoxesForTrafficLights() signal_waypoint.s = FMath::Clamp(signal_waypoint.s + BoxSize, LaneDistance + epsilon, LaneDistance + LaneLength - epsilon); } - GenerateTriggerBox(GetMap().get(), signal_waypoint, TrafficLightComponent, BoxSize); + GenerateTriggerBox(signal_waypoint, TrafficLightComponent, BoxSize); } } } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h index f51653301..fa41e693b 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h @@ -58,8 +58,7 @@ private: void GenerateTriggerBoxesForTrafficLights(); - void GenerateTriggerBox(const carla::road::Map &Map, - const carla::road::element::Waypoint &waypoint, + void GenerateTriggerBox(const carla::road::element::Waypoint &waypoint, UTrafficLightComponent* TrafficLightComponent, float BoxSize);