Fixing crash creating new level when simulate mode is on

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-10-07 20:35:23 -05:00
parent 8fc8baa579
commit f43b3b9fbe
4 changed files with 22 additions and 2 deletions
@@ -61,6 +61,10 @@ namespace AzFramework
        //! be deleted and the spawnable asset to be released. This call is automatically done when
        //! AssignRootSpawnable is called while a root spawnable is assigned.
        virtual void ReleaseRootSpawnable() = 0;
+        //! Force processing all SpawnableEntitiesManager requests immediately
+        //! This is useful when loading a different level while SpawnableEntitiesManager still has
+        //! pending requests
+        virtual void ProcessSpawnableQueue() = 0;
    };

    using RootSpawnableInterface = AZ::Interface<RootSpawnableDefinition>;
@@ -45,8 +45,7 @@ namespace AzFramework

    void SpawnableSystemComponent::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
    {
-        m_entitiesManager.ProcessQueue(
-            SpawnableEntitiesManager::CommandQueuePriority::High | SpawnableEntitiesManager::CommandQueuePriority::Regular);
+        ProcessSpawnableQueue();
        RootSpawnableNotificationBus::ExecuteQueuedEvents();
    }

@@ -121,6 +120,12 @@ namespace AzFramework
        m_rootSpawnableId = AZ::Data::AssetId();
    }

+    void SpawnableSystemComponent::ProcessSpawnableQueue()
+    {
+        m_entitiesManager.ProcessQueue(
+            SpawnableEntitiesManager::CommandQueuePriority::High | SpawnableEntitiesManager::CommandQueuePriority::Regular);
+    }
+
    void SpawnableSystemComponent::OnRootSpawnableAssigned([[maybe_unused]] AZ::Data::Asset<Spawnable> rootSpawnable,
        [[maybe_unused]] uint32_t generation)
    {
@@ -75,6 +75,7 @@ namespace AzFramework

        uint64_t AssignRootSpawnable(AZ::Data::Asset<Spawnable> rootSpawnable) override;
        void ReleaseRootSpawnable() override;
+        void ProcessSpawnableQueue() override;

        //
        // RootSpawnbleNotificationBus