Add actor instance destruction handling

Signed-off-by: Aleksander Kamiński <[email protected]>
RobotecAI · Sep 13, 2024 · c8cfc29 · c8cfc29
1 parent 94de9a6
commit c8cfc29
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/Code/Source/Entity/ActorEntityManager.cpp b/Code/Source/Entity/ActorEntityManager.cpp
@@ -37,7 +37,7 @@ namespace RGL
 
     void ActorEntityManager::Update()
     {
-        if (RGLInterface::Get()->GetSceneConfiguration().m_isSkinnedMeshUpdateEnabled)
+        if (!m_entities.empty() && RGLInterface::Get()->GetSceneConfiguration().m_isSkinnedMeshUpdateEnabled)
         {
             UpdateMeshVertices();
         }
@@ -99,6 +99,11 @@ namespace RGL
         m_isPoseUpdateNeeded = true;
     }
 
+    void ActorEntityManager::OnActorInstanceDestroyed(EMotionFX::ActorInstance* actorInstance)
+    {
+        m_entities.clear();
+    }
+
     void ActorEntityManager::UpdateMeshVertices()
     {
         m_actorInstance->UpdateMeshDeformers(0.0f);

diff --git a/Code/Source/Entity/ActorEntityManager.h b/Code/Source/Entity/ActorEntityManager.h
@@ -45,6 +45,7 @@ namespace RGL
     protected:
         // ActorComponentNotificationBus overrides
         void OnActorInstanceCreated(EMotionFX::ActorInstance* actorInstance) override;
+        void OnActorInstanceDestroyed(EMotionFX::ActorInstance* actorInstance) override;
 
     private:
         EMotionFX::ActorInstance* m_actorInstance = nullptr;

diff --git a/Code/Source/Entity/MeshEntityManager.cpp b/Code/Source/Entity/MeshEntityManager.cpp
@@ -102,4 +102,9 @@ namespace RGL
             }
         }
     }
+
+    void MeshEntityManager::OnMaterialPropertiesUpdated([[maybe_unused]] const AZ::Render::MaterialAssignmentMap& materials)
+    {
+        AZ_Printf(__func__, "Material properties updated");
+    }
 } // namespace RGL
diff --git a/Code/Source/Entity/MeshEntityManager.h b/Code/Source/Entity/MeshEntityManager.h
@@ -47,6 +47,7 @@ namespace RGL
 
         // AZ::Render::MaterialComponentNotificationBus implementation overrides
         void OnMaterialsUpdated(const AZ::Render::MaterialAssignmentMap& materials) override;
+        void OnMaterialPropertiesUpdated([[maybe_unused]] const AZ::Render::MaterialAssignmentMap& materials) override;
 
         AZStd::unordered_map<AZ::RPI::ModelMaterialSlot::StableId, size_t> m_materialSlotMeshIdMap;
     };