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

Merge pull request #375 from carla-simulator/spawn_vehicles_fix 

Changes in the vehicles spawning algorithm
This commit is contained in:
Néstor Subirón 2018-04-23 17:17:43 +02:00 committed by GitHub
parent 9390a02220 e577c10026
commit 8f136f7018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleSpawnerBase.cpp
View File

@ -79,35 +79,42 @@ void AVehicleSpawnerBase::BeginPlay()
if (bSpawnVehicles)
{
GetRandomEngine()->Shuffle(SpawnPoints);
const int32 MaximumNumberOfAttempts = SpawnPoints.Num();
int32 NumberOfAttempts = 0;
GetRandomEngine()->Shuffle(SpawnPoints); //to get a random spawn point from the map
const int32 MaximumNumberOfAttempts = SpawnPoints.Num();
int32 NumberOfAttempts = 0;
int32 SpawnIndexCount = 0;
while ((NumberOfVehicles > Vehicles.Num()) && (NumberOfAttempts < MaximumNumberOfAttempts))
{
SpawnVehicleAtSpawnPoint(*SpawnPoints[NumberOfAttempts]);
++NumberOfAttempts;
if(SpawnPoints.IsValidIndex(SpawnIndexCount))
{
if(SpawnVehicleAtSpawnPoint(*SpawnPoints[SpawnIndexCount])){
SpawnIndexCount++;
}
}
NumberOfAttempts++;
}
if (NumberOfAttempts > NumberOfVehicles)
bool bAllSpawned = false;
if (NumberOfVehicles > SpawnIndexCount)
{
UE_LOG(LogCarla, Error, TEXT("Requested %d vehicles, but we were only able to spawn %d"), NumberOfVehicles, Vehicles.Num());
UE_LOG(LogCarla, Warning, TEXT("Requested %d vehicles, but we were only able to spawn %d"), NumberOfVehicles, SpawnIndexCount);
} else
{
if(NumberOfAttempts == NumberOfVehicles)
if(SpawnIndexCount == NumberOfVehicles)
{
UE_LOG(LogCarla, Log, TEXT("Spawned all %d vehicles"), NumberOfAttempts);
} else
{
UE_LOG(LogCarla, Log,
TEXT("Starting the timer to spawn the other %d vehicles, one per %f seconds"),
NumberOfVehicles - NumberOfAttempts,
TimeBetweenSpawnAttemptsAfterBegin
);
GetWorld()->GetTimerManager().SetTimer(AttemptTimerHandle,this, &AVehicleSpawnerBase::SpawnVehicleAttempt, TimeBetweenSpawnAttemptsAfterBegin,false,-1);
}
bAllSpawned = true;
}
}
if(!bAllSpawned)
{
UE_LOG(LogCarla, Log,
TEXT("Starting the timer to spawn the other %d vehicles, one per %f seconds"),
NumberOfVehicles - SpawnIndexCount,
TimeBetweenSpawnAttemptsAfterBegin
);
GetWorld()->GetTimerManager().SetTimer(AttemptTimerHandle,this, &AVehicleSpawnerBase::SpawnVehicleAttempt, TimeBetweenSpawnAttemptsAfterBegin,false,-1);
} else
{
UE_LOG(LogCarla, Log, TEXT("Spawned all %d requested vehicles"), NumberOfVehicles);
}
}
}
@ -139,7 +146,7 @@ void AVehicleSpawnerBase::TryToSpawnRandomVehicle()
}
}
void AVehicleSpawnerBase::SpawnVehicleAtSpawnPoint(
ACarlaWheeledVehicle* AVehicleSpawnerBase::SpawnVehicleAtSpawnPoint(
const APlayerStart &SpawnPoint)
{
ACarlaWheeledVehicle *Vehicle;
@ -156,10 +163,12 @@ void AVehicleSpawnerBase::SpawnVehicleAtSpawnPoint(
Controller->SetAutopilot(true);
Vehicles.Add(Vehicle);
} else {
UE_LOG(LogCarla, Error, TEXT("Something went wrong creating the controller for the new vehicle"));
Vehicle->Destroy();
}
}
return Vehicle;
}
void AVehicleSpawnerBase::SpawnVehicleAttempt()
@ -176,7 +185,10 @@ void AVehicleSpawnerBase::SpawnVehicleAttempt()
float NextTime = TimeBetweenSpawnAttemptsAfterBegin;
if(DistanceToPlayer>DistanceToPlayerBetweenSpawnAttemptsAfterBegin)
{
SpawnVehicleAtSpawnPoint(*spawnpoint);
if(SpawnVehicleAtSpawnPoint(*spawnpoint)!=nullptr)
{
UE_LOG(LogCarla, Log, TEXT("Vehicle %d/%d late spawned"), Vehicles.Num(), NumberOfVehicles);
}
} else
{
NextTime /= 2.0f;
@ -189,7 +201,7 @@ void AVehicleSpawnerBase::SpawnVehicleAttempt()
timemanager.SetTimer(AttemptTimerHandle,this, &AVehicleSpawnerBase::SpawnVehicleAttempt,NextTime,false,-1);
} else
{
UE_LOG(LogCarla, Log, TEXT("Last vehicle spawned correctly"));
UE_LOG(LogCarla, Log, TEXT("All vehicles spawned correctly"));
}
}

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleSpawnerBase.h
View File

@ -68,7 +68,7 @@ protected:
APlayerStart* GetRandomSpawnPoint();
void SpawnVehicleAtSpawnPoint(const APlayerStart &SpawnPoint);
ACarlaWheeledVehicle* SpawnVehicleAtSpawnPoint(const APlayerStart &SpawnPoint);
UPROPERTY()
URoadMap *RoadMap = nullptr;