From 3f6968cd8a49b3bcc22af6ee72fe81c00d317d1f Mon Sep 17 00:00:00 2001
From: Catherine Gilbert <catherine.gilbert15@gmail.com>
Date: Tue, 13 Oct 2020 21:40:58 -0400
Subject: [PATCH 1/5] added frame count to FrameTimeDiagnosticsPlugin

---
 .../src/frame_time_diagnostics_plugin.rs      | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
index 2f48fe200b035..d5720b9aab694 100644
--- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
@@ -3,32 +3,48 @@ use bevy_app::prelude::*;
 use bevy_core::Time;
 use bevy_ecs::{IntoQuerySystem, Res, ResMut};
 
-/// Adds "frame time" diagnostic to an App, specifically "frame time" and "fps"
+/// Adds "frame time" diagnostic to an App, specifically "frame time", "fps" and "frame count"
 #[derive(Default)]
 pub struct FrameTimeDiagnosticsPlugin;
 
+pub struct FrameTimeDiagnosticsState {
+    frame_count: f64
+}
+
 impl Plugin for FrameTimeDiagnosticsPlugin {
     fn build(&self, app: &mut bevy_app::AppBuilder) {
         app.add_startup_system(Self::setup_system.system())
+            .add_resource(FrameTimeDiagnosticsState { frame_count: 0.0 })
             .add_system(Self::diagnostic_system.system());
     }
 }
 
 impl FrameTimeDiagnosticsPlugin {
-    pub const FPS: DiagnosticId = DiagnosticId::from_u128(288146834822086093791974408528866909483);
+    pub const FPS: DiagnosticId =
+        DiagnosticId::from_u128(288146834822086093791974408528866909483);
     pub const FRAME_TIME: DiagnosticId =
         DiagnosticId::from_u128(54021991829115352065418785002088010276);
+    pub const FRAME_COUNT: DiagnosticId =
+        DiagnosticId::from_u128(54021991829115352065418785002088010277);
 
     pub fn setup_system(mut diagnostics: ResMut<Diagnostics>) {
         diagnostics.add(Diagnostic::new(Self::FRAME_TIME, "frame_time", 20));
         diagnostics.add(Diagnostic::new(Self::FPS, "fps", 20));
+        diagnostics.add(Diagnostic::new(Self::FRAME_COUNT, "frame_count", 1));
     }
 
-    pub fn diagnostic_system(mut diagnostics: ResMut<Diagnostics>, time: Res<Time>) {
+    pub fn diagnostic_system(
+        mut diagnostics: ResMut<Diagnostics>,
+        time: Res<Time>,
+        mut state: ResMut<FrameTimeDiagnosticsState>,
+    ) {
         if time.delta_seconds_f64 == 0.0 {
             return;
         }
 
+        state.frame_count += 1.0;
+        diagnostics.add_measurement(Self::FRAME_COUNT, state.frame_count);
+
         diagnostics.add_measurement(Self::FRAME_TIME, time.delta_seconds_f64);
         if let Some(fps) = diagnostics
             .get(Self::FRAME_TIME)

From 9336292ecf18ece27d33329d30e9d9048328d3c9 Mon Sep 17 00:00:00 2001
From: Catherine Gilbert <catherine.gilbert15@gmail.com>
Date: Tue, 13 Oct 2020 21:55:09 -0400
Subject: [PATCH 2/5] fixed format from last commit

---
 crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
index d5720b9aab694..88c917ad846ad 100644
--- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
@@ -8,7 +8,7 @@ use bevy_ecs::{IntoQuerySystem, Res, ResMut};
 pub struct FrameTimeDiagnosticsPlugin;
 
 pub struct FrameTimeDiagnosticsState {
-    frame_count: f64
+    frame_count: f64,
 }
 
 impl Plugin for FrameTimeDiagnosticsPlugin {
@@ -20,8 +20,7 @@ impl Plugin for FrameTimeDiagnosticsPlugin {
 }
 
 impl FrameTimeDiagnosticsPlugin {
-    pub const FPS: DiagnosticId =
-        DiagnosticId::from_u128(288146834822086093791974408528866909483);
+    pub const FPS: DiagnosticId = DiagnosticId::from_u128(288146834822086093791974408528866909483);
     pub const FRAME_TIME: DiagnosticId =
         DiagnosticId::from_u128(54021991829115352065418785002088010276);
     pub const FRAME_COUNT: DiagnosticId =

From 8eb36cd64bc518d3d7f3e614b66a678164a8e25b Mon Sep 17 00:00:00 2001
From: Catherine Gilbert <catherine.gilbert15@gmail.com>
Date: Tue, 13 Oct 2020 22:07:01 -0400
Subject: [PATCH 3/5] fixed newline character

---
 crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
index 88c917ad846ad..955852b0d6eb3 100644
--- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
@@ -21,10 +21,10 @@ impl Plugin for FrameTimeDiagnosticsPlugin {
 
 impl FrameTimeDiagnosticsPlugin {
     pub const FPS: DiagnosticId = DiagnosticId::from_u128(288146834822086093791974408528866909483);
-    pub const FRAME_TIME: DiagnosticId =
-        DiagnosticId::from_u128(54021991829115352065418785002088010276);
     pub const FRAME_COUNT: DiagnosticId =
         DiagnosticId::from_u128(54021991829115352065418785002088010277);
+    pub const FRAME_TIME: DiagnosticId =
+        DiagnosticId::from_u128(54021991829115352065418785002088010276);
 
     pub fn setup_system(mut diagnostics: ResMut<Diagnostics>) {
         diagnostics.add(Diagnostic::new(Self::FRAME_TIME, "frame_time", 20));

From 92e87a334b366e579a90925565ea3dff89018056 Mon Sep 17 00:00:00 2001
From: Catherine Gilbert <catherine.gilbert15@gmail.com>
Date: Wed, 14 Oct 2020 16:59:32 -0400
Subject: [PATCH 4/5] use more random UUID

---
 crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
index 955852b0d6eb3..5e682b1a632f6 100644
--- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
@@ -24,7 +24,7 @@ impl FrameTimeDiagnosticsPlugin {
     pub const FRAME_COUNT: DiagnosticId =
         DiagnosticId::from_u128(54021991829115352065418785002088010277);
     pub const FRAME_TIME: DiagnosticId =
-        DiagnosticId::from_u128(54021991829115352065418785002088010276);
+        DiagnosticId::from_u128(73441630925388532774622109383099159699);
 
     pub fn setup_system(mut diagnostics: ResMut<Diagnostics>) {
         diagnostics.add(Diagnostic::new(Self::FRAME_TIME, "frame_time", 20));

From 267caa0b925e975881d3289021deaec145d9bbfc Mon Sep 17 00:00:00 2001
From: Catherine Gilbert <catherine.gilbert15@gmail.com>
Date: Wed, 14 Oct 2020 17:09:41 -0400
Subject: [PATCH 5/5] fixed frame count measurement location

---
 crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
index 5e682b1a632f6..4d979bbee1d42 100644
--- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
@@ -37,13 +37,13 @@ impl FrameTimeDiagnosticsPlugin {
         time: Res<Time>,
         mut state: ResMut<FrameTimeDiagnosticsState>,
     ) {
+        state.frame_count += 1.0;
+        diagnostics.add_measurement(Self::FRAME_COUNT, state.frame_count);
+
         if time.delta_seconds_f64 == 0.0 {
             return;
         }
 
-        state.frame_count += 1.0;
-        diagnostics.add_measurement(Self::FRAME_COUNT, state.frame_count);
-
         diagnostics.add_measurement(Self::FRAME_TIME, time.delta_seconds_f64);
         if let Some(fps) = diagnostics
             .get(Self::FRAME_TIME)