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

Small changes in Carla plugin for settings

This commit is contained in:
juaxix 2018-02-27 16:39:11 +01:00
parent f9ae4b3c7c
commit 39f7fc9d25
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.cpp
View File

@ -1,9 +1,9 @@
// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
#include "Carla.h"
#include "ISettingsModule.h"
#include "ISettingsSection.h"
#include "ISettingsContainer.h"
#include "Developer/Settings/Public/ISettingsModule.h"
#include "Developer/Settings/Public/ISettingsSection.h"
#include "Developer/Settings/Public/ISettingsContainer.h"
#include "Settings/CarlaSettings.h"
#define LOCTEXT_NAMESPACE "FCarlaModule"

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/MapGen/CityMapMeshHolder.h
View File

@ -117,5 +117,5 @@ private:
TArray<UInstancedStaticMeshComponent *> MeshInstatiators;
UPROPERTY(Category = "Meshes", EditAnywhere)
float MaxDrawDistance = 10000.0f;
float MaxDrawDistance = 10000.0f; /** @todo: move to carlasettings */
};

11
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettings.cpp
View File

@ -18,7 +18,7 @@
#include "Kismet/GameplayStatics.h"
#include "Engine/DirectionalLight.h"
#include "Engine/PointLight.h"
#include "Landscape.h"
//#include "Landscape.h" //--> needs Lanscape module in the build cs
#include "Components/StaticMeshComponent.h"
@ -204,7 +204,7 @@ void UCarlaSettings::ApplyQualitySettingsLevelPostRestart() const
world->Exec(world,TEXT("r.HZBOcclusion 0"));
world->Exec(world,TEXT("r.MinScreenRadiusForLights 0.01"));
world->Exec(world,TEXT("r.SeparateTranslucency 0"));
world->Exec(world,TEXT("r.FinishCurrentFrame 1"));
world->Exec(world,TEXT("r.FinishCurrentFrame 0"));
world->Exec(world,TEXT("r.MotionBlurQuality 0"));
world->Exec(world,TEXT("r.PostProcessAAQuality 0"));
world->Exec(world,TEXT("r.BloomQuality 1"));
@ -226,14 +226,17 @@ void UCarlaSettings::ApplyQualitySettingsLevelPostRestart() const
world->Exec(world,TEXT("r.Foliage.DitheredLOD 0"));
world->Exec(world,TEXT("r.ForwardShading 0"));
world->Exec(world,TEXT("sg.PostProcessQuality 0"));
world->Exec(world,TEXT("r.ViewDistanceScale 0.1"));
world->Exec(world,TEXT("r.ViewDistanceScale 0.1"));
world->Exec(world,TEXT("sg.ShadowQuality 0"));
world->Exec(world,TEXT("sg.TextureQuality 0"));
world->Exec(world,TEXT("sg.EffectsQuality 0"));
world->Exec(world,TEXT("FoliageQuality 0"));
world->Exec(world,TEXT("foliage.DensityScale 0"));
world->Exec(world,TEXT("grass.DensityScale 0"));
world->Exec(world,TEXT("r.TranslucentLightingVolume 0"));
world->Exec(world,TEXT("r.LightShaftDownSampleFactor 4"));
world->Exec(world,TEXT("r.OcclusionQueryLocation 1"));
world->Exec(world,TEXT("r.BasePassOutputsVelocity 0"));
//world->Exec(world,TEXT("r.DetailMode 0")); //-->will change to lods 0
//iterate all vehicles and people, set the draw distance
TArray<AActor*> actors;

8
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettings.h
View File

@ -19,7 +19,7 @@ enum class EQualitySettingsLevel : uint8
Low UMETA(DisplayName = "Low"),
Medium UMETA(DisplayName = "Medium"),
High UMETA(DisplayName = "High"),
Epic UMETA(DisplayName = "Epic") ,
Epic UMETA(DisplayName = "Epic")
};
@ -178,10 +178,10 @@ private:
/** Quality Settings level. */
UPROPERTY(Category = "Quality Settings", VisibleAnywhere, meta =(AllowPrivateAccess="true"))
EQualitySettingsLevel DefaultQualitySettingsLevel = EQualitySettingsLevel::None;
public:
//UPROPERTY(Category = "Quality Settings", EditAnywhere, config)
//TArray<UMaterial*> RoadMaterials;
UPROPERTY(Category = "Quality Settings", EditAnywhere, config)
TArray<TSubclassOf<UMaterial>> RoadMaterials;
//distances
UPROPERTY(Category = "Quality Settings/Low", EditAnywhere, config)