Fixed reference issues where exported paths have quotes around them

Author: coderespawn

Source/PrefabricatorRuntime/Private/Asset/PrefabricatorAsset.cpp

@@ -32,18 +32,18 @@ FVector FPrefabricatorAssetUtils::FindPivot(const TArray<AActor*>& InActors)
 			Bounds += ActorBounds;
 		}
 
-		switch (GetDefault< UPrefabricatorSettings>()->PivotPosition) 
-		{ 
-			case EPrefabricatorPivotPosition::ExtremeLeft:
-				Pivot = Bounds.GetCenter() - Bounds.GetExtent();
-				break;
-			case EPrefabricatorPivotPosition::ExtremeRight:
-				Pivot = Bounds.GetCenter() + Bounds.GetExtent();
-				break;
-			case EPrefabricatorPivotPosition::Center:
-				Pivot = Bounds.GetCenter();
-				break;
-			default:;
+		switch (GetDefault< UPrefabricatorSettings>()->PivotPosition)
+		{
+		case EPrefabricatorPivotPosition::ExtremeLeft:
+			Pivot = Bounds.GetCenter() - Bounds.GetExtent();
+			break;
+		case EPrefabricatorPivotPosition::ExtremeRight:
+			Pivot = Bounds.GetCenter() + Bounds.GetExtent();
+			break;
+		case EPrefabricatorPivotPosition::Center:
+			Pivot = Bounds.GetCenter();
+			break;
+		default:;
 		}
 		Pivot.Z = Bounds.Min.Z;
 	}
@@ -95,7 +95,7 @@ UPrefabricatorAsset* UPrefabricatorAssetCollection::GetPrefabAsset(const FPrefab
 
 	FRandomStream Random;
 	Random.Initialize(InConfig.Seed);
-	
+
 	TSoftObjectPtr<UPrefabricatorAsset> PrefabAssetPtr;
 
 	if (TotalWeight == 0) {
@@ -132,24 +132,44 @@ void UPrefabricatorProperty::SaveReferencedAssetValues()
 {
 	AssetSoftReferenceMappings.Reset();
 
-	const FRegexPattern Pattern(*FPrefabricatorConstants::SoftReferenceSearchPattern);
+	const FString SoftReferenceSearchPattern = "([A-Za-z0-9_]+)'(.*?)'";
+
+	const FRegexPattern Pattern(*SoftReferenceSearchPattern);
 	FRegexMatcher Matcher(Pattern, *ExportedValue);
 
 	while (Matcher.FindNext()) {
+		FString FullPath = Matcher.GetCaptureGroup(0);
+		FString ClassName = Matcher.GetCaptureGroup(1);
+		FString ObjectPath = Matcher.GetCaptureGroup(2);
+		if (ClassName == "PrefabricatorAssetUserData") {
+			continue;
+		}
+		bool bUseQuotes = false;
+		if (ObjectPath.Len() >= 2 && ObjectPath.StartsWith("\"") && ObjectPath.EndsWith("\"")) {
+			ObjectPath = ObjectPath.Mid(1, ObjectPath.Len() - 2);
+			bUseQuotes = true;
+		}
+
+		/*
 		int32 StartIdx = Matcher.GetMatchBeginning();
 		int32 EndIdx = Matcher.GetMatchEnding();
 		FString AssetPath = ExportedValue.Mid(StartIdx, EndIdx - StartIdx + 1);
 		if (AssetPath.StartsWith("PrefabricatorAssetUserData")) {		// TODO: Get this name from the static class
 			continue;
 		}
-		FSoftObjectPath SoftPath(AssetPath);
+		*/
+
+		FSoftObjectPath SoftPath(ObjectPath);
 
 		FPrefabricatorPropertyAssetMapping Mapping;
 		Mapping.AssetReference = SoftPath;
-		if (Mapping.AssetReference.IsValid()) {
-			FString ObjectPathString;
-			FPackageName::ParseExportTextPath(AssetPath, &Mapping.AssetClassName, &ObjectPathString);
-			Mapping.AssetObjectPath = *ObjectPathString;
+		//if (Mapping.AssetReference.IsValid()) 
+		{
+			//FString ObjectPathString;
+			//FPackageName::ParseExportTextPath(AssetPath, &Mapping.AssetClassName, &ObjectPathString);
+			Mapping.AssetClassName = ClassName;
+			Mapping.AssetObjectPath = *ObjectPath;
+			Mapping.bUseQuotes = bUseQuotes;
 			AssetSoftReferenceMappings.Add(Mapping);
 			UE_LOG(LogPrefabricatorAsset, Log, TEXT("######>>> Found Asset: [%s][%s] | %s"), *Mapping.AssetClassName, *Mapping.AssetObjectPath.ToString(), *Mapping.AssetReference.GetAssetPathName().ToString());
 		}
@@ -176,8 +196,16 @@ void UPrefabricatorProperty::LoadReferencedAssetValues()
 		}
 
 		// The object path has changed.  Update it and mark as modified
-		FString ReplaceFrom = FString::Printf(TEXT("%s\'%s\'"), *Mapping.AssetClassName, *Mapping.AssetObjectPath.ToString());
-		FString ReplaceTo = FString::Printf(TEXT("%s\'%s\'"), *Mapping.AssetClassName, *ReferencedPath.ToString());
+		FString ReplaceFrom, ReplaceTo;
+		if (Mapping.bUseQuotes) {
+			ReplaceFrom = FString::Printf(TEXT("%s\'\"%s\"\'"), *Mapping.AssetClassName, *Mapping.AssetObjectPath.ToString());
+			ReplaceTo = FString::Printf(TEXT("%s\'\"%s\"\'"), *Mapping.AssetClassName, *ReferencedPath.ToString());
+		}
+		else {
+			ReplaceFrom = FString::Printf(TEXT("%s\'%s\'"), *Mapping.AssetClassName, *Mapping.AssetObjectPath.ToString());
+			ReplaceTo = FString::Printf(TEXT("%s\'%s\'"), *Mapping.AssetClassName, *ReferencedPath.ToString());
+		}
+
 		ExportedValue = ExportedValue.Replace(*ReplaceFrom, *ReplaceTo);
 		Mapping.AssetObjectPath = ReferencedPath;
 

Source/PrefabricatorRuntime/Private/Utils/PrefabricatorConstants.cpp

@@ -3,4 +3,3 @@
 #include "Utils/PrefabricatorConstants.h"
 
 
-const FString FPrefabricatorConstants::SoftReferenceSearchPattern = "[A-Za-z0-9_]+'.*?'";

Source/PrefabricatorRuntime/Private/Utils/PrefabricatorFunctionLibrary.cpp

@@ -27,17 +27,22 @@ APrefabActor* UPrefabricatorBlueprintLibrary::SpawnPrefab(const UObject* WorldCo
 			PrefabActor->PrefabComponent->PrefabAssetInterface = Prefab;
 
 			FRandomStream Random(Seed);
-			PrefabActor->RandomizeSeed(Random);
-
-			FPrefabLoadSettings LoadSettings;
-			LoadSettings.bRandomizeNestedSeed = true;
-			LoadSettings.Random = &Random;
-			FPrefabTools::LoadStateFromPrefabAsset(PrefabActor, LoadSettings);
+			RandomizePrefab(PrefabActor, Random);
 		}
 	}
 	return PrefabActor;
 }
 
+void UPrefabricatorBlueprintLibrary::RandomizePrefab(APrefabActor* PrefabActor, const FRandomStream& InRandom)
+{
+	PrefabActor->RandomizeSeed(InRandom);
+
+	FPrefabLoadSettings LoadSettings;
+	LoadSettings.bRandomizeNestedSeed = true;
+	LoadSettings.Random = &InRandom;
+	FPrefabTools::LoadStateFromPrefabAsset(PrefabActor, LoadSettings);
+}
+
 void UPrefabricatorBlueprintLibrary::GetAllAttachedActors(AActor* Prefab, TArray<AActor*>& AttachedActors)
 {
 	if (!Prefab) return;

Source/PrefabricatorRuntime/Public/Asset/PrefabricatorAsset.h

@@ -17,6 +17,9 @@ struct PREFABRICATORRUNTIME_API FPrefabricatorPropertyAssetMapping {
 
 	UPROPERTY()
 	FName AssetObjectPath;
+
+	UPROPERTY()
+	bool bUseQuotes = false;
 };
 
 UCLASS()

Source/PrefabricatorRuntime/Public/Prefab/PrefabTools.h

@@ -12,7 +12,7 @@ struct PREFABRICATORRUNTIME_API FPrefabLoadSettings {
 	bool bUnregisterComponentsBeforeLoading = true;
 	bool bRandomizeNestedSeed = false;
 	bool bSynchronousBuild = true;
-	FRandomStream* Random = nullptr;
+	const FRandomStream* Random = nullptr;
 };
 
 class PREFABRICATORRUNTIME_API FPrefabTools {

Source/PrefabricatorRuntime/Public/Utils/PrefabricatorConstants.h

@@ -5,6 +5,5 @@
 
 class PREFABRICATORRUNTIME_API FPrefabricatorConstants {
 public:
-	static const FString SoftReferenceSearchPattern;
 };
 

Source/PrefabricatorRuntime/Public/Utils/PrefabricatorFunctionLibrary.h

@@ -17,6 +17,9 @@ class PREFABRICATORRUNTIME_API UPrefabricatorBlueprintLibrary : public UBlueprin
 	UFUNCTION(BlueprintCallable, Category = "Prefabricator")
 	static APrefabActor* SpawnPrefab(const UObject* WorldContextObject, UPrefabricatorAssetInterface* Prefab, const FTransform& Transform, int32 Seed);
 
+	UFUNCTION(BlueprintCallable, Category = "Prefabricator")
+	static void RandomizePrefab(APrefabActor* PrefabActor, const FRandomStream& InRandom);
+
 	UFUNCTION(BlueprintCallable, Category = "Prefabricator")
 	static void GetAllAttachedActors(AActor* Prefab, TArray<AActor*>& AttachedActors);