Fixed parent issuing with Geometry Collection Actors.

Author: andys-sidefx

Source/HoudiniEngine/Private/HoudiniGeoImporter.cpp

@@ -491,8 +491,11 @@ UHoudiniGeoImporter::CreateInstancers(
 
 	if (bHasGeometryCollection)
 	{
+		// TODO: We need to know who to parent new outputs too. This should be a Cookable, but we don't have one...
+		UObject* OutputOwner = OuterComponent;
+
 		FHoudiniGeometryCollectionTranslator::SetupGeometryCollectionComponentFromOutputs(
-			InAllOutputs, OuterComponent, PackageParams, World);
+			InAllOutputs, OutputOwner, OuterComponent, PackageParams, World);
 
 		if (InAllOutputs.Last()->GetType() != EHoudiniOutputType::GeometryCollection)
 		{

Source/HoudiniEngine/Private/HoudiniGeometryCollectionTranslator.cpp

@@ -28,6 +28,7 @@
 void
 FHoudiniGeometryCollectionTranslator::SetupGeometryCollectionComponentFromOutputs(
 	TArray<TObjectPtr<UHoudiniOutput>>& InAllOutputs,
+	UObject* InOutputParent, // Probably a cookable, but not for GeoImporter.
 	UObject* InOuterComponent,
 	const FHoudiniPackageParams& InPackageParams, 
 	UWorld * InWorld)
@@ -72,7 +73,7 @@ FHoudiniGeometryCollectionTranslator::SetupGeometryCollectionComponentFromOutput
 		{
 			// Create the actual HoudiniOutput.
 			HoudiniOutput = NewObject<UHoudiniOutput>(
-			InOuterComponent,
+			InOutputParent,
 			UHoudiniOutput::StaticClass(),
 			FName(*GCName), // Used for baking identification
 			RF_NoFlags);
@@ -128,10 +129,9 @@ FHoudiniGeometryCollectionTranslator::SetupGeometryCollectionComponentFromOutput
 
 			GeometryCollectionActor->GetGeometryCollectionComponent()->SetRestCollection(GeometryCollection);
 
-			UHoudiniCookable* HC = FHoudiniEngineUtils::GetOuterHoudiniCookable(HoudiniOutput);
-			if (IsValid(HC) && HC->GetComponent())
+			if (IsValid(ParentComponent))
 			{
-				GeometryCollectionActor->AttachToComponent(HC->GetComponent(), FAttachmentTransformRules::KeepWorldTransform);
+				GeometryCollectionActor->AttachToComponent(ParentComponent, FAttachmentTransformRules::KeepWorldTransform);
 			}
 
 			ActorTransform = ParentComponent->GetOwner()->GetTransform();

Source/HoudiniEngine/Private/HoudiniGeometryCollectionTranslator.h

@@ -72,8 +72,12 @@ struct HOUDINIENGINE_API FHoudiniGeometryCollectionTranslator
 	};
 
 	public:
-		static void SetupGeometryCollectionComponentFromOutputs(TArray<TObjectPtr<UHoudiniOutput>>& InAllOutputs,
-			UObject* InOuterComponent, const FHoudiniPackageParams& InPackageParams, UWorld * InWorld);
+		static void SetupGeometryCollectionComponentFromOutputs(
+			TArray<TObjectPtr<UHoudiniOutput>>& InAllOutputs,
+			UObject* InOutputParent,
+			UObject* InOuterComponent, 
+			const FHoudiniPackageParams& InPackageParams, 
+			UWorld * InWorld);
 
 		static bool GetFracturePieceAttribute(const HAPI_NodeId& GeoId, const HAPI_NodeId& PartId, int& OutInt);
 		static bool GetClusterPieceAttribute(const HAPI_NodeId& GeoId, const HAPI_NodeId& PartId, int& OutInt);

Source/HoudiniEngine/Private/HoudiniOutputTranslator.cpp

@@ -333,10 +333,10 @@ FHoudiniOutputTranslator::CreateAllOutputs(
 
 	// TODO COOKABLE: Handle the case where the Out is NOT a component
 	// we need to split output asset creation from component creation!
+	UHoudiniCookable* OuterHC = Cast<UHoudiniCookable>(InOuter);
 	USceneComponent* InOuterComponent = Cast<USceneComponent>(InOuter);
 	if (!InOuterComponent)
 	{
-		UHoudiniCookable* OuterHC = Cast<UHoudiniCookable>(InOuter);
 		InOuterComponent = OuterHC ? OuterHC->GetComponent() : nullptr;
 	}
 
@@ -668,7 +668,9 @@ FHoudiniOutputTranslator::CreateAllOutputs(
 
 	if (HasGeometryCollection)
 	{
-		FHoudiniGeometryCollectionTranslator::SetupGeometryCollectionComponentFromOutputs(Outputs, InOuterComponent, PackageParams, InWorld);
+		UObject* OutputOwner = OuterHC ? Cast<UObject>(OuterHC) : Cast<UObject>(InOuterComponent);
+
+		FHoudiniGeometryCollectionTranslator::SetupGeometryCollectionComponentFromOutputs(Outputs, OutputOwner, InOuterComponent, PackageParams, InWorld);
 	}
 
 	if (NumVisibleOutputs > 0)