move struct to utils

Signed-off-by: Wojciech Czerski <[email protected]>

Author: w-czerski

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

@@ -12,43 +12,10 @@
 #pragma once
 
 #include <CsvSpawner/CsvSpawnerUtils.h>
-
 #include <AzCore/EBus/EBus.h>
-#include <AzCore/std/string/string.h>
 
 namespace CsvSpawner
 {
-
-    /**
-     * @brief Flags representing the status of an CsvSpawner::Spawn() operation.
-     *
-     * SpawnStatus provides various status indicators for entity spawning.
-     * These flags help track whether spawning was successful, stopped, or failed.
-     */
-    enum class SpawnStatus : uint8_t
-    {
-        Success = 0, ///< Operation succeeded.
-        Fail = 1 << 0, ///< Generic failure.
-        Stopped = 1 << 1, ///< Spawning was stopped prematurely but not necessarily a failure.
-        Warning = 1 << 2, ///< An warning or error occurred during spawning (potentially recoverable).
-    };
-
-    /// Enable bitwise operations for SpawnStatus.
-    AZ_DEFINE_ENUM_BITWISE_OPERATORS(SpawnStatus);
-
-    /**
-     * @brief Structure holding data related to CsvSpawner entity spawning.
-     *
-     * SpawnInfo contains information about the entities to be spawned, the physics scene
-     * they belong to, and the parent entity responsible for the spawn operation.
-     */
-    struct SpawnInfo
-    {
-        AZStd::vector<CsvSpawnerUtils::CsvSpawnableEntityInfo> m_entitiesToSpawn; ///< List of entities to spawn.
-        AZStd::string m_physicsSceneName; ///< Name of the physics scene where entities will be spawned.
-        AZ::EntityId m_spawnerParentEntityId; ///< Parent entity ID managing the spawn process.
-    };
-
     /**
      * @brief Interface for handling entity spawn events for Csv Spawner.
      *
@@ -58,13 +25,14 @@ namespace CsvSpawner
     class CsvSpawnerInterface : public AZ::EBusTraits
     {
     public:
+        AZ_RTTI(CsvSpawnerInterface, CsvSpawnerInterfaceTypeId);
         virtual ~CsvSpawnerInterface() = default;
 
         /**
          * @brief Called when entity spawning begins.
          * @param m_spawnInfo Struct holding information about entities to be spawned.
          */
-        virtual void OnEntitiesSpawnBegin(SpawnInfo& m_spawnInfo)
+        virtual void OnEntitiesSpawnBegin(CsvSpawnerUtils::SpawnInfo& m_spawnInfo)
         {
         }
 
@@ -73,7 +41,7 @@ namespace CsvSpawner
          * @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(SpawnInfo& m_spawnInfo, SpawnStatus& m_statusCode)
+        virtual void OnEntitiesSpawnFinished(CsvSpawnerUtils::SpawnInfo& m_spawnInfo, CsvSpawnerUtils::SpawnStatus& m_statusCode)
         {
         }
 

Gems/CsvSpawner/Code/Include/CsvSpawner/CsvSpawnerTypeIds.h

@@ -21,5 +21,6 @@ namespace CsvSpawner
     inline constexpr const char* CsvSpawnerComponentTypeId = "{59b31372-1f3c-4733-b61b-0fe94b5a8f3e}";
 
     // Interface TypeIds
-    inline constexpr const char* CsvSpawnerRequestsTypeId = "{77ACBD4E-069E-4610-8154-E1AC28CEE05A}";
+    inline constexpr const char* CsvSpawnerInterfaceTypeId = "{77ACBD4E-069E-4610-8154-E1AC28CEE05A}";
+    inline constexpr const char* CsvSpawnerSpawnInfoTypeId = "{81E5A014-3232-4359-98F5-7F9D7152629E}";
 } // namespace CsvSpawner

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

@@ -317,4 +317,54 @@ namespace CsvSpawner::CsvSpawnerUtils
         return tickets;
     }
 
+    void SpawnInfo::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            // Reflect SpawnStatus enum
+            serializeContext->Enum<SpawnStatus>()
+                ->Version(0)
+                ->Value("Success", SpawnStatus::Success)
+                ->Value("Fail", SpawnStatus::Fail)
+                ->Value("Stopped", SpawnStatus::Stopped)
+                ->Value("Warning", SpawnStatus::Warning);
+
+            // Reflect SpawnInfo struct
+            serializeContext->Class<SpawnInfo>()
+                ->Version(0)
+                ->Field("EntitiesToSpawn", &SpawnInfo::m_entitiesToSpawn)
+                ->Field("PhysicsSceneName", &SpawnInfo::m_physicsSceneName)
+                ->Field("SpawnerParentEntityId", &SpawnInfo::m_spawnerParentEntityId);
+
+            if (auto* editContext = serializeContext->GetEditContext())
+            {
+                editContext->Class<SpawnInfo>("Spawn Info", "Information about entities being spawned")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default,
+                        &SpawnInfo::m_entitiesToSpawn,
+                        "Entities to Spawn",
+                        "List of entities to be spawned.")
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default,
+                        &SpawnInfo::m_physicsSceneName,
+                        "Physics Scene",
+                        "Name of the physics scene where entities will be spawned.")
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default,
+                        &SpawnInfo::m_spawnerParentEntityId,
+                        "Parent Entity",
+                        "Parent entity ID responsible for spawning.");
+            }
+        }
+
+        if (auto* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<SpawnInfo>("SpawnInfo")
+                ->Constructor()
+                ->Property("m_entitiesToSpawn", BehaviorValueProperty(&SpawnInfo::m_entitiesToSpawn))
+                ->Property("m_physicsSceneName", BehaviorValueProperty(&SpawnInfo::m_physicsSceneName))
+                ->Property("m_spawnerParentEntityId", BehaviorValueProperty(&SpawnInfo::m_spawnerParentEntityId));
+        }
+    }
 } // namespace CsvSpawner::CsvSpawnerUtils

Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.h

@@ -99,4 +99,37 @@ namespace CsvSpawner::CsvSpawnerUtils
         const AZStd::string& physicsSceneName = AZStd::string(),
         AZ::EntityId parentId = AZ::EntityId());
 
-}; // namespace CsvSpawner::CsvSpawnerUtils
+    /**
+     * @brief Flags representing the status of an CsvSpawner::Spawn() operation.
+     *
+     * SpawnStatus provides various status indicators for entity spawning.
+     * These flags help track whether spawning was successful, stopped, or failed.
+     */
+    enum class SpawnStatus : uint8_t
+    {
+        Success = 0, ///< Operation succeeded.
+        Fail = 1 << 0, ///< Generic failure.
+        Stopped = 1 << 1, ///< Spawning was stopped prematurely but not necessarily a failure.
+        Warning = 1 << 2, ///< An warning or error occurred during spawning (potentially recoverable).
+    };
+
+    /// Enable bitwise operations for SpawnStatus.
+    AZ_DEFINE_ENUM_BITWISE_OPERATORS(SpawnStatus);
+
+    /**
+     * @brief Structure holding data related to CsvSpawner entity spawning.
+     *
+     * SpawnInfo contains information about the entities to be spawned, the physics scene
+     * they belong to, and the parent entity responsible for the spawn operation.
+     */
+    struct SpawnInfo
+    {
+        AZ_TYPE_INFO(SpawnInfo, CsvSpawnerSpawnInfoTypeId);
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::vector<CsvSpawnableEntityInfo> m_entitiesToSpawn; ///< List of entities to spawn.
+        AZStd::string m_physicsSceneName; ///< Name of the physics scene where entities will be spawned.
+        AZ::EntityId m_spawnerParentEntityId; ///< Parent entity ID managing the spawn process.
+    };
+
+} // namespace CsvSpawner::CsvSpawnerUtils