Expensive fix for messed-up re-order of points when filtering out clusters

Author: Nebukam

PCGExtendedToolkit.uplugin

@@ -1,7 +1,7 @@
 {
   "FileVersion": 3,
   "Version": 1,
-  "VersionName": "0.68.4",
+  "VersionName": "0.68.5",
   "FriendlyName": "PCGExtendedToolkit",
   "Description": "A rather large toolset that expand on existing PCG capabilities in unique ways.",
   "Category": "PCG",

Source/PCGExtendedToolkit/Private/Graph/PCGExGraph.cpp

@@ -291,12 +291,6 @@ MACRO(Crossing, bWriteCrossing, Crossing,TEXT("bCrossing"))
 		if (Edge.IOIndex >= 0) { EdgesInIOIndices.Add(Edge.IOIndex); }
 	}
 
-	void FSubGraph::Invalidate(FGraph* InGraph)
-	{
-		for (const int32 EdgeIndex : Edges) { InGraph->Edges[EdgeIndex].bValid = false; }
-		for (const int32 NodeIndex : Nodes) { InGraph->Nodes[NodeIndex].bValid = false; }
-	}
-
 	void FSubGraph::BuildCluster(const TSharedRef<PCGExCluster::FCluster>& InCluster)
 	{
 		// Correct edge IO Index that has been overwritten during subgraph processing
@@ -743,7 +737,7 @@ MACRO(EdgeUnionSize, int32, 0, UnionSize)
 	FGraphEdgeMetadata& FGraph::GetOrCreateEdgeMetadata_Unsafe(const int32 EdgeIndex, const FGraphEdgeMetadata* Parent)
 	{
 		if (FGraphEdgeMetadata* MetadataPtr = EdgeMetadata.Find(EdgeIndex)) { return *MetadataPtr; }
-		return EdgeMetadata.Emplace(EdgeIndex, FGraphEdgeMetadata(EdgeIndex, Parent));
+		return EdgeMetadata.Add(EdgeIndex, FGraphEdgeMetadata(EdgeIndex, Parent));
 	}
 
 	FGraphEdgeMetadata& FGraph::GetOrCreateEdgeMetadata(const int32 EdgeIndex, const FGraphEdgeMetadata* Parent)
@@ -895,14 +889,19 @@ MACRO(EdgeUnionSize, int32, 0, UnionSize)
 
 		for (int i = 0; i < Nodes.Num(); i++)
 		{
-			const FNode& CurrentNode = Nodes[i];
+			FNode& CurrentNode = Nodes[i];
 
 			if (VisitedNodes[i]) { continue; }
 
 			VisitedNodes[i] = true;
 			VisitedNum++;
 
-			if (!CurrentNode.bValid || CurrentNode.IsEmpty()) { continue; }
+			if (!CurrentNode.bValid) { continue; }
+			if (CurrentNode.IsEmpty())
+			{
+				CurrentNode.bValid = false;
+				continue;
+			}
 
 			PCGEX_MAKE_SHARED(SubGraph, FSubGraph)
 			SubGraph->WeakParentGraph = SharedThis(this);
@@ -944,8 +943,16 @@ MACRO(EdgeUnionSize, int32, 0, UnionSize)
 				}
 			}
 
-			if (!Limits.IsValid(SubGraph)) { SubGraph->Invalidate(this); } // Will invalidate isolated points
-			else if (!SubGraph->Edges.IsEmpty()) { SubGraphs.Add(SubGraph.ToSharedRef()); }
+			if (!Limits.IsValid(SubGraph))
+			{
+				// Invalidate traversed points and edges
+				for (const int32 j : SubGraph->Nodes) { Nodes[j].bValid = false; }
+				for (const int32 j : SubGraph->Edges) { Edges[j].bValid = false; }
+			} 
+			else if (!SubGraph->Edges.IsEmpty())
+			{
+				SubGraphs.Add(SubGraph.ToSharedRef());
+			}
 		}
 	}
 
@@ -1066,7 +1073,7 @@ MACRO(EdgeUnionSize, int32, 0, UnionSize)
 		// Filter all valid nodes
 		for (FNode& Node : Nodes)
 		{
-			if (!Node.bValid || Node.IsEmpty())
+			if (!Node.bValid)
 			{
 				bHasInvalidNodes = true;
 				continue;
@@ -1133,7 +1140,6 @@ MACRO(EdgeUnionSize, int32, 0, UnionSize)
 				// Init array of indice as a valid order range first, will be truncated later.
 				// We save a bit of memory by re-using it
 				PCGEx::ArrayOfIndices(ReadIndices, OutNodeData->GetNumPoints());
-				ReadIndices.SetNumUninitialized(OutNodeData->GetNumPoints());
 
 				// Sort valid nodes based on outgoing transforms
 				ValidNodes.Sort(
@@ -1158,7 +1164,6 @@ MACRO(EdgeUnionSize, int32, 0, UnionSize)
 				PCGEx::ReorderPointArrayData(OutNodeData, ReadIndices);
 
 				// Truncate output to the number of nodes
-				ReadIndices.SetNum(NumValidNodes);
 				OutNodeData->SetNumPoints(NumValidNodes);
 			}
 		}

Source/PCGExtendedToolkit/Private/Graph/PCGExIntersections.cpp

@@ -762,14 +762,21 @@ namespace PCGExGraph
 
 				NodeIndex = Crossing.NodeIndex;
 
-				Graph->InsertEdge_Unsafe(PrevIndex, NodeIndex, NewEdge, SplitEdge.IOIndex); //BUG: this is the wrong edge IOIndex
-				Graph->AddNodeAndEdgeMetadata_Unsafe(NodeIndex, NewEdge.Index, ParentEdgeMeta, EPCGExIntersectionType::EdgeEdge);
+				//BUG: this is the wrong edge IOIndex
+
+				if (Graph->InsertEdge_Unsafe(PrevIndex, NodeIndex, NewEdge, SplitEdge.IOIndex))
+				{
+					Graph->AddNodeAndEdgeMetadata_Unsafe(NodeIndex, NewEdge.Index, ParentEdgeMeta, EPCGExIntersectionType::EdgeEdge);
+				}
 
 				PrevIndex = NodeIndex;
 			}
 
-			Graph->InsertEdge_Unsafe(PrevIndex, SplitEdge.End, NewEdge, SplitEdge.IOIndex); // Insert last edge
-			Graph->AddEdgeMetadata_Unsafe(NewEdge.Index, ParentEdgeMeta, EPCGExIntersectionType::EdgeEdge);
+			// Insert last edge
+			if (Graph->InsertEdge_Unsafe(PrevIndex, SplitEdge.End, NewEdge, SplitEdge.IOIndex))
+			{
+				Graph->AddEdgeMetadata_Unsafe(NewEdge.Index, ParentEdgeMeta, EPCGExIntersectionType::EdgeEdge);
+			}
 		}
 	}
 

Source/PCGExtendedToolkit/Private/PCGExHelpers.cpp

@@ -422,61 +422,38 @@ namespace PCGEx
 		return false;
 	}
 
-	void ReorderPointArrayData(UPCGBasePointData* InData, const TArray<int32>& InOrder)
+	template <typename T>
+	void ReorderValueRange(TPCGValueRange<T>& InRange, const TArray<int32>& InOrder)
 	{
-		TRACE_CPUPROFILER_EVENT_SCOPE(PCGExHelpers::ReorderPointArrayData);
+		TRACE_CPUPROFILER_EVENT_SCOPE(PCGExHelpers::ReorderValueRange);
+		
+		const int32 NumIndices = InOrder.Num();
+		TArray<T> ValuesCopy;
+		ValuesCopy.Reserve(NumIndices);
+		for (int i = 0; i < NumIndices; i++){ ValuesCopy.Emplace(InRange[InOrder[i]]); }
+		for (int i = 0; i < NumIndices; i++){ InRange[i] = ValuesCopy[i]; }
+	}
 
-		const int32 NumElements = InOrder.Num();
-		check(NumElements == InData->GetNumPoints());
+#define PCGEX_TPL(_TYPE, _NAME, ...) \
+template PCGEXTENDEDTOOLKIT_API void ReorderValueRange<_TYPE>(TPCGValueRange<_TYPE>& InRange, const TArray<int32>& InOrder);
 
-		TBitArray<> Visited;
-		Visited.Init(false, NumElements);
+	PCGEX_FOREACH_SUPPORTEDTYPES(PCGEX_TPL)
+#undef PCGEX_TPL
 
+	void ReorderPointArrayData(UPCGBasePointData* InData, const TArray<int32>& InOrder)
+	{
+		TRACE_CPUPROFILER_EVENT_SCOPE(PCGExHelpers::ReorderPointArrayData);
+		
 		EPCGPointNativeProperties AllocatedProperties = InData->GetAllocatedProperties();
 
-#define PCGEX_REORDER_RANGE_DECL(_NAME, _TYPE, ...)\
-		const bool bProcess##_NAME = EnumHasAnyFlags(AllocatedProperties, EPCGPointNativeProperties::_NAME);\
-		TPCGValueRange<_TYPE> _NAME##Range = InData->Get##_NAME##ValueRange(bProcess##_NAME);
+#define PCGEX_REORDER_RANGE_DECL(_NAME, _TYPE, ...) \
+	if(EnumHasAnyFlags(AllocatedProperties, EPCGPointNativeProperties::_NAME)){ \
+		TPCGValueRange<_TYPE> Range = InData->Get##_NAME##ValueRange(true); \
+		ReorderValueRange<_TYPE>(Range, InOrder);}
+		
 		PCGEX_FOREACH_POINT_NATIVE_PROPERTY(PCGEX_REORDER_RANGE_DECL)
 #undef PCGEX_REORDER_RANGE_DECL
 
-		for (int32 i = 0; i < NumElements; ++i)
-		{
-			if (Visited[i])
-			{
-				continue;
-			}
-
-			int32 Current = i;
-			int32 Next = InOrder[Current];
-
-			if (Next == Current)
-			{
-				Visited[Current] = true;
-				continue;
-			}
-
-#define PCGEX_REORDER_MOVE_TEMP(_NAME, _TYPE, ...) _TYPE Temp##_NAME = bProcess##_NAME ? MoveTemp(_NAME##Range[Current]) : _TYPE{};
-			PCGEX_FOREACH_POINT_NATIVE_PROPERTY(PCGEX_REORDER_MOVE_TEMP)
-#undef PCGEX_REORDER_MOVE_TEMP
-
-			while (!Visited[Next])
-			{
-#define PCGEX_REORDER_MOVE_FORWARD(_NAME, _TYPE, ...) if(bProcess##_NAME){ _NAME##Range[Current] = MoveTemp(_NAME##Range[Next]); };
-				PCGEX_FOREACH_POINT_NATIVE_PROPERTY(PCGEX_REORDER_MOVE_FORWARD)
-#undef PCGEX_REORDER_MOVE_FORWARD
-
-				Visited[Current] = true;
-				Current = Next;
-				Next = InOrder[Current];
-			}
-
-#define PCGEX_REORDER_MOVE_BACK(_NAME, _TYPE, ...) if(bProcess##_NAME){ _NAME##Range[Current] = MoveTemp(Temp##_NAME); }
-			PCGEX_FOREACH_POINT_NATIVE_PROPERTY(PCGEX_REORDER_MOVE_BACK)
-#undef PCGEX_REORDER_MOVE_BACK
-
-			Visited[Current] = true;
-		}
 	}
 
 	FString GetSelectorDisplayName(const FPCGAttributePropertyInputSelector& InSelector)

Source/PCGExtendedToolkit/Private/Paths/PCGExBevelPath.cpp

@@ -529,7 +529,7 @@ namespace PCGExBevelPath
 	{
 		constexpr EPCGPointNativeProperties CarryOverProperties =
 			static_cast<EPCGPointNativeProperties>(static_cast<uint8>(EPCGPointNativeProperties::All) &
-				~static_cast<uint8>(EPCGPointNativeProperties::Transform | EPCGPointNativeProperties::Seed | EPCGPointNativeProperties::MetadataEntry));
+				~static_cast<uint8>(EPCGPointNativeProperties::Transform | EPCGPointNativeProperties::MetadataEntry));
 
 		PointDataFacade->Source->ConsumeIdxMapping(CarryOverProperties);
 	}

Source/PCGExtendedToolkit/Public/Graph/PCGExGraph.h

@@ -365,7 +365,6 @@ namespace PCGExGraph
 
 		void Add(const FEdge& Edge, FGraph* InGraph);
 
-		void Invalidate(FGraph* InGraph);
 		void BuildCluster(const TSharedRef<PCGExCluster::FCluster>& InCluster);
 		int32 GetFirstInIOIndex();
 

Source/PCGExtendedToolkit/Public/PCGExHelpers.h

@@ -787,6 +787,15 @@ namespace PCGEx
 		}
 	};
 
+	template <typename T>
+	void ReorderValueRange(TPCGValueRange<T>& InRange, const TArray<int32>& InOrder);
+
+#define PCGEX_TPL(_TYPE, _NAME, ...) \
+extern template void ReorderValueRange<_TYPE>(TPCGValueRange<_TYPE>& InRange, const TArray<int32>& InOrder);
+
+	PCGEX_FOREACH_SUPPORTEDTYPES(PCGEX_TPL)
+#undef PCGEX_TPL
+	
 	PCGEXTENDEDTOOLKIT_API
 	void ReorderPointArrayData(UPCGBasePointData* InData, const TArray<int32>& InOrder);