UE4.22 to UE4.24 upgrade.

carla-simulator · Mar 20, 2020 · 6ba4d68 · 6ba4d68
1 parent de82275
commit 6ba4d68
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 8 deletions.
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h
@@ -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"),

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.cpp
@@ -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))
   {

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaEngine.h
@@ -39,7 +39,7 @@ class FCarlaEngine : private NonCopyable
 
 private:
 
-  void OnPreTick(ELevelTick TickType, float DeltaSeconds);
+  void OnPreTick(UWorld *World, ELevelTick TickType, float DeltaSeconds);
 
   void OnPostTick(UWorld *World, ELevelTick TickType, float DeltaSeconds);
 

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp
@@ -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"));

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RssSensor.cpp
@@ -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;
 }
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp
@@ -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);

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/Sensor.cpp
@@ -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;
 }
 

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/QualityLevelUE.h
@@ -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"),

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h
@@ -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"),

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorAttacher.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ActorAttacher.h
@@ -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"),
 

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehicleInputPriority.h
@@ -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"),