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

Minor fix with settings and previous merge

This commit is contained in:
CVC\jbelon 2018-03-01 11:34:56 +01:00
parent 85d4be3934
commit 588f949cbc
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,13 +38,11 @@ const FName UCarlaSettings::CARLA_ROAD_TAG = FName("CARLA_ROAD");
// -- Static methods -----------------------------------------------------------
// =============================================================================
/// Call Callback for every subsection (from top to bottom) in SectionName.
/// Subsections are separated by '/' character.
template <typename T>
static void ForEachSectionInName(const FString &SectionName, T &&Callback)
static void ForEachSectionInName(const FString &SensorName, T &&Callback)
{
TArray<FString> SubSections;
SectionName.ParseIntoArray(SubSections, TEXT("/"), true);
SensorName.ParseIntoArray(SubSections, TEXT("/"), true);
check(SubSections.Num() > 0);
FString Section = S_CARLA_SENSOR;
Callback(Section);
@ -55,8 +53,6 @@ static void ForEachSectionInName(const FString &SectionName, T &&Callback)
}
}
/// Recursively get sensor type from the ConfigFile for each subsection in
/// SensorName.
static FString GetSensorType(
const FIniFile &ConfigFile,
const FString &SensorName)
@ -68,8 +64,6 @@ static FString GetSensorType(
return SensorType;
}
/// Recursively load sensor settings from the ConfigFile for each subsection in
/// SensorName.
static void LoadSensorFromConfig(
const FIniFile &ConfigFile,
USensorDescription &Sensor)
@ -409,6 +403,7 @@ void UCarlaSettings::SetAllLightsLowQuality(UWorld* world) const
void UCarlaSettings::SetAllRoadsLowQuality(UWorld* world) const
{
if(LowRoadMaterials.Num()==0) return; //no materials configured for low quality
TArray<AActor*> actors;
UGameplayStatics::GetAllActorsWithTag(world, CARLA_ROAD_TAG,actors);
for(int32 i=0; i<actors.Num(); i++)