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

Fixed deprecated warnings.

This commit is contained in:
Axel 2020-03-09 12:32:59 +01:00 committed by bernat
parent 6ba4d68a48
commit 79ebb51a22
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.cpp
View File

@ -44,7 +44,7 @@ ACityMapMeshHolder::ACityMapMeshHolder(const FObjectInitializer& ObjectInitializ
{
IDetailCategoryBuilder& DetailCategory = DetailLayout.EditCategory("Rendering");
IDetailPropertyRow& row = DetailCategory.AddProperty("Generation", TEXT(""));
}*/
void ACityMapMeshHolder::OnConstruction(const FTransform &Transform)
@ -56,9 +56,9 @@ void ACityMapMeshHolder::OnConstruction(const FTransform &Transform)
void ACityMapMeshHolder::PostInitializeComponents()
{
Super::PostInitializeComponents();
if(IsValid(GetLevel())&&!GetLevel()->IsPendingKill())
{
{
TArray<AActor*> roadpieces;
GetAttachedActors(roadpieces);
if(roadpieces.Num()==0)
@ -68,15 +68,15 @@ void ACityMapMeshHolder::PostInitializeComponents()
UpdateMap();
}
}
}
#if WITH_EDITOR
void ACityMapMeshHolder::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
{
Super::PostEditChangeProperty(PropertyChangedEvent);
if (PropertyChangedEvent.Property)
{
if (PropertyChangedEvent.Property)
{
DeletePieces();
UpdateMapScale();
UpdateMap();
@ -154,15 +154,16 @@ void ACityMapMeshHolder::UpdateMap() {}
void ACityMapMeshHolder::DeletePieces()
{
//this part will be deprecated: remove the instanced static mesh components
TArray<UActorComponent*> oldcomponents = GetComponentsByClass(UInstancedStaticMeshComponent::StaticClass());
TArray<UInstancedStaticMeshComponent*> oldcomponents;
GetComponents(oldcomponents);
for(int32 i=0;i<oldcomponents.Num();i++)
{
oldcomponents[i]->DestroyComponent();
}
TArray<AActor*> roadpieces;
GetAttachedActors(roadpieces);
for(int32 i=roadpieces.Num()-1; i>=0; i--)
{
if(roadpieces[i]->ActorHasTag(UCarlaSettings::CARLA_ROAD_TAG))
@ -170,7 +171,7 @@ void ACityMapMeshHolder::DeletePieces()
roadpieces[i]->Destroy();
}
}
}
void ACityMapMeshHolder::UpdateMapScale()

9
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettingsDelegate.cpp
View File

@ -48,7 +48,8 @@ void UCarlaSettingsDelegate::OnActorSpawned(AActor *InActor)
!InActor->ActorHasTag(UCarlaSettings::CARLA_ROAD_TAG) &&
!InActor->ActorHasTag(UCarlaSettings::CARLA_SKY_TAG))
{
TArray<UActorComponent *> components = InActor->GetComponentsByClass(UPrimitiveComponent::StaticClass());
TArray<UPrimitiveComponent *> components;
InActor->GetComponents(components);
switch (CarlaSettings->GetQualityLevel())
{
case EQualityLevel::Low: {
@ -245,7 +246,8 @@ void UCarlaSettingsDelegate::SetAllRoads(
{
continue;
}
TArray<UActorComponent *> components = actor->GetComponentsByClass(UStaticMeshComponent::StaticClass());
TArray<UStaticMeshComponent *> components;
actor->GetComponents(components);
for (int32 j = 0; j < components.Num(); j++)
{
UStaticMeshComponent *staticmeshcomponent = Cast<UStaticMeshComponent>(components[j]);
@ -292,7 +294,8 @@ void UCarlaSettingsDelegate::SetActorComponentsDrawDistance(
{
return;
}
TArray<UActorComponent *> components = actor->GetComponentsByClass(UPrimitiveComponent::StaticClass());
TArray<UPrimitiveComponent *> components;
actor->GetComponents(components, false);
float dist = max_draw_distance;
const float maxscale = actor->GetActorScale().GetMax();
if (maxscale > CARLA_SETTINGS_MAX_SCALE_SIZE)