diff options
Diffstat (limited to 'engine-ecs/src/lib.rs')
| -rw-r--r-- | engine-ecs/src/lib.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine-ecs/src/lib.rs b/engine-ecs/src/lib.rs index 70816b3..8b3b8c3 100644 --- a/engine-ecs/src/lib.rs +++ b/engine-ecs/src/lib.rs @@ -51,7 +51,7 @@ use crate::sole::{Single, Sole}; use crate::stats::Stats; use crate::system::observer::Observer; use crate::system::{Callbacks, Metadata as SystemMetadata, System, SystemComponent}; -use crate::uid::{Kind as UidKind, Uid}; +use crate::uid::Uid; pub mod actions; pub mod component; @@ -114,7 +114,7 @@ impl World where Comps: ComponentSequence, { - let entity_uid = Uid::new_unique(UidKind::Entity); + let entity_uid = Uid::new_unique(); self.create_entity_with_uid(entity_uid, components); @@ -165,7 +165,7 @@ impl World { let (system, mut system_callbacks) = observer.finish_observer(); - let ent_id = Uid::new_unique(UidKind::Entity); + let ent_id = Uid::new_unique(); self.create_ent( ent_id, @@ -353,7 +353,7 @@ impl World components: impl IntoIterator<Item = ComponentParts>, ) { - debug_assert_eq!(entity_uid.kind(), UidKind::Entity); + debug_assert!(!entity_uid.is_pair()); if let Err(EntityAlreadyExistsError) = self.data.component_storage.create_entity(entity_uid) @@ -552,7 +552,7 @@ impl World continue; } - if comp_id.kind() == UidKind::Pair { + if comp_id.is_pair() { continue; } @@ -585,7 +585,7 @@ impl World fn emit_event_observers(&self, event_id: Uid, emitted_event: &EmittedEvent<'_>) { - assert_eq!(event_id.kind(), UidKind::Pair); + assert!(event_id.is_pair()); let query = Query::<(&SystemComponent,)>::from_flexible_query( self.flexible_query( |