diff options
Diffstat (limited to 'engine-ecs')
| -rw-r--r-- | engine-ecs/src/phase.rs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/engine-ecs/src/phase.rs b/engine-ecs/src/phase.rs index cd8ab56..78428c4 100644 --- a/engine-ecs/src/phase.rs +++ b/engine-ecs/src/phase.rs @@ -1,6 +1,3 @@ -#[cfg(debug_assertions)] -use crate::entity::Name as EntityName; -use crate::{Query, pair::{ChildOf, Pair, Wildcard}, query::term::With}; use crate::{declare_entity, Component, World}; #[derive(Debug, Default, Clone, Copy, Component)] @@ -36,14 +33,19 @@ pub(crate) fn spawn_standard_phases(world: &mut World) #[derive(Debug, Component)] pub(crate) struct HasSystem; - #[cfg(debug_assertions)] -pub(crate) fn check_parents(phase_query: Query<(Pair<ChildOf, Wildcard>, Option<&EntityName>, With<Phase>,)>) +pub(crate) fn check_parents( + phase_query: crate::query::Query<( + crate::pair::Pair<crate::pair::ChildOf, crate::pair::Wildcard>, + Option<&crate::entity::Name>, + crate::query::term::With<Phase>, + )>, +) { for (child_of, ent_name) in &phase_query { let Some(parent_ent) = child_of.get_target_ent() else { tracing::warn!( - phase_entity=ent_name + phase_entity = ent_name .as_ref() .map(|ent_name| ent_name.name.as_ref()) .unwrap_or("<unnamed>"), @@ -53,14 +55,14 @@ pub(crate) fn check_parents(phase_query: Query<(Pair<ChildOf, Wildcard>, Option< }; if !parent_ent.has_component(Phase::id()) { - let parent_ent_name = parent_ent.get::<EntityName>(); + let parent_ent_name = parent_ent.get::<crate::entity::Name>(); tracing::warn!( - phase_entity=ent_name + phase_entity = ent_name .as_ref() .map(|ent_name| ent_name.name.as_ref()) .unwrap_or("<unnamed>"), - parent_entity=parent_ent_name + parent_entity = parent_ent_name .as_ref() .map(|parent_ent_name| parent_ent_name.name.as_ref()) .unwrap_or("<unnamed>"), |