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

UE4.22 to UE4.24 upgrade.

This commit is contained in:
Axel 2020-03-09 12:18:31 +01:00 committed by bernat
parent de82275f10
commit 6ba4d68a48
11 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h
View File

@ -18,6 +18,7 @@
UENUM(BlueprintType)
enum class EActorAttributeType : uint8
{
Null = 0, // Workarround for UE4.24 issue with enums
Bool = CARLA_ENUM_FROM_RPC(Bool) UMETA(DisplayName = "Bool"),
Int = CARLA_ENUM_FROM_RPC(Int) UMETA(DisplayName = "Integer"),
Float = CARLA_ENUM_FROM_RPC(Float) UMETA(DisplayName = "Float"),

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp
View File

@ -87,7 +87,7 @@ void FCarlaEngine::NotifyEndEpisode()
CurrentEpisode = nullptr;
}
void FCarlaEngine::OnPreTick(ELevelTick TickType, float DeltaSeconds)
void FCarlaEngine::OnPreTick(UWorld *, ELevelTick TickType, float DeltaSeconds)
{
if ((TickType == ELevelTick::LEVELTICK_All) && (CurrentEpisode != nullptr))
{

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h
View File

@ -39,7 +39,7 @@ public:
private:
void OnPreTick(ELevelTick TickType, float DeltaSeconds);
void OnPreTick(UWorld *World, ELevelTick TickType, float DeltaSeconds);
void OnPostTick(UWorld *World, ELevelTick TickType, float DeltaSeconds);

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp
View File

@ -54,7 +54,7 @@ static void WritePixelsToBuffer_Vulkan(
check(IsInRenderingThread());
auto RenderResource =
static_cast<const FTextureRenderTarget2DResource *>(RenderTarget.Resource);
FTextureRHIParamRef Texture = RenderResource->GetRenderTargetTexture();
FTexture2DRHIRef Texture = RenderResource->GetRenderTargetTexture();
if (!Texture)
{
UE_LOG(LogCarla, Error, TEXT("FPixelReader: UTextureRenderTarget2D missing render target texture"));

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp
View File

@ -21,6 +21,5 @@ ARssSensor::ARssSensor(const FObjectInitializer &ObjectInitializer)
MeshComp->SetCollisionProfileName(UCollisionProfile::NoCollision_ProfileName);
MeshComp->bHiddenInGame = true;
MeshComp->CastShadow = false;
MeshComp->PostPhysicsComponentTick.bCanEverTick = false;
RootComponent = MeshComp;
}

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

@ -569,7 +569,7 @@ namespace SceneCaptureSensor_local_ns {
ShowFlags.SetAmbientOcclusion(false);
ShowFlags.SetAntiAliasing(false);
ShowFlags.SetAtmosphericFog(false);
ShowFlags.SetVolumetricFog(false); // ShowFlags.SetAtmosphericFog(false);
// ShowFlags.SetAudioRadius(false);
// ShowFlags.SetBillboardSprites(false);
ShowFlags.SetBloom(false);
@ -691,8 +691,8 @@ namespace SceneCaptureSensor_local_ns {
// ShowFlags.SetVertexColors(false);
// ShowFlags.SetVignette(false);
// ShowFlags.SetVisLog(false);
ShowFlags.SetVisualizeAdaptiveDOF(false);
ShowFlags.SetVisualizeBloom(false);
// ShowFlags.SetVisualizeAdaptiveDOF(false);
// ShowFlags.SetVisualizeBloom(false);
ShowFlags.SetVisualizeBuffer(false);
ShowFlags.SetVisualizeDistanceFieldAO(false);
ShowFlags.SetVisualizeDistanceFieldGI(false);

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp
View File

@ -17,7 +17,6 @@ ASensor::ASensor(const FObjectInitializer &ObjectInitializer)
Mesh->SetCollisionProfileName(UCollisionProfile::NoCollision_ProfileName);
Mesh->bHiddenInGame = true;
Mesh->CastShadow = false;
Mesh->PostPhysicsComponentTick.bCanEverTick = false;
RootComponent = Mesh;
}

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h
View File

@ -17,6 +17,7 @@
UENUM(BlueprintType)
enum class EQualityLevel : uint8
{
Null = 0, // Workarround for UE4.24 issue with enums
Low = CARLA_ENUM_FROM_RPC(Low) UMETA(DisplayName = "Low"),
// Medium = CARLA_ENUM_FROM_RPC(Medium) UMETA(DisplayName = "Medium"),
// High = CARLA_ENUM_FROM_RPC(High) UMETA(DisplayName = "High"),

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h
View File

@ -14,6 +14,7 @@ class UBoxComponent;
UENUM(BlueprintType)
enum class ETrafficSignState : uint8 {
Null = 0, // Workarround for UE4.24 issue with enums
UNKNOWN = 0u UMETA(DisplayName = "UNKNOWN"),
TrafficLightRed = 1u UMETA(DisplayName = "Traffic Light - Red"),
TrafficLightYellow = 2u UMETA(DisplayName = "Traffic Light - Yellow"),

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorAttacher.h
View File

@ -19,6 +19,7 @@
UENUM(BlueprintType)
enum class EAttachmentType : uint8
{
Null = 0, // Workarround for UE4.24 issue with enums
Rigid = CARLA_ENUM_FROM_RPC(Rigid) UMETA(DisplayName = "Rigid"),
SpringArm = CARLA_ENUM_FROM_RPC(SpringArm) UMETA(DisplayName = "SpringArm"),

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h
View File

@ -13,6 +13,7 @@
UENUM(BlueprintType)
enum class EVehicleInputPriority : uint8
{
Null = 0, // Workarround for UE4.24 issue with enums
INVALID = 0u UMETA(Hidden),
Lowest UMETA(DisplayName = "Lowest Priority", ToolTip = "Use for debugging purposes only"),