Tweaked: Check the archetype set first during archetype deletion

richardbiely · Sep 30, 2024 · 2d79133 · 2d79133
1 parent 47569a0
commit 2d79133
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/include/gaia/ecs/query_info.h b/include/gaia/ecs/query_info.h
@@ -354,11 +354,14 @@ namespace gaia {
 			}
 
 			bool del_archetype_from_cache(Archetype* pArchetype) {
-				const auto idx = core::get_index(m_archetypeCache, pArchetype);
-				if (idx == BadIndex)
+				const auto it = m_archetypeSet.find(pArchetype);
+				if (it == m_archetypeSet.end())
 					return false;
+				m_archetypeSet.erase(it);
+
+				const auto idx = core::get_index_unsafe(m_archetypeCache, pArchetype);
+				GAIA_ASSERT(idx != BadIndex);
 
-				m_archetypeSet.erase(pArchetype);
 				core::erase_fast(m_archetypeCache, idx);
 				core::erase_fast(m_archetypeCacheData, idx);
 

diff --git a/single_include/gaia.h b/single_include/gaia.h
@@ -23254,11 +23254,14 @@ namespace gaia {
 			}
 
 			bool del_archetype_from_cache(Archetype* pArchetype) {
-				const auto idx = core::get_index(m_archetypeCache, pArchetype);
-				if (idx == BadIndex)
+				const auto it = m_archetypeSet.find(pArchetype);
+				if (it == m_archetypeSet.end())
 					return false;
+				m_archetypeSet.erase(it);
+
+				const auto idx = core::get_index_unsafe(m_archetypeCache, pArchetype);
+				GAIA_ASSERT(idx != BadIndex);
 
-				m_archetypeSet.erase(pArchetype);
 				core::erase_fast(m_archetypeCache, idx);
 				core::erase_fast(m_archetypeCacheData, idx);