Update

Nebukam · Oct 2, 2024 · 68354aa · 68354aa
1 parent 3edd25c
commit 68354aa
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 37 deletions.
diff --git a/Source/PCGExtendedToolkit/Private/Data/PCGExPointData.cpp b/Source/PCGExtendedToolkit/Private/Data/PCGExPointData.cpp
@@ -22,13 +22,23 @@ void UPCGExPointData::InitializeFromPCGExData(const UPCGExPointData* InPCGExPoin
 
 void UPCGExPointData::BeginDestroy()
 {
+	ClearInternalFlags(EInternalObjectFlags::Async);
+	if (Metadata) { Metadata->ClearInternalFlags(EInternalObjectFlags::Async); }
 	Super::BeginDestroy();
-	//UE_LOG(LogTemp, Warning, TEXT("RELEASE UPCGExPointData"))
 }
 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
 UPCGSpatialData* UPCGExPointData::CopyInternal() const
 {
 	PCGEX_NEW_OBJECT(UPCGExPointData, NewPointData)
 	NewPointData->CopyFrom(this);
 	return NewPointData;
 }
+#else
+UPCGSpatialData* UPCGExPointData::CopyInternal(FPCGContext* Context) const
+{
+	UPCGExPointData* NewPointData = FPCGContext::NewObject_AnyThread<UPCGExPointData>(Context);
+	NewPointData->CopyFrom(this);
+	return NewPointData;
+}
+#endif
diff --git a/Source/PCGExtendedToolkit/Private/Data/PCGExPointIO.cpp b/Source/PCGExtendedToolkit/Private/Data/PCGExPointIO.cpp
@@ -27,7 +27,7 @@ namespace PCGExData
 
 	void FPointIO::InitializeOutput(FPCGExContext* InContext, const EInit InitOut)
 	{
-		if (Out != In) { PCGEX_DELETE_UOBJECT(Out) }
+		if (Out != In) { PCGEX_DELETE_UPCGDATA(Out) }
 		OutKeys.Reset();
 
 		if (InitOut == EInit::NoOutput)
@@ -76,11 +76,17 @@ namespace PCGExData
 		if (InitOut == EInit::DuplicateInput)
 		{
 			check(In)
-			FGCScopeGuard GCGuarded;
 #if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
-			Out = Cast<UPCGPointData>(In->DuplicateData(true));
+			{
+				FGCScopeGuard GCGuarded;
+				Out = Cast<UPCGPointData>(In->DuplicateData(true));
+			}
 #else
-			Out = Cast<UPCGPointData>(In->DuplicateData(Context, true));
+			{
+				PCGEX_ENFORCE_CONTEXT_ASYNC(Context)
+				FWriteScopeLock WriteScopeLock(Context->AsyncObjectLock); // Ugh
+				Out = Cast<UPCGPointData>(In->DuplicateData(Context, true));
+			}
 #endif
 			Out->AddToRoot();
 		}
@@ -151,7 +157,7 @@ namespace PCGExData
 		if (!bWritten)
 		{
 			// Delete unused outputs
-			if (Out && Out != In) { PCGEX_DELETE_UOBJECT(Out) }
+			if (Out && Out != In) { PCGEX_DELETE_UPCGDATA(Out) }
 		}
 	}
 

diff --git a/Source/PCGExtendedToolkit/Private/Graph/Data/PCGExClusterData.cpp b/Source/PCGExtendedToolkit/Private/Graph/Data/PCGExClusterData.cpp
@@ -29,6 +29,7 @@ void UPCGExClusterNodesData::BeginDestroy()
 	BoundClusters.Empty();
 }
 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
 UPCGSpatialData* UPCGExClusterNodesData::CopyInternal() const
 {
 	UPCGExClusterNodesData* NewNodeData = nullptr;
@@ -39,6 +40,17 @@ UPCGSpatialData* UPCGExClusterNodesData::CopyInternal() const
 	NewNodeData->CopyFrom(this);
 	return NewNodeData;
 }
+#else
+UPCGSpatialData* UPCGExClusterNodesData::CopyInternal(FPCGContext* Context) const
+{
+	PCGEX_ENFORCE_CONTEXT_ASYNC(Context)
+
+	UPCGExClusterNodesData* NewNodeData = FPCGContext::NewObject_AnyThread<UPCGExClusterNodesData>(Context);
+	NewNodeData->CopyFrom(this);
+	return NewNodeData;
+}
+#endif
+
 
 void UPCGExClusterEdgesData::InitializeFromPCGExData(const UPCGExPointData* InPCGExPointData, const PCGExData::EInit InitMode)
 {
@@ -66,6 +78,7 @@ const TSharedPtr<PCGExCluster::FCluster>& UPCGExClusterEdgesData::GetBoundCluste
 	return Cluster;
 }
 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
 UPCGSpatialData* UPCGExClusterEdgesData::CopyInternal() const
 {
 	UPCGExClusterEdgesData* NewEdgeData = nullptr;
@@ -76,6 +89,17 @@ UPCGSpatialData* UPCGExClusterEdgesData::CopyInternal() const
 	NewEdgeData->CopyFrom(this);
 	return NewEdgeData;
 }
+#else
+UPCGSpatialData* UPCGExClusterEdgesData::CopyInternal(FPCGContext* Context) const
+{
+	PCGEX_ENFORCE_CONTEXT_ASYNC(Context)
+
+	UPCGExClusterEdgesData* NewEdgeData = FPCGContext::NewObject_AnyThread<UPCGExClusterEdgesData>(Context);
+	NewEdgeData->CopyFrom(this);
+	return NewEdgeData;
+}
+#endif
+
 
 void UPCGExClusterEdgesData::BeginDestroy()
 {

diff --git a/Source/PCGExtendedToolkit/Private/PCGExContext.cpp b/Source/PCGExtendedToolkit/Private/PCGExContext.cpp
@@ -49,16 +49,14 @@ void FPCGExContext::FutureOutput(const FName Pin, UPCGData* InData)
 	}
 }
 
-void FPCGExContext::StartAsyncWork(const bool bPauseOnly)
+void FPCGExContext::StartAsyncWork()
 {
 	bIsPaused = true;
-	if (!bPauseOnly) { AsyncState.bIsRunningOnMainThread = false; }
 }
 
 void FPCGExContext::StopAsyncWork()
 {
 	bIsPaused = false;
-	AsyncState.bIsRunningOnMainThread = true;
 }
 
 void FPCGExContext::WriteFutureOutputs()
@@ -163,7 +161,7 @@ void FPCGExContext::LoadAssets()
 
 	if (!bForceSynchronousAssetLoad)
 	{
-		StartAsyncWork(true);
+		StartAsyncWork();
 
 		LoadHandle = UAssetManager::GetStreamableManager().RequestAsyncLoad(
 			RequiredAssets.Array(), [&]()

diff --git a/Source/PCGExtendedToolkit/Public/Data/PCGExData.h b/Source/PCGExtendedToolkit/Public/Data/PCGExData.h
@@ -313,7 +313,7 @@ namespace PCGExData
 
 		virtual void Write() override
 		{
-			if (!IsWritable()) { return; }
+			if (!IsWritable() || !OutAccessor || !OutValues) { return; }
 
 			TArrayView<const T> View = MakeArrayView(OutValues->GetData(), OutValues->Num());
 			OutAccessor->SetRange(View, 0, *Source->GetOutKeys(true));
@@ -374,7 +374,7 @@ namespace PCGExData
 		}
 
 		FORCEINLINE bool IsDataValid(const ESource InSource) const { return Source->IsDataValid(InSource); }
-		
+
 		bool ShareSource(const FFacade* OtherManager) const { return this == OtherManager || OtherManager->Source == Source; }
 
 		template <typename T>

diff --git a/Source/PCGExtendedToolkit/Public/Data/PCGExPointData.h b/Source/PCGExtendedToolkit/Public/Data/PCGExPointData.h
@@ -28,5 +28,10 @@ class /*PCGEXTENDEDTOOLKIT_API*/ UPCGExPointData : public UPCGPointData
 	virtual void BeginDestroy() override;
 
 protected:
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
 	virtual UPCGSpatialData* CopyInternal() const override;
+#else
+	virtual UPCGSpatialData* CopyInternal(FPCGContext* Context) const override;
+#endif
+
 };
diff --git a/Source/PCGExtendedToolkit/Public/Data/PCGExPointIO.h b/Source/PCGExtendedToolkit/Public/Data/PCGExPointIO.h
@@ -15,6 +15,17 @@
 
 #include "Metadata/Accessors/PCGAttributeAccessorKeys.h"
 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5
+#define PCGEX_DELETE_UPCGDATA(_VALUE) \
+if(_VALUE){ \
+	PCGEX_UNROOT(_VALUE) \
+	if(_VALUE->Metadata){ PCGEX_UNROOT(_VALUE->Metadata) } \
+	_VALUE->MarkAsGarbage(); \
+	_VALUE = nullptr; }
+#else
+#define PCGEX_DELETE_UPCGDATA(_VALUE) _VALUE = nullptr; // Handled by 5.5 AsyncObjects 
+#endif
+
 namespace PCGExData
 {
 	enum class EInit : uint8
@@ -123,7 +134,7 @@ namespace PCGExData
 		template <typename T>
 		void InitializeOutput(FPCGExContext* InContext, const EInit InitOut = EInit::NoOutput)
 		{
-			if (Out != In) { PCGEX_DELETE_UOBJECT(Out) }
+			if (Out != In) { PCGEX_DELETE_UPCGDATA(Out) }
 
 			if (InitOut == EInit::NewOutput)
 			{
@@ -160,7 +171,11 @@ namespace PCGExData
 #if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
 					Out = Cast<UPCGPointData>(In->DuplicateData(true));
 #else
-					Out = Cast<UPCGPointData>(In->DuplicateData(Context, true));
+					{
+						PCGEX_ENFORCE_CONTEXT_ASYNC(Context)
+						FWriteScopeLock WriteScopeLock(Context->AsyncObjectLock); // Ugh
+						Out = Cast<UPCGPointData>(In->DuplicateData(Context, true));
+					}
 #endif
 					Out->AddToRoot();
 				}

diff --git a/Source/PCGExtendedToolkit/Public/Graph/Data/PCGExClusterData.h b/Source/PCGExtendedToolkit/Public/Graph/Data/PCGExClusterData.h
@@ -50,7 +50,11 @@ class /*PCGEXTENDEDTOOLKIT_API*/ UPCGExClusterNodesData : public UPCGExClusterDa
 	virtual void BeginDestroy() override;
 
 protected:
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
 	virtual UPCGSpatialData* CopyInternal() const override;
+#else
+	virtual UPCGSpatialData* CopyInternal(FPCGContext* Context) const override;
+#endif
 };
 
 /**
@@ -71,7 +75,11 @@ class /*PCGEXTENDEDTOOLKIT_API*/ UPCGExClusterEdgesData : public UPCGExClusterDa
 
 protected:
 	TSharedPtr<PCGExCluster::FCluster> Cluster;
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
 	virtual UPCGSpatialData* CopyInternal() const override;
+#else
+	virtual UPCGSpatialData* CopyInternal(FPCGContext* Context) const override;
+#endif
 };
 
 namespace PCGExClusterData

diff --git a/Source/PCGExtendedToolkit/Public/PCGExContext.h b/Source/PCGExtendedToolkit/Public/PCGExContext.h
@@ -7,6 +7,7 @@
 
 #include "CoreMinimal.h"
 #include "PCGContext.h"
+#include "PCGExHelpers.h"
 #include "Engine/StreamableManager.h"
 
 struct /*PCGEXTENDEDTOOLKIT_API*/ FPCGExContext : public FPCGContext
@@ -24,6 +25,8 @@ struct /*PCGEXTENDEDTOOLKIT_API*/ FPCGExContext : public FPCGContext
 	void WriteFutureOutputs();
 
 public:
+	mutable FRWLock AsyncObjectLock; //ugh
+
 	virtual ~FPCGExContext() override;
 
 	void UnrootFutures();
@@ -33,51 +36,47 @@ struct /*PCGEXTENDEDTOOLKIT_API*/ FPCGExContext : public FPCGContext
 	void FutureOutput(const FName Pin, UPCGData* InData, const TSet<FString>& InTags);
 	void FutureOutput(const FName Pin, UPCGData* InData);
 
-	void StartAsyncWork(const bool bPauseOnly = false);
+	void StartAsyncWork();
 	void StopAsyncWork();
 
 	template <class T, typename... Args>
 	T* PCGExNewObject(Args&&... InArgs)
 	{
-#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5
+		PCGEX_ENFORCE_CONTEXT_ASYNC(this)
 
 		T* Object = nullptr;
-		if (!IsInGameThread())
-		{
-			{
-				FGCScopeGuard Scope;
-				Object = ::NewObject<T>(std::forward<Args>(InArgs)...);
-			}
-			check(Object);
-		}
-
-		Object = ::NewObject<T>(std::forward<Args>(InArgs)...);
-		Object->AddToRoot();
-		return Object;
 
-#else
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5
 		if constexpr (!std::is_base_of_v<T, UPCGData>)
 		{
-			// Since we create ops & factories through this flow, make sure we only
-			// use the 5.5 code for UPCGData stuff
-			T* Object = nullptr;
-			if (!IsInGameThread())
+			// Since we create ops & factories through this flow, make sure we only use the 5.5 code for UPCGData stuff
+#endif
+
+			if (AsyncState.bIsRunningOnMainThread)
 			{
 				{
 					FGCScopeGuard Scope;
 					Object = ::NewObject<T>(std::forward<Args>(InArgs)...);
 				}
 				check(Object);
 			}
+			else
+			{
+				Object = ::NewObject<T>(std::forward<Args>(InArgs)...);
+			}
 
-			Object = ::NewObject<T>(std::forward<Args>(InArgs)...);
 			Object->AddToRoot();
-			return Object;
-		}else
+
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5
+		}
+		else
 		{
-			return FPCGContext::NewObject_AnyThread<T>(this, std::forward<Args>(InArgs)...);		
+			FWriteScopeLock WriteScopeLock(AsyncObjectLock);
+			Object = FPCGContext::NewObject_AnyThread<T>(this, std::forward<Args>(InArgs)...);
 		}
 #endif
+
+		return Object;
 	}
 
 	virtual void OnComplete();

diff --git a/Source/PCGExtendedToolkit/Public/PCGExHelpers.h b/Source/PCGExtendedToolkit/Public/PCGExHelpers.h
@@ -12,6 +12,11 @@
 
 #include "PCGExHelpers.generated.h"
 
+#define PCGEX_ENFORCE_CONTEXT_ASYNC(_CONTEXT)\
+	bool bRestoreTo = _CONTEXT->AsyncState.bIsRunningOnMainThread;\
+	ON_SCOPE_EXIT { _CONTEXT->AsyncState.bIsRunningOnMainThread = bRestoreTo; };\
+	_CONTEXT->AsyncState.bIsRunningOnMainThread = IsInGameThread(); // dirty trick
+
 namespace PCGExHelpers
 {
 	static TArray<FString> GetStringArrayFromCommaSeparatedList(const FString& InCommaSeparatedString)