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

Add Engine/Level.h include to CityMapMeshHolder. (#7804) 

Co-Authored-By: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
This commit is contained in:
MarcelPiNacy-CVC 2024-06-18 16:07:51 +02:00 committed by GitHub
parent 898ad811da
commit aa66541495
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp
View File

@ -7,12 +7,13 @@
#include "CityMapMeshHolder.h"
#include "Carla.h"
#include "Engine/StaticMeshActor.h"
#include "Components/InstancedStaticMeshComponent.h"
#include "Engine/StaticMesh.h"
#include <vector>
#include "Engine/Level.h"
#include "Components/InstancedStaticMeshComponent.h"
#include "Settings/CarlaSettings.h"
#include "Game/CarlaGameInstance.h"
#include "Kismet/KismetSystemLibrary.h"
#include <vector>
using tag_size_t = std::underlying_type<ECityMapMeshTag>::type;
@ -57,11 +58,11 @@ void ACityMapMeshHolder::PostInitializeComponents()
{
Super::PostInitializeComponents();
if(IsValid(GetLevel())&&!GetLevel()->IsPendingKill())
if (IsValid(GetLevel()) && !GetLevel()->IsPendingKill())
{
TArray<AActor*> roadpieces;
GetAttachedActors(roadpieces);
if(roadpieces.Num()==0)
if (roadpieces.Num()==0)
{
UE_LOG(LogCarla, Error, TEXT("Please regenerate the road in edit mode for '%s' actor"), *UKismetSystemLibrary::GetDisplayName(this));
UpdateMapScale();
@ -156,7 +157,7 @@ void ACityMapMeshHolder::DeletePieces()
//this part will be deprecated: remove the instanced static mesh components
TArray<UInstancedStaticMeshComponent*> oldcomponents;
GetComponents(oldcomponents);
for(int32 i=0;i<oldcomponents.Num();i++)
for (int32 i=0;i<oldcomponents.Num();i++)
{
oldcomponents[i]->DestroyComponent();
}
@ -164,9 +165,9 @@ void ACityMapMeshHolder::DeletePieces()
TArray<AActor*> roadpieces;
GetAttachedActors(roadpieces);
for(int32 i=roadpieces.Num()-1; i>=0; i--)
for (int32 i=roadpieces.Num()-1; i>=0; i--)
{
if(roadpieces[i]->ActorHasTag(UCarlaSettings::CARLA_ROAD_TAG))
if (roadpieces[i]->ActorHasTag(UCarlaSettings::CARLA_ROAD_TAG))
{
roadpieces[i]->Destroy();
}