diff options
Diffstat (limited to 'ecs/src/component/storage.rs')
| -rw-r--r-- | ecs/src/component/storage.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ecs/src/component/storage.rs b/ecs/src/component/storage.rs index e909395..9c149ed 100644 --- a/ecs/src/component/storage.rs +++ b/ecs/src/component/storage.rs @@ -12,6 +12,7 @@ use crate::component::{ use crate::entity::Uid as EntityUid; use crate::lock::Lock; use crate::type_name::TypeName; +use crate::util::Sortable; use crate::EntityComponent; #[derive(Debug, Default)] @@ -26,9 +27,12 @@ impl Storage { pub fn find_entities( &self, - components_metadata: impl IntoIterator<Item = ComponentMetadata>, + mut components_metadata: impl IntoIterator<Item = ComponentMetadata> + + Sortable<Item = ComponentMetadata>, ) -> ArchetypeRefIter<'_> { + components_metadata.sort_by_key_b(|component_metadata| component_metadata.id); + self.archetype_lookup .get(&ArchetypeId::from_components_metadata(components_metadata)) .map_or_else(ArchetypeRefIter::new_empty, |archetypes_indices| { @@ -114,9 +118,12 @@ impl Storage pub fn add_archetype_lookup_entry( &mut self, - components_metadata: impl IntoIterator<Item = ComponentMetadata>, + mut components_metadata: impl IntoIterator<Item = ComponentMetadata> + + Sortable<Item = ComponentMetadata>, ) { + components_metadata.sort_by_key_b(|component_metadata| component_metadata.id); + self.pending_archetype_lookup_entries .push(components_metadata.into_iter().collect()); } |