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

Checking pointers

This commit is contained in:
bernatx 2022-07-27 23:33:50 +02:00
parent af0e2570af
commit cca9b6a3c9
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.cpp
View File

@ -164,8 +164,9 @@ void AVegetationManager::Tick(float DeltaTime)
GenerateTileDataInternals();
}
TArray<FString> TilesInUse = GetTilesInUse();
if (TilesInUse.Num() == 0)
return;
UpdateMaterials(TilesInUse);
TArray<TPair<FFoliageBlueprint, TArray<FTransform>>> ElementsToSpawn = GetElementsToSpawn(TilesInUse);
SpawnSkeletalFoliages(ElementsToSpawn);
DestroySkeletalFoliages();
@ -629,17 +630,22 @@ TArray<FString> AVegetationManager::GetTilesInUse()
TileDataCache.Remove(Element.Key);
return Results;
}
const AProceduralFoliageVolume* Procedural = TileData.ProceduralFoliageVolume;
if (!Procedural)
continue;
const FString TileName = Procedural->GetLevel()->GetOuter()->GetName();
const FBox Box = Procedural->ProceduralComponent->GetBounds();
if (Results.Contains(Element.Key))
continue;
const AProceduralFoliageVolume* Procedural = TileData.ProceduralFoliageVolume;
if (!IsValid(Procedural))
continue;
if (!IsValid(Procedural->ProceduralComponent))
continue;
if (Element.Key.IsEmpty())
continue;
const FBox Box = Procedural->ProceduralComponent->GetBounds();
if (!Box.IsValid)
continue;
for (ACarlaWheeledVehicle* Vehicle : VehiclesInLevel)
{
if (!IsValid(Vehicle))
continue;
if (Box.IsInside(Vehicle->GetActorLocation()))
{
Results.Emplace(Element.Key);