[2409] Csv Spawner Notification Bus

Gems/CsvSpawner/Code/Include/CsvSpawner/CsvSpawnerInterface.h

@@ -34,14 +34,14 @@ namespace CsvSpawner
          * @brief Called when entity spawning begins.
          * @param m_spawnInfo Struct holding information about entities to be spawned.
          */
-        virtual void OnEntitiesSpawnBegin(CsvSpawnerUtils::SpawnInfo& m_spawnInfo) = 0;
+        virtual void OnEntitiesSpawnBegin(CsvSpawnerUtils::SpawnInfo m_spawnInfo) = 0;
 
         /**
          * @brief Called when entity spawning finishes.
          * @param m_spawnInfo Struct holding information about entities to be spawned.
          * @param m_statusCode Status code indicating success, failure and warnings of the spawn.
          */
-        virtual void OnEntitiesSpawnFinished(CsvSpawnerUtils::SpawnInfo& m_spawnInfo, CsvSpawnerUtils::SpawnStatus m_statusCode) = 0;
+        virtual void OnEntitiesSpawnFinished(CsvSpawnerUtils::SpawnInfo m_spawnInfo, CsvSpawnerUtils::SpawnStatus m_statusCode) = 0;
 
         /// EBus Configuration - Allows multiple listeners to handle events.
         static constexpr AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
@@ -62,12 +62,12 @@ namespace CsvSpawner
             OnEntitiesSpawnBegin,
             OnEntitiesSpawnFinished);
 
-        void OnEntitiesSpawnBegin(CsvSpawnerUtils::SpawnInfo& m_spawnInfo) override
+        void OnEntitiesSpawnBegin(CsvSpawnerUtils::SpawnInfo m_spawnInfo) override
         {
             Call(FN_OnEntitiesSpawnBegin, m_spawnInfo);
         }
 
-        void OnEntitiesSpawnFinished(CsvSpawnerUtils::SpawnInfo& m_spawnInfo, CsvSpawnerUtils::SpawnStatus m_statusCode) override
+        void OnEntitiesSpawnFinished(CsvSpawnerUtils::SpawnInfo m_spawnInfo, CsvSpawnerUtils::SpawnStatus m_statusCode) override
         {
             Call(FN_OnEntitiesSpawnFinished, m_spawnInfo, m_statusCode);
         }

Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.cpp

@@ -11,6 +11,8 @@
 
 #include "CsvSpawnerUtils.h"
 
+#include "AzCore/std/smart_ptr/make_shared.h"
+
 #include <AzFramework/Physics/CollisionBus.h>
 #include <CsvSpawner/CsvSpawnerInterface.h>
 
@@ -223,11 +225,22 @@ namespace CsvSpawner::CsvSpawnerUtils
     {
         SpawnInfo broadcastSpawnInfo =
             SpawnInfo{ entitiesToSpawn, physicsSceneName, parentId }; // Spawn Info used in CsvSpawner EBus notify.
-        SpawnStatus spawnStatusCode = SpawnStatus::Success; // Spawn Status Code used for CsvSpawner EBus notify - OnEntitiesSpawnFinished.
+        // SpawnStatus spawnStatusCode = SpawnStatus::Success; // Spawn Status Code used for CsvSpawner EBus notify -
+        // OnEntitiesSpawnFinished.
+        auto spawnStatusCode = AZStd::make_shared<SpawnStatus>(
+            SpawnStatus::Success); // Spawn Status Code used for CsvSpawner EBus notify - OnEntitiesSpawnFinished.
 
         // Call CsvSpawner EBus notification - Begin
         CsvSpawnerNotificationBus::Broadcast(&CsvSpawnerInterface::OnEntitiesSpawnBegin, broadcastSpawnInfo);
 
+        // Check if there are no entities to spawn
+        if (entitiesToSpawn.empty())
+        {
+            *spawnStatusCode |= SpawnStatus::Fail;
+            CsvSpawnerNotificationBus::Broadcast(&CsvSpawnerInterface::OnEntitiesSpawnFinished, broadcastSpawnInfo, *spawnStatusCode);
+            return {};
+        }
+
         auto sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get();
         AZ_Assert(sceneInterface, "Unable to get physics scene interface");
         const auto sceneHandle = sceneInterface->GetSceneHandle(physicsSceneName);
@@ -236,6 +249,8 @@ namespace CsvSpawner::CsvSpawnerUtils
         auto spawner = AZ::Interface<AzFramework::SpawnableEntitiesDefinition>::Get();
         AZ_Assert(spawner, "Unable to get spawnable entities definition");
 
+        auto pendingSpawns = AZStd::make_shared<AZStd::atomic_int>(static_cast<int>(entitiesToSpawn.size()));
+
         // get parent transform
         AZ::Transform parentTransform = AZ::Transform::CreateIdentity();
         if (parentId.IsValid())
@@ -251,18 +266,14 @@ namespace CsvSpawner::CsvSpawnerUtils
             }
         }
 
-        // Track how many tickets are spawned and how many have completed
-        size_t totalTickets = 0;
-        std::atomic_size_t completedTickets = 0;
-
         for (const auto& entityConfig : entitiesToSpawn)
         {
             if (!spawnableAssetConfiguration.contains(entityConfig.m_name))
             {
                 AZ_Error("CsvSpawner", false, "SpawnableAssetConfiguration %s not found", entityConfig.m_name.c_str());
 
                 // Add notify code status
-                spawnStatusCode |= SpawnStatus::Warning;
+                *spawnStatusCode |= SpawnStatus::Warning;
                 continue;
             }
 
@@ -293,7 +304,7 @@ namespace CsvSpawner::CsvSpawnerUtils
                 else
                 {
                     // Add notify code status
-                    spawnStatusCode |= SpawnStatus::Warning;
+                    *spawnStatusCode |= SpawnStatus::Warning;
 
                     continue; // Skip this entity if we can't find a valid position and
                               // place on terrain is enabled.
@@ -309,7 +320,7 @@ namespace CsvSpawner::CsvSpawnerUtils
                 if (view.empty())
                 {
                     // Add notify code status
-                    spawnStatusCode |= SpawnStatus::Warning | SpawnStatus::Stopped;
+                    *spawnStatusCode |= SpawnStatus::Warning | SpawnStatus::Stopped;
 
                     return;
                 }
@@ -320,40 +331,31 @@ namespace CsvSpawner::CsvSpawnerUtils
                 transformInterface->SetWorldTM(transform);
             };
             optionalArgs.m_completionCallback =
-                [parentId, &spawnStatusCode, &broadcastSpawnInfo, totalTickets, &completedTickets](
+                [parentId, spawnStatusCode, pendingSpawns, broadcastSpawnInfo](
                     [[maybe_unused]] AzFramework::EntitySpawnTicket::Id ticketId, AzFramework::SpawnableConstEntityContainerView view)
             {
                 if (view.empty())
                 {
-                    // Add notify code status
-                    spawnStatusCode |= SpawnStatus::Warning | SpawnStatus::Stopped;
-
-                    return;
+                    *spawnStatusCode |= SpawnStatus::Warning | SpawnStatus::Stopped;
+                }
+                else
+                {
+                    const AZ::Entity* root = *view.begin();
+                    AZ::TransformBus::Event(root->GetId(), &AZ::TransformBus::Events::SetParent, parentId);
                 }
-                const AZ::Entity* root = *view.begin();
-                AZ::TransformBus::Event(root->GetId(), &AZ::TransformBus::Events::SetParent, parentId);
 
-                completedTickets++;
-                if (completedTickets == totalTickets)
+                // Decrement the pending counter
+                const int remaining = --(*pendingSpawns);
+                if (remaining == 0)
                 {
-                    // Call CsvSpawner EBus notification - Finished
+                    // All spawns are finished, now broadcast finished notification
                     CsvSpawnerNotificationBus::Broadcast(
-                        &CsvSpawnerInterface::OnEntitiesSpawnFinished, broadcastSpawnInfo, spawnStatusCode);
+                        &CsvSpawnerInterface::OnEntitiesSpawnFinished, broadcastSpawnInfo, *spawnStatusCode);
                 }
             };
             optionalArgs.m_priority = AzFramework::SpawnablePriority_Lowest;
             spawner->SpawnAllEntities(ticket, optionalArgs);
             tickets[entityConfig.m_id] = AZStd::move(ticket);
-
-            totalTickets++;
-        }
-
-        // If no tickets were created at all (no entities spawned), send finish immediately
-        if (totalTickets == 0)
-        {
-            spawnStatusCode |= SpawnStatus::Fail;
-            // Call CsvSpawner EBus notification - Finished
-            CsvSpawnerNotificationBus::Broadcast(&CsvSpawnerInterface::OnEntitiesSpawnFinished, broadcastSpawnInfo, spawnStatusCode);
         }
 
         return tickets;