Add StaticMeshActor support in MakePropDefinition.

Enhance actor spawning logic in APropActorFactory with detailed error handling and component validation

Author: LuisPovedaCano

Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/ActorBlueprintFunctionLibrary.cpp

@@ -15,6 +15,7 @@
 #include "Carla/Sensor/ShaderBasedSensor.h"
 #include "Carla/Util/ScopedStack.h"
 #include "BlueprintLibary/PostProcessJsonUtils.h"
+#include "Engine/StaticMeshActor.h"
 
 #include <algorithm>
 #include <limits>
@@ -1063,6 +1064,16 @@ void UActorBlueprintFunctionLibrary::MakePropDefinition(
   FillIdAndTags(Definition, TEXT("static"), TEXT("prop"), Parameters.Name);
   AddRecommendedValuesForActorRoleName(Definition, {TEXT("prop")});
 
+  Definition.Class = AStaticMeshActor::StaticClass();
+  if (Parameters.Mesh != nullptr)
+  {
+    Definition.Variations.Emplace(FActorVariation{
+        TEXT("mesh_path"),
+        EActorAttributeType::String,
+        {Parameters.Mesh->GetPathName()},
+        false});
+  }
+
   auto GetSize = [](EPropSize Value)
   {
     switch (Value)
@@ -1364,7 +1375,6 @@ void UActorBlueprintFunctionLibrary::SetCamera(
 
     FString PostProcessDefaultName = RetrieveActorAttributeToString("post_process_profile",
         Description.Variations, TEXT("default"));
-    
     UPostProcessJsonUtils::LoadAllPostProcessFromJsonToSceneCapture(
         Camera->GetCaptureComponent(),
         PostProcessDefaultName);

Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/Factory/PropActorFactory.cpp

@@ -15,12 +15,14 @@
 #include "JsonUtilities.h"
 #include "Misc/FileHelper.h"
 #include "Misc/Paths.h"
+#include "Engine/StaticMeshActor.h"
+#include "Components/StaticMeshComponent.h"
 #include <util/ue-header-guard-end.h>
 
 TArray<FActorDefinition> APropActorFactory::GetDefinitions()
 {
   LoadPropParametersArrayFromFile("PropParameters.json", PropsParams);
-  
+
   UActorBlueprintFunctionLibrary::MakePropDefinitions(PropsParams, Definitions);
   return Definitions;
 }
@@ -37,22 +39,77 @@ FActorSpawnResult APropActorFactory::SpawnActor(
     return SpawnResult;
   }
 
-  AActor* SpawnedActor = GetWorld()->SpawnActor<AActor>(ActorDescription.Class, SpawnAtTransform);
-  SpawnResult.Actor = SpawnedActor;
+  FActorSpawnParameters SpawnParameters;
+  SpawnParameters.SpawnCollisionHandlingOverride =
+      ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
+
+  AStaticMeshActor* StaticMeshActor = GetWorld()->SpawnActor<AStaticMeshActor>(
+      ActorDescription.Class, SpawnAtTransform, SpawnParameters);
+
+  SpawnResult.Actor = StaticMeshActor;
 
-  if(SpawnedActor == nullptr)
+  if(StaticMeshActor == nullptr)
   {
     SpawnResult.Status = EActorSpawnResultStatus::Collision;
     return SpawnResult;
   }
 
-  if(PostProcessProp(SpawnedActor, ActorDescription))
+  UStaticMeshComponent* StaticMeshComponent = Cast<UStaticMeshComponent>(
+      StaticMeshActor->GetRootComponent());
+
+  if (!StaticMeshComponent)
+  {
+    UE_LOG(LogCarla, Error, TEXT("Prop spawn failed: StaticMeshComponent is null for actor %s"),
+        *ActorDescription.Id);
+    StaticMeshActor->Destroy();
+    SpawnResult.Status = EActorSpawnResultStatus::UnknownError;
+    return SpawnResult;
+  }
+
+  if (!ActorDescription.Variations.Contains("mesh_path"))
+  {
+    UE_LOG(LogCarla, Error, TEXT("Prop spawn failed: No mesh_path variation found for actor %s"),
+        *ActorDescription.Id);
+    StaticMeshActor->Destroy();
+    SpawnResult.Status = EActorSpawnResultStatus::InvalidDescription;
+    return SpawnResult;
+  }
+
+  FString MeshPath = UActorBlueprintFunctionLibrary::ActorAttributeToString(
+      ActorDescription.Variations["mesh_path"], "");
+
+  if (MeshPath.IsEmpty())
+  {
+    UE_LOG(LogCarla, Error, TEXT("Prop spawn failed: mesh_path is empty for actor %s"),
+        *ActorDescription.Id);
+    StaticMeshActor->Destroy();
+    SpawnResult.Status = EActorSpawnResultStatus::InvalidDescription;
+    return SpawnResult;
+  }
+
+  UStaticMesh* Mesh = LoadObject<UStaticMesh>(nullptr, *MeshPath);
+  if (Mesh == nullptr)
+  {
+    UE_LOG(LogCarla, Error, TEXT("Prop spawn failed: Failed to load mesh '%s' for actor %s"),
+        *MeshPath, *ActorDescription.Id);
+    StaticMeshActor->Destroy();
+    SpawnResult.Status = EActorSpawnResultStatus::UnknownError;
+    return SpawnResult;
+  }
+
+  StaticMeshComponent->SetMobility(EComponentMobility::Movable);
+  if (!StaticMeshComponent->SetStaticMesh(Mesh))
   {
-    SpawnResult.Status = EActorSpawnResultStatus::Success;
+    UE_LOG(LogCarla, Error, TEXT("Prop spawn failed: Failed to set mesh '%s' for actor %s"),
+        *MeshPath, *ActorDescription.Id);
+    StaticMeshActor->Destroy();
+    SpawnResult.Status = EActorSpawnResultStatus::UnknownError;
     return SpawnResult;
   }
 
-  SpawnResult.Status = EActorSpawnResultStatus::UnknownError;
+  StaticMeshComponent->SetMobility(EComponentMobility::Static);
+  PostProcessProp(StaticMeshActor, ActorDescription);
+  SpawnResult.Status = EActorSpawnResultStatus::Success;
   return SpawnResult;
 }
 
@@ -226,4 +283,4 @@ void APropActorFactory::LoadPropParametersArrayFromFile(const FString& FileName,
   {
       UE_LOG(LogCarla, Error, TEXT("Failed to load file: %s"), *FilePath);
   }
-}
+}