From 83d752ef9401b12dce04e90c7619fbe14ec2de4c Mon Sep 17 00:00:00 2001 From: doterop Date: Wed, 30 Sep 2020 16:44:09 +0200 Subject: [PATCH] Moved SendPixels to OnWorldPostActorTick. --- .../Carla/Source/Carla/Sensor/DepthCamera.cpp | 2 +- .../Carla/Source/Carla/Sensor/DepthCamera.h | 2 +- .../Source/Carla/Sensor/SceneCaptureCamera.cpp | 2 +- .../Source/Carla/Sensor/SceneCaptureCamera.h | 2 +- .../Source/Carla/Sensor/SceneCaptureSensor.cpp | 15 ++++++++------- .../Source/Carla/Sensor/SceneCaptureSensor.h | 2 +- .../Carla/Sensor/SemanticSegmentationCamera.cpp | 2 +- .../Carla/Sensor/SemanticSegmentationCamera.h | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp index e86663db3..27cdbd327 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.cpp @@ -28,7 +28,7 @@ ADepthCamera::ADepthCamera(const FObjectInitializer &ObjectInitializer) ); } -void ADepthCamera::SendPixels() +void ADepthCamera::SendPixels(UWorld *World, ELevelTick TickType, float DeltaSeconds) { FPixelReader::SendPixelsInRenderThread(*this); } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h index 60c450fc2..111b2c712 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DepthCamera.h @@ -26,5 +26,5 @@ public: protected: - void SendPixels() override; + void SendPixels(UWorld *World, ELevelTick TickType, float DeltaSeconds) override; }; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp index dc29b9bd3..4e01ecd08 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.cpp @@ -22,7 +22,7 @@ ASceneCaptureCamera::ASceneCaptureCamera(const FObjectInitializer &ObjectInitial TEXT("Material'/Carla/PostProcessingMaterials/PhysicLensDistortion.PhysicLensDistortion'")); } -void ASceneCaptureCamera::SendPixels() +void ASceneCaptureCamera::SendPixels(UWorld *World, ELevelTick TickType, float DeltaSeconds) { FPixelReader::SendPixelsInRenderThread(*this); } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h index ee5d8a719..fb1020e21 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureCamera.h @@ -26,6 +26,6 @@ public: protected: - void SendPixels() override; + void SendPixels(UWorld *World, ELevelTick TickType, float DeltaSeconds) override; }; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp index 47ec14a53..88d5e6a6f 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp @@ -9,16 +9,17 @@ #include "Carla/Game/CarlaStatics.h" +#include "Async/Async.h" #include "Components/DrawFrustumComponent.h" -#include "Engine/Classes/Engine/Scene.h" #include "Components/SceneCaptureComponent2D.h" #include "Components/StaticMeshComponent.h" -#include "Engine/TextureRenderTarget2D.h" -#include "HighResScreenshot.h" #include "ContentStreaming.h" -#include "Async/Async.h" -#include "RHICommandList.h" +#include "Engine/Classes/Engine/Scene.h" +#include "Engine/TextureRenderTarget2D.h" #include "HAL/UnrealMemory.h" +#include "HighResScreenshot.h" +#include "Misc/CoreDelegates.h" +#include "RHICommandList.h" static auto SCENE_CAPTURE_COUNTER = 0u; @@ -490,7 +491,7 @@ void ASceneCaptureSensor::BeginPlay() Super::BeginPlay(); - SendPixelsDelegate = FCoreDelegates::OnEndFrame.AddUObject(this, &ASceneCaptureSensor::SendPixels); + SendPixelsDelegate = FWorldDelegates::OnWorldPostActorTick.AddUObject(this, &ASceneCaptureSensor::SendPixels); } void ASceneCaptureSensor::Tick(float DeltaTime) @@ -511,7 +512,7 @@ void ASceneCaptureSensor::EndPlay(const EEndPlayReason::Type EndPlayReason) Super::EndPlay(EndPlayReason); SCENE_CAPTURE_COUNTER = 0u; - FCoreDelegates::OnEndFrame.Remove(SendPixelsDelegate); + FWorldDelegates::OnWorldPostActorTick.Remove(SendPixelsDelegate); } // ============================================================================= diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h index b712b2e24..60421eec6 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.h @@ -280,7 +280,7 @@ protected: virtual void SetUpSceneCaptureComponent(USceneCaptureComponent2D &SceneCapture) {} - virtual void SendPixels() {} + virtual void SendPixels(UWorld *World, ELevelTick TickType, float DeltaSeconds) {} FDelegateHandle SendPixelsDelegate; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp index d9fb5594e..bd673170a 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.cpp @@ -24,7 +24,7 @@ ASemanticSegmentationCamera::ASemanticSegmentationCamera( TEXT("Material'/Carla/PostProcessingMaterials/GTMaterial.GTMaterial'")); } -void ASemanticSegmentationCamera::SendPixels() +void ASemanticSegmentationCamera::SendPixels(UWorld *World, ELevelTick TickType, float DeltaSeconds) { FPixelReader::SendPixelsInRenderThread(*this); } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h index dd5310385..0c7ab0f07 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SemanticSegmentationCamera.h @@ -26,5 +26,5 @@ public: protected: - void SendPixels() override; + void SendPixels(UWorld *World, ELevelTick TickType, float DeltaSeconds) override; };