From 72bd6e24acf0413ca77089b4bb2ea0263a15c49d Mon Sep 17 00:00:00 2001
From: Marcus Buffett <marcusbuffett@me.com>
Date: Sun, 8 Nov 2020 18:46:37 -0500
Subject: [PATCH 1/3] Make Timer#tick return &Self

---
 crates/bevy_core/src/time/timer.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index 4a9df0da96662..8671ab53b81d2 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -35,7 +35,7 @@ impl Timer {
     }
 
     /// Advances the timer by `delta` seconds.
-    pub fn tick(&mut self, delta: f32) {
+    pub fn tick(&mut self, delta: f32) -> &Self {
         let prev_finished = self.elapsed >= self.duration;
         if !prev_finished {
             self.elapsed += delta;
@@ -47,6 +47,7 @@ impl Timer {
         if self.repeating && self.finished {
             self.elapsed %= self.duration;
         }
+        self
     }
 
     pub fn reset(&mut self) {

From 73fdaf9a8db4aba21ea58953683dd6bb6c4b7031 Mon Sep 17 00:00:00 2001
From: Marcus Buffett <marcusbuffett@me.com>
Date: Mon, 9 Nov 2020 17:15:41 -0500
Subject: [PATCH 2/3] Update relevant crates/examples with Timer.tick

---
 crates/bevy_diagnostic/src/print_diagnostics_plugin.rs | 6 ++----
 examples/app/plugin.rs                                 | 3 +--
 examples/ecs/event.rs                                  | 3 +--
 examples/ui/font_atlas_debug.rs                        | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
index 62bd855a95caa..cefc750bf68f3 100644
--- a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
@@ -69,8 +69,7 @@ impl PrintDiagnosticsPlugin {
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,
     ) {
-        state.timer.tick(time.delta_seconds);
-        if state.timer.finished {
+        if state.timer.tick(time.delta_seconds).finished {
             println!("Diagnostics:");
             println!("{}", "-".repeat(93));
             if let Some(ref filter) = state.filter {
@@ -90,8 +89,7 @@ impl PrintDiagnosticsPlugin {
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,
     ) {
-        state.timer.tick(time.delta_seconds);
-        if state.timer.finished {
+        if state.timer.tick(time.delta_seconds).finished {
             println!("Diagnostics (Debug):");
             println!("{}", "-".repeat(93));
             if let Some(ref filter) = state.filter {
diff --git a/examples/app/plugin.rs b/examples/app/plugin.rs
index 602a3bfd92c2b..ff7b3a2800954 100644
--- a/examples/app/plugin.rs
+++ b/examples/app/plugin.rs
@@ -40,8 +40,7 @@ struct PrintMessageState {
 }
 
 fn print_message_system(mut state: ResMut<PrintMessageState>, time: Res<Time>) {
-    state.timer.tick(time.delta_seconds);
-    if state.timer.finished {
+    if state.timer.tick(time.delta_seconds).finished {
         println!("{}", state.message);
     }
 }
diff --git a/examples/ecs/event.rs b/examples/ecs/event.rs
index a7c10025f3779..89c227c6416d9 100644
--- a/examples/ecs/event.rs
+++ b/examples/ecs/event.rs
@@ -34,8 +34,7 @@ fn event_trigger_system(
     mut state: ResMut<EventTriggerState>,
     mut my_events: ResMut<Events<MyEvent>>,
 ) {
-    state.event_timer.tick(time.delta_seconds);
-    if state.event_timer.finished {
+    if state.event_timer.tick(time.delta_seconds).finished {
         my_events.send(MyEvent {
             message: "MyEvent just happened!".to_string(),
         });
diff --git a/examples/ui/font_atlas_debug.rs b/examples/ui/font_atlas_debug.rs
index a1fc540b277cb..ddc00ac315b77 100644
--- a/examples/ui/font_atlas_debug.rs
+++ b/examples/ui/font_atlas_debug.rs
@@ -63,9 +63,8 @@ fn atlas_render_system(
 
 fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Query<&mut Text>) {
     for mut text in query.iter_mut() {
-        state.timer.tick(time.delta_seconds);
         let c = rand::random::<u8>() as char;
-        if !text.value.contains(c) && state.timer.finished {
+        if !text.value.contains(c) && state.timer.tick(time.delta_seconds).finished {
             text.value = format!("{}{}", text.value, c);
             state.timer.reset();
         }

From 154981174344a1c65bde763545c12a075d90f2e2 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Thu, 12 Nov 2020 17:29:50 -0800
Subject: [PATCH 3/3] fix font_atlas_debug example

---
 examples/ui/font_atlas_debug.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/examples/ui/font_atlas_debug.rs b/examples/ui/font_atlas_debug.rs
index ddc00ac315b77..1a5d455b2cce1 100644
--- a/examples/ui/font_atlas_debug.rs
+++ b/examples/ui/font_atlas_debug.rs
@@ -62,12 +62,15 @@ fn atlas_render_system(
 }
 
 fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Query<&mut Text>) {
-    for mut text in query.iter_mut() {
-        let c = rand::random::<u8>() as char;
-        if !text.value.contains(c) && state.timer.tick(time.delta_seconds).finished {
-            text.value = format!("{}{}", text.value, c);
-            state.timer.reset();
+    if state.timer.tick(time.delta_seconds).finished {
+        for mut text in query.iter_mut() {
+            let c = rand::random::<u8>() as char;
+            if !text.value.contains(c) {
+                text.value = format!("{}{}", text.value, c);
+            }
         }
+
+        state.timer.reset();
     }
 }