birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue where game and editor entities could exist simultaneously while exiting game mode (#2015)

Browse Source 
Signed-off-by: sconel <sconel@amazon.com>
This commit is contained in:
sconel
2021-07-09 13:39:17 -07:00
committed by GitHub
parent eb9304c28d
commit 22a52bc7b2
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
+21 -12
View File
@@ -597,22 +597,23 @@ namespace AzToolsFramework
{
if (m_rootInstance && m_playInEditorData.m_isEnabled)
{
auto end = m_playInEditorData.m_deactivatedEntities.rend();
for (auto it = m_playInEditorData.m_deactivatedEntities.rbegin(); it != end; ++it)
{
AZ_Assert(*it, "Invalid entity added to list for re-activation after play-in-editor stopped.");
(*it)->Activate();
}
m_playInEditorData.m_deactivatedEntities.clear();
AZ_Assert(m_playInEditorData.m_entities.IsSet(),
"Invalid Game Mode Entities Container encountered after play-in-editor stopped. "
"Confirm that the container was initialized correctly");
m_playInEditorData.m_entities.DespawnAllEntities();
m_playInEditorData.m_entities.Alert(
[assets = AZStd::move(m_playInEditorData.m_assets)]([[maybe_unused]]uint32_t generation) mutable
[assets = AZStd::move(m_playInEditorData.m_assets),
deactivatedEntities = AZStd::move(m_playInEditorData.m_deactivatedEntities)]
([[maybe_unused]]uint32_t generation) mutable
{
auto end = deactivatedEntities.rend();
for (auto it = deactivatedEntities.rbegin(); it != end; ++it)
{
AZ_Assert(*it, "Invalid entity added to list for re-activation after play-in-editor stopped.");
(*it)->Activate();
}
for (auto& asset : assets)
{
if (asset)
@@ -624,13 +625,21 @@ namespace AzToolsFramework
}
}
AZ::ScriptSystemRequestBus::Broadcast(&AZ::ScriptSystemRequests::GarbageCollect);
// This is a workaround until the replacement for GameEntityContext is done
AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnGameEntitiesReset);
});
m_playInEditorData.m_entities.Clear();
// This is a workaround until the replacement for GameEntityContext is done
AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnGameEntitiesReset);
}
// Game entity cleanup is queued onto the next tick via the DespawnEntities call.
// To avoid both game entities and Editor entities active at the same time
// we flush the tick queue to ensure the game entities are cleared first.
// The Alert callback that follows the DespawnEntities call will then reactivate the editor entities
// This should be considered temporary as a move to a less rigid event sequence that supports async entity clean up
// is the desired direction forward.
AZ::TickBus::ExecuteQueuedEvents();
m_playInEditorData.m_isEnabled = false;
}