From b8e2276c2cca164c8d94dd67c0108adecc9440ec Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Sun, 22 Nov 2020 08:54:01 -0600
Subject: [PATCH 1/8] Add the ability to pause timers

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

diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index 33ec613336e66..6165240db6d9d 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -7,6 +7,8 @@ use bevy_utils::Duration;
 ///
 /// Non repeating timers will stop tracking and stay in the finished state until reset.
 /// Repeating timers will only be in the finished state on each tick `duration` is reached or exceeded, and can still be reset at any given point.
+///
+/// Paused timers will not have elapsed time increased.
 #[derive(Clone, Debug, Default, Properties)]
 pub struct Timer {
     pub elapsed: f32,

From e1d758d9f3e15e613862a2dae6b2b73f43c2e131 Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Sun, 22 Nov 2020 08:53:43 -0600
Subject: [PATCH 2/8] Add the ability to pause timers

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

diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index 6165240db6d9d..642c4ae7472a5 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -16,6 +16,7 @@ pub struct Timer {
     pub finished: bool,
     /// Will only be true on the tick `duration` is reached or exceeded.
     pub just_finished: bool,
+    pub paused: bool,
     pub repeating: bool,
 }
 
@@ -36,8 +37,16 @@ impl Timer {
         }
     }
 
+    pub fn pause(&mut self) {
+        self.paused = true
+    }
+
     /// Advances the timer by `delta` seconds.
     pub fn tick(&mut self, delta: f32) -> &Self {
+        if self.paused {
+            return self;
+        }
+
         let prev_finished = self.elapsed >= self.duration;
         if !prev_finished {
             self.elapsed += delta;

From 7407d95c3a0e0767f299e868316ede8da945ae1b Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Mon, 23 Nov 2020 00:05:55 -0600
Subject: [PATCH 3/8] Make `Timer`'s members private

---
 crates/bevy_core/src/time/timer.rs            | 40 ++++++++++++++++---
 .../src/print_diagnostics_plugin.rs           |  4 +-
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index 642c4ae7472a5..bb1ba96696844 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -11,13 +11,13 @@ use bevy_utils::Duration;
 /// Paused timers will not have elapsed time increased.
 #[derive(Clone, Debug, Default, Properties)]
 pub struct Timer {
-    pub elapsed: f32,
-    pub duration: f32,
-    pub finished: bool,
+    elapsed: f32,
+    duration: f32,
+    finished: bool,
     /// Will only be true on the tick `duration` is reached or exceeded.
-    pub just_finished: bool,
-    pub paused: bool,
-    pub repeating: bool,
+    just_finished: bool,
+    paused: bool,
+    repeating: bool,
 }
 
 impl Timer {
@@ -41,6 +41,34 @@ impl Timer {
         self.paused = true
     }
 
+    pub fn resume(&mut self) {
+        self.paused = false
+    }
+
+    pub fn is_paused(&self) -> bool {
+        self.paused
+    }
+
+    pub fn elapsed(&self) -> f32 {
+        self.elapsed
+    }
+
+    pub fn duration(&self) -> f32 {
+        self.duration
+    }
+
+    pub fn is_finished(&self) -> bool {
+        self.finished
+    }
+
+    pub fn just_finished(&self) -> bool {
+        self.just_finished
+    }
+
+    pub fn is_repeating(&self) -> bool {
+        self.repeating
+    }
+
     /// Advances the timer by `delta` seconds.
     pub fn tick(&mut self, delta: f32) -> &Self {
         if self.paused {
diff --git a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
index 73e814fb332c5..0354bf581a0a8 100644
--- a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
@@ -66,7 +66,7 @@ impl PrintDiagnosticsPlugin {
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,
     ) {
-        if state.timer.tick(time.delta_seconds).finished {
+        if state.timer.tick(time.delta_seconds).is_finished() {
             println!("Diagnostics:");
             println!("{}", "-".repeat(93));
             if let Some(ref filter) = state.filter {
@@ -86,7 +86,7 @@ impl PrintDiagnosticsPlugin {
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,
     ) {
-        if state.timer.tick(time.delta_seconds).finished {
+        if state.timer.tick(time.delta_seconds).is_finished() {
             println!("Diagnostics (Debug):");
             println!("{}", "-".repeat(93));
             if let Some(ref filter) = state.filter {

From 524076b15d99d24035fc802d525517d2f363b9ca Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Mon, 23 Nov 2020 00:26:28 -0600
Subject: [PATCH 4/8] Fix examples with new Timer API change

---
 examples/2d/contributors.rs     | 2 +-
 examples/2d/sprite_sheet.rs     | 2 +-
 examples/app/plugin.rs          | 2 +-
 examples/ecs/event.rs           | 2 +-
 examples/ui/font_atlas_debug.rs | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 5941c82dad43b..49889567099f7 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -137,7 +137,7 @@ fn select_system(
 ) {
     let mut timer_fired = false;
     for mut t in tq.iter_mut() {
-        if !t.just_finished {
+        if !t.just_finished() {
             continue;
         }
         t.reset();
diff --git a/examples/2d/sprite_sheet.rs b/examples/2d/sprite_sheet.rs
index 04fa883409820..b2c241ea75841 100644
--- a/examples/2d/sprite_sheet.rs
+++ b/examples/2d/sprite_sheet.rs
@@ -13,7 +13,7 @@ fn animate_sprite_system(
     mut query: Query<(&mut Timer, &mut TextureAtlasSprite, &Handle<TextureAtlas>)>,
 ) {
     for (timer, mut sprite, texture_atlas_handle) in query.iter_mut() {
-        if timer.finished {
+        if timer.is_finished() {
             let texture_atlas = texture_atlases.get(texture_atlas_handle).unwrap();
             sprite.index = ((sprite.index as usize + 1) % texture_atlas.textures.len()) as u32;
         }
diff --git a/examples/app/plugin.rs b/examples/app/plugin.rs
index 2bc54550ca6bc..98c0d39469b16 100644
--- a/examples/app/plugin.rs
+++ b/examples/app/plugin.rs
@@ -38,7 +38,7 @@ struct PrintMessageState {
 }
 
 fn print_message_system(mut state: ResMut<PrintMessageState>, time: Res<Time>) {
-    if state.timer.tick(time.delta_seconds).finished {
+    if state.timer.tick(time.delta_seconds).is_finished() {
         println!("{}", state.message);
     }
 }
diff --git a/examples/ecs/event.rs b/examples/ecs/event.rs
index eb02927c064d6..44e63f2e2b878 100644
--- a/examples/ecs/event.rs
+++ b/examples/ecs/event.rs
@@ -34,7 +34,7 @@ fn event_trigger_system(
     mut state: ResMut<EventTriggerState>,
     mut my_events: ResMut<Events<MyEvent>>,
 ) {
-    if state.event_timer.tick(time.delta_seconds).finished {
+    if state.event_timer.tick(time.delta_seconds).is_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 c4b991b752662..faec75efdab76 100644
--- a/examples/ui/font_atlas_debug.rs
+++ b/examples/ui/font_atlas_debug.rs
@@ -62,7 +62,7 @@ fn atlas_render_system(
 }
 
 fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Query<&mut Text>) {
-    if state.timer.tick(time.delta_seconds).finished {
+    if state.timer.tick(time.delta_seconds).is_finished() {
         for mut text in query.iter_mut() {
             let c = rand::random::<u8>() as char;
             if !text.value.contains(c) {

From 4efc83b23ac10353cfd39b1ee57afa23727e7842 Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Mon, 23 Nov 2020 07:53:22 -0600
Subject: [PATCH 5/8] Add setters for Timers

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

diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index bb1ba96696844..b94fd1e39520c 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -53,10 +53,18 @@ impl Timer {
         self.elapsed
     }
 
+    pub fn set_elapsed(&mut self, elapsed: f32) {
+        self.elapsed = elapsed
+    }
+
     pub fn duration(&self) -> f32 {
         self.duration
     }
 
+    pub fn set_duration(&mut self, duration: f32) {
+        self.duration = duration
+    }
+
     pub fn is_finished(&self) -> bool {
         self.finished
     }
@@ -69,6 +77,10 @@ impl Timer {
         self.repeating
     }
 
+    pub fn set_repeating(&mut self, repeating: bool) {
+        self.repeating = repeating
+    }
+
     /// Advances the timer by `delta` seconds.
     pub fn tick(&mut self, delta: f32) -> &Self {
         if self.paused {

From 4919cd87b33ada05d1b17d2882824e53b8501ccf Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Mon, 23 Nov 2020 08:24:04 -0600
Subject: [PATCH 6/8] Document the difference between `is_finished` and
 `just_finished`

---
 crates/bevy_core/src/time/timer.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index b94fd1e39520c..7581419f73d16 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -69,6 +69,7 @@ impl Timer {
         self.finished
     }
 
+    /// Will only be true on the tick the timer's duration is reached or exceeded.
     pub fn just_finished(&self) -> bool {
         self.just_finished
     }

From 9d58274f9883bf89fc6e14cd82618fbb3d821df6 Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Thu, 26 Nov 2020 01:04:14 -0600
Subject: [PATCH 7/8] Make getters / setters inlined

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

diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index 7581419f73d16..1d02027383e38 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -37,47 +37,58 @@ impl Timer {
         }
     }
 
+    #[inline]
     pub fn pause(&mut self) {
         self.paused = true
     }
 
+    #[inline]
     pub fn resume(&mut self) {
         self.paused = false
     }
 
+    #[inline]
     pub fn is_paused(&self) -> bool {
         self.paused
     }
 
+    #[inline]
     pub fn elapsed(&self) -> f32 {
         self.elapsed
     }
 
+    #[inline]
     pub fn set_elapsed(&mut self, elapsed: f32) {
         self.elapsed = elapsed
     }
 
+    #[inline]
     pub fn duration(&self) -> f32 {
         self.duration
     }
 
+    #[inline]
     pub fn set_duration(&mut self, duration: f32) {
         self.duration = duration
     }
 
+    #[inline]
     pub fn is_finished(&self) -> bool {
         self.finished
     }
 
     /// Will only be true on the tick the timer's duration is reached or exceeded.
+    #[inline]
     pub fn just_finished(&self) -> bool {
         self.just_finished
     }
 
+    #[inline]
     pub fn is_repeating(&self) -> bool {
         self.repeating
     }
 
+    #[inline]
     pub fn set_repeating(&mut self, repeating: bool) {
         self.repeating = repeating
     }
@@ -102,6 +113,7 @@ impl Timer {
         self
     }
 
+    #[inline]
     pub fn reset(&mut self) {
         self.finished = false;
         self.just_finished = false;

From bd5a0758c1877f8d68c86703024312522b29d68f Mon Sep 17 00:00:00 2001
From: Amber Kowalski <amberkowalski03@gmail.com>
Date: Thu, 26 Nov 2020 01:36:42 -0600
Subject: [PATCH 8/8] Remove timer system

---
 crates/bevy_core/src/lib.rs        |  1 -
 crates/bevy_core/src/time/timer.rs | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs
index 3a5cb4f3c2429..03edeef476a94 100644
--- a/crates/bevy_core/src/lib.rs
+++ b/crates/bevy_core/src/lib.rs
@@ -40,7 +40,6 @@ impl Plugin for CorePlugin {
             .register_property::<Quat>()
             .register_property::<Option<String>>()
             .add_system_to_stage(stage::FIRST, time_system)
-            .add_system_to_stage(stage::FIRST, timer_system)
             .add_system_to_stage(stage::PRE_UPDATE, entity_labels_system);
     }
 }
diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
index c4a0cb7c31330..efa2c3e41aec9 100644
--- a/crates/bevy_core/src/time/timer.rs
+++ b/crates/bevy_core/src/time/timer.rs
@@ -1,5 +1,3 @@
-use crate::time::Time;
-use bevy_ecs::prelude::*;
 use bevy_property::Properties;
 use bevy_utils::Duration;
 
@@ -52,7 +50,7 @@ impl Timer {
         self.paused
     }
 
-     /// Returns the time elapsed on the timer. Guaranteed to be between 0.0 and `duration`, inclusive.
+    /// Returns the time elapsed on the timer. Guaranteed to be between 0.0 and `duration`, inclusive.
     #[inline]
     pub fn elapsed(&self) -> f32 {
         self.elapsed
@@ -135,12 +133,6 @@ impl Timer {
     }
 }
 
-pub(crate) fn timer_system(time: Res<Time>, mut query: Query<&mut Timer>) {
-    for mut timer in query.iter_mut() {
-        timer.tick(time.delta_seconds);
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::Timer;