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

Fixed warning in GenerateTriggerBox function.

This commit is contained in:
Axel1092 2020-03-23 10:18:34 +01:00 committed by bernat
parent 892cab9dab
commit 2c6483d194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.cpp
View File

@ -325,15 +325,14 @@ std::vector<int> 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<UBoxComponent>(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);
}
}
}

3
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightManager.h
View File

@ -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);