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 #397 from carla-simulator/issue#396 

Changes in CarlaSettingsDelegate so it wont apply max distance culling to foliage in Low mode
This commit is contained in:
Néstor Subirón 2018-05-08 14:33:50 +02:00 committed by GitHub
parent 46dcb1dc14 4779236a80
commit 6458981ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
View File

@ -37,7 +37,9 @@ public class Carla : ModuleRules
"Engine",
"PhysXVehicles",
"Slate",
"SlateCore"
"SlateCore",
"Landscape",
"Foliage"
// ... add private dependencies that you statically link with here ...
}
);

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

@ -9,8 +9,9 @@
#include "Engine/DirectionalLight.h"
#include "Engine/StaticMesh.h"
#include "Engine/PostProcessVolume.h"
#include "UObjectIterator.h"
#include "Async.h"
#include "Landscape.h"
#include "InstancedFoliageActor.h"
///quality settings configuration between runs
EQualitySettingsLevel UCarlaSettingsDelegate::AppliedLowPostResetQualitySettingsLevel = EQualitySettingsLevel::Epic;
@ -34,10 +35,12 @@ void UCarlaSettingsDelegate::RegisterSpawnHandler(UWorld *InWorld)
void UCarlaSettingsDelegate::OnActorSpawned(AActor* InActor)
{
check(CarlaSettings!=nullptr);
if (InActor != nullptr && IsValid(InActor) && !InActor->IsPendingKill() &&
if (InActor != nullptr && IsValid(InActor) && !InActor->IsPendingKill() &&
!InActor->IsA<AInstancedFoliageActor>() && //foliage culling is controlled per instance
!InActor->IsA<ALandscape>() && //dont touch landscapes nor roads
!InActor->ActorHasTag(UCarlaSettings::CARLA_ROAD_TAG) &&
!InActor->ActorHasTag(UCarlaSettings::CARLA_SKY_TAG)
){
){
TArray<UActorComponent*> components = InActor->GetComponentsByClass(UPrimitiveComponent::StaticClass());
switch(CarlaSettings->GetQualitySettingsLevel())
{
@ -63,7 +66,7 @@ void UCarlaSettingsDelegate::ApplyQualitySettingsLevelPostRestart()
CheckCarlaSettings(nullptr);
UWorld *InWorld = CarlaSettings->GetWorld();
EQualitySettingsLevel QualitySettingsLevel = CarlaSettings->GetQualitySettingsLevel();
const EQualitySettingsLevel QualitySettingsLevel = CarlaSettings->GetQualitySettingsLevel();
if(AppliedLowPostResetQualitySettingsLevel==QualitySettingsLevel) return;
switch(QualitySettingsLevel)
@ -190,8 +193,9 @@ void UCarlaSettingsDelegate::SetAllRoads(UWorld* world, const float max_draw_dis
for(int32 i=0; i<actors.Num(); i++)
{
if(!IsValid(actors[i]) || actors[i]->IsPendingKillPending()) continue;
TArray<UActorComponent*> components = actors[i]->GetComponentsByClass(UStaticMeshComponent::StaticClass());
AActor* actor = actors[i];
if(!IsValid(actor) || actor->IsPendingKill()) continue;
TArray<UActorComponent*> components = actor->GetComponentsByClass(UStaticMeshComponent::StaticClass());
for(int32 j=0; j<components.Num(); j++)
{
UStaticMeshComponent* staticmeshcomponent = Cast<UStaticMeshComponent>(components[j]);
@ -257,13 +261,16 @@ void UCarlaSettingsDelegate::SetAllActorsDrawDistance(UWorld* world, const float
UGameplayStatics::GetAllActorsOfClass(world, AActor::StaticClass(),actors);
for(int32 i=0; i<actors.Num(); i++)
{
if(!IsValid(actors[i]) || actors[i]->IsPendingKillPending() ||
actors[i]->ActorHasTag(UCarlaSettings::CARLA_ROAD_TAG) ||
actors[i]->ActorHasTag(UCarlaSettings::CARLA_SKY_TAG)
AActor* actor = actors[i];
if(!IsValid(actor) || actor->IsPendingKill() ||
actor->IsA<AInstancedFoliageActor>() || //foliage culling is controlled per instance
actor->IsA<ALandscape>() || //dont touch landscapes nor roads
actor->ActorHasTag(UCarlaSettings::CARLA_ROAD_TAG) ||
actor->ActorHasTag(UCarlaSettings::CARLA_SKY_TAG)
){
continue;
}
SetActorComponentsDrawDistance(actors[i], max_draw_distance);
SetActorComponentsDrawDistance(actor, max_draw_distance);
}
});
}
@ -275,8 +282,9 @@ void UCarlaSettingsDelegate::SetPostProcessEffectsEnabled(UWorld* world, const b
UGameplayStatics::GetAllActorsOfClass(world, APostProcessVolume::StaticClass(), actors);
for(int32 i=0; i<actors.Num(); i++)
{
if(!IsValid(actors[i]) || actors[i]->IsPendingKillPending()) continue;
APostProcessVolume* postprocessvolume = Cast<APostProcessVolume>(actors[i]);
AActor* actor = actors[i];
if(!IsValid(actor) || actor->IsPendingKill()) continue;
APostProcessVolume* postprocessvolume = Cast<APostProcessVolume>(actor);
if(postprocessvolume)
{
postprocessvolume->bEnabled = enabled;
@ -334,7 +342,7 @@ void UCarlaSettingsDelegate::SetAllLights(UWorld* world, const float max_distanc
UGameplayStatics::GetAllActorsOfClass(world, ALight::StaticClass(), actors);
for(int32 i=0;i<actors.Num();i++)
{
if(!IsValid(actors[i]) || actors[i]->IsPendingKillPending()) continue;
if(!IsValid(actors[i]) || actors[i]->IsPendingKill()) continue;
//tweak directional lights
ADirectionalLight* directionallight = Cast<ADirectionalLight>(actors[i]);
if(directionallight)