1 files changed, 13 insertions, 21 deletions
diff --git a/ecs/examples/event_loop.rs b/ecs/examples/event_loop.rs
index 8d8d84f..61d7ba4 100644
--- a/ecs/examples/event_loop.rs
+++ b/ecs/examples/event_loop.rs
@@ -1,6 +1,7 @@
 use ecs::actions::Actions;
-use ecs::event::Event;
-use ecs::{Component, Query, World};
+use ecs::pair::{ChildOf, Pair};
+use ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
+use ecs::{static_entity, Component, Query, World};
 
 #[derive(Component)]
 struct Wool
@@ -20,7 +21,7 @@ struct Name
     name: &'static str,
 }
 
-fn sheer(query: Query<(Wool, Name)>)
+fn sheer(query: Query<(&mut Wool, &Name)>)
 {
     for (mut wool, name) in &query {
         if wool.remaining == 0 {
@@ -36,7 +37,7 @@ fn sheer(query: Query<(Wool, Name)>)
     }
 }
 
-fn feed(query: Query<(Health, Name)>)
+fn feed(query: Query<(&mut Health, &Name)>)
 {
     for (mut health, name) in &query {
         health.health += 1;
@@ -45,7 +46,7 @@ fn feed(query: Query<(Health, Name)>)
     }
 }
 
-fn age(query: Query<(Health, Name)>, mut actions: Actions)
+fn age(query: Query<(&mut Health, &Name)>, mut actions: Actions)
 {
     for (mut health, name) in &query {
         if health.health <= 2 {
@@ -64,28 +65,19 @@ fn age(query: Query<(Health, Name)>, mut actions: Actions)
     }
 }
 
-#[derive(Debug)]
-struct EventA;
+static_entity!(SHEER_PHASE, (Phase, Pair::new::<ChildOf>(*UPDATE_PHASE)));
 
-impl Event for EventA {}
+static_entity!(FEED_PHASE, (Phase, Pair::new::<ChildOf>(*SHEER_PHASE)));
 
-#[derive(Debug)]
-struct EventB;
-
-impl Event for EventB {}
-
-#[derive(Debug)]
-struct EventC;
-
-impl Event for EventC {}
+static_entity!(AGE_PHASE, (Phase, Pair::new::<ChildOf>(*FEED_PHASE)));
 
 fn main()
 {
     let mut world = World::new();
 
-    world.register_system(EventA, sheer);
-    world.register_system(EventB, feed);
-    world.register_system(EventC, age);
+    world.register_system(*SHEER_PHASE, sheer);
+    world.register_system(*FEED_PHASE, feed);
+    world.register_system(*AGE_PHASE, age);
 
     world.create_entity((
         Wool { remaining: 30 },
@@ -93,5 +85,5 @@ fn main()
         Name { name: "Bessy" },
     ));
 
-    world.event_loop::<(EventA, EventB, EventC)>();
+    world.start_loop();
 }