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

Merge branch 'marc' into nestor

This commit is contained in:
nsubiron 2017-04-20 10:06:55 +02:00
parent bf460482e5 fd5d755a74
commit 92a0317dfe
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Carla/Tagger.cpp
View File

@ -21,7 +21,7 @@ enum class Label : uint8
template <typename T>
static auto cast(T label)
{
return static_cast<std::underlying_type<T>::type>(label);
return static_cast<typename std::underlying_type<T>::type>(label);
}
ATagger::ATagger()
@ -87,13 +87,16 @@ void ATagger::TagObjects()
/*for (int32 i = 0; i < stringArray.Num(); i++) {
UE_LOG(LogCarla, Warning, TEXT(" -\"%s\""), *stringArray[i]);
}*/
Label lab = GetLabel(stringArray[3]);
if (stringArray.Num() > 3)
{
Label lab = GetLabel(stringArray[3]);
#ifdef CARLA_TAGGER_EXTRA_LOG
UE_LOG(LogCarla, Warning, TEXT(" - Label: \"%s\""), *stringArray[3]);
UE_LOG(LogCarla, Warning, TEXT(" - Label: \"%s\""), *stringArray[3]);
#endif // CARLA_TAGGER_EXTRA_LOG
setStencilValue(meshIt, lab);
setStencilValue(meshIt, lab);
}
}
/// get USkeletalMeshComponents
@ -108,13 +111,16 @@ void ATagger::TagObjects()
FString Path = meshIt->GetPhysicsAsset()->GetPathName();
TArray<FString> stringArray;
Path.ParseIntoArray(stringArray, TEXT("/"), false);
Label lab = GetLabel(stringArray[3]);
if (stringArray.Num() > 3)
{
Label lab = GetLabel(stringArray[3]);
#ifdef CARLA_TAGGER_EXTRA_LOG
UE_LOG(LogCarla, Warning, TEXT(" - Label: \"%s\""), *stringArray[3]);
UE_LOG(LogCarla, Warning, TEXT(" - Label: \"%s\""), *stringArray[3]);
#endif // CARLA_TAGGER_EXTRA_LOG
setStencilValue(meshIt, lab);
setStencilValue(meshIt, lab);
}
}
}
}