From 763b01fd3f35842d1bc065ad27e5a6a6d4265cef Mon Sep 17 00:00:00 2001 From: HampusM Date: Tue, 21 Jul 2026 15:16:47 +0200 Subject: refactor(engine-ecs): remove old declare_entity macro rule --- engine-ecs/examples/event_loop.rs | 41 +++++++-------------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) (limited to 'engine-ecs/examples/event_loop.rs') diff --git a/engine-ecs/examples/event_loop.rs b/engine-ecs/examples/event_loop.rs index 5202788..7e215bd 100644 --- a/engine-ecs/examples/event_loop.rs +++ b/engine-ecs/examples/event_loop.rs @@ -1,7 +1,7 @@ use engine_ecs::actions::Actions; -use engine_ecs::pair::{ChildOf, Pair}; +use engine_ecs::pair::ChildOf; use engine_ecs::phase::{Phase, UPDATE as UPDATE_PHASE}; -use engine_ecs::{declare_entity, Component, Query, World}; +use engine_ecs::{declare_entity, pair, Component, Query, World}; #[derive(Component)] struct Wool @@ -65,38 +65,11 @@ fn age(query: Query<(&mut Health, &Name)>, mut actions: Actions) } } -declare_entity!( - SHEER_PHASE, - ( - Phase, - Pair::builder() - .relation::() - .target_id(*UPDATE_PHASE) - .build() - ) -); - -declare_entity!( - FEED_PHASE, - ( - Phase, - Pair::builder() - .relation::() - .target_id(*SHEER_PHASE) - .build() - ) -); - -declare_entity!( - AGE_PHASE, - ( - Phase, - Pair::builder() - .relation::() - .target_id(*FEED_PHASE) - .build() - ) -); +declare_entity! { + SHEER_PHASE: (Phase, pair!(ChildOf, { *UPDATE_PHASE })); + FEED_PHASE: (Phase, pair!(ChildOf, { *SHEER_PHASE })); + AGE_PHASE: (Phase, pair!(ChildOf, { *FEED_PHASE })); +} fn main() { -- cgit v1.2.3-18-g5258