forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check for duplicate archetypes in QueryState::new_archetype (#1789)

Browse Source 
Fixes #1788

See discussion in that issue for details.
This commit is contained in:
Carter Anderson 2021-03-30 21:21:47 +00:00
parent 9193fc57d0
commit d6bc414bf0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/bevy_ecs/src/query/state.rs
View File

@ -80,7 +80,6 @@ where
} }
pub fn new_archetype(&mut self, archetype: &Archetype) { pub fn new_archetype(&mut self, archetype: &Archetype) {
let table_index = archetype.table_id().index();
if self.fetch_state.matches_archetype(archetype) if self.fetch_state.matches_archetype(archetype)
&& self.filter_state.matches_archetype(archetype) && self.filter_state.matches_archetype(archetype)
{ {
@ -88,9 +87,13 @@ where
.update_archetype_component_access(archetype, &mut self.archetype_component_access); .update_archetype_component_access(archetype, &mut self.archetype_component_access);
self.filter_state self.filter_state
.update_archetype_component_access(archetype, &mut self.archetype_component_access); .update_archetype_component_access(archetype, &mut self.archetype_component_access);
self.matched_archetypes.grow(archetype.id().index() + 1); let archetype_index = archetype.id().index();
self.matched_archetypes.set(archetype.id().index(), true); if !self.matched_archetypes.contains(archetype_index) {
self.matched_archetype_ids.push(archetype.id()); self.matched_archetypes.grow(archetype_index + 1);
self.matched_archetypes.set(archetype_index, true);
self.matched_archetype_ids.push(archetype.id());
}
let table_index = archetype.table_id().index();
if !self.matched_tables.contains(table_index) { if !self.matched_tables.contains(table_index) {
self.matched_tables.grow(table_index + 1); self.matched_tables.grow(table_index + 1);
self.matched_tables.set(table_index, true); self.matched_tables.set(table_index, true);