From c61399148d1f893435726424b7c9d78283f69ceb Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 25 Jan 2022 13:47:35 -0800
Subject: [PATCH 01/11] Slight perf improvements and tidy for contributors
 example

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 63 +++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index cefce614588a7..48282e6698827 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -1,11 +1,13 @@
-use bevy::{prelude::*, utils::HashSet};
-use rand::{prelude::SliceRandom, Rng};
 use std::{
     env::VarError,
     io::{self, BufRead, BufReader},
     process::Stdio,
 };
 
+use rand::{prelude::SliceRandom, Rng};
+
+use bevy::{prelude::*, utils::HashSet};
+
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
@@ -69,7 +71,7 @@ fn setup_contributor_selection(mut commands: Commands, asset_server: Res<AssetSe
     let texture_handle = asset_server.load("branding/icon.png");
 
     let mut contributor_selection = ContributorSelection {
-        order: vec![],
+        order: Vec::with_capacity(contribs.len()),
         idx: 0,
     };
 
@@ -163,40 +165,34 @@ fn select_system(
     mut query: Query<(&Contributor, &mut Sprite, &mut Transform)>,
     time: Res<Time>,
 ) {
-    let mut timer_fired = false;
-    for mut timer in timer_query.iter_mut() {
-        if !timer.tick(time.delta()).just_finished() {
-            continue;
-        }
-        timer.reset();
-        timer_fired = true;
-    }
-
-    if !timer_fired {
+    let mut timer = timer_query.single_mut();
+    if !timer.tick(time.delta()).just_finished() {
         return;
     }
-
-    let prev = contributor_selection.idx;
-
-    if (contributor_selection.idx + 1) < contributor_selection.order.len() {
-        contributor_selection.idx += 1;
-    } else {
-        contributor_selection.idx = 0;
+    if timer.times_finished() == 1 {
+        let mut text = text_query.single_mut();
+        text.sections[0].value.clear();
+        text.sections[0].value.push_str("Contributor: ");
     }
 
     {
-        let (_, entity) = &contributor_selection.order[prev];
+        let (_, entity) = &contributor_selection.order[contributor_selection.idx];
         if let Ok((contributor, mut sprite, mut transform)) = query.get_mut(*entity) {
             deselect(&mut sprite, contributor, &mut *transform);
         }
     }
 
+    if (contributor_selection.idx + 1) < contributor_selection.order.len() {
+        contributor_selection.idx += 1;
+    } else {
+        contributor_selection.idx = 0;
+    }
+
     let (name, entity) = &contributor_selection.order[contributor_selection.idx];
 
     if let Ok((contributor, mut sprite, mut transform)) = query.get_mut(*entity) {
-        if let Some(mut text) = text_query.iter_mut().next() {
-            select(&mut sprite, contributor, &mut *transform, &mut *text, name);
-        }
+        let mut text = text_query.single_mut();
+        select(&mut sprite, contributor, &mut *transform, &mut *text, name);
     }
 }
 
@@ -207,7 +203,7 @@ fn select(
     contributor: &Contributor,
     transform: &mut Transform,
     text: &mut Text,
-    name: &str,
+    name: &String,
 ) {
     sprite.color = Color::hsla(
         contributor.hue,
@@ -218,8 +214,7 @@ fn select(
 
     transform.translation.z = 100.0;
 
-    text.sections[0].value = "Contributor: ".to_string();
-    text.sections[1].value = name.to_string();
+    text.sections[1].value.clone_from(name);
     text.sections[1].style.color = sprite.color;
 }
 
@@ -240,9 +235,9 @@ fn deselect(sprite: &mut Sprite, contributor: &Contributor, transform: &mut Tran
 fn velocity_system(time: Res<Time>, mut velocity_query: Query<&mut Velocity>) {
     let delta = time.delta_seconds();
 
-    for mut velocity in velocity_query.iter_mut() {
+    velocity_query.for_each_mut(|mut velocity| {
         velocity.translation += Vec3::new(0.0, GRAVITY * delta, 0.0);
-    }
+    });
 }
 
 /// Checks for collisions of contributor-birds.
@@ -264,7 +259,7 @@ fn collision_system(
     let wall_left = -(window.width() / 2.);
     let wall_right = window.width() / 2.;
 
-    for (mut velocity, mut transform) in query.iter_mut() {
+    query.for_each_mut(|(mut velocity, mut transform)| {
         let left = transform.translation.x - SPRITE_SIZE / 2.0;
         let right = transform.translation.x + SPRITE_SIZE / 2.0;
         let top = transform.translation.y + SPRITE_SIZE / 2.0;
@@ -290,17 +285,17 @@ fn collision_system(
             velocity.translation.x *= -1.0;
             velocity.rotation *= -1.0;
         }
-    }
+    });
 }
 
 /// Apply velocity to positions and rotations.
-fn move_system(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
+fn move_system(time: Res<Time>, mut velocity_query: Query<(&Velocity, &mut Transform)>) {
     let delta = time.delta_seconds();
 
-    for (velocity, mut transform) in query.iter_mut() {
+    velocity_query.for_each_mut(|(velocity, mut transform)| {
         transform.translation += delta * velocity.translation;
         transform.rotate(Quat::from_rotation_z(velocity.rotation * delta));
-    }
+    });
 }
 
 enum LoadContributorsError {

From c12f0431419969bc39fa84639cedddbdee31cdae Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 25 Jan 2022 14:14:06 -0800
Subject: [PATCH 02/11] Go back to simple iter_mut

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 48282e6698827..da53262d83b88 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -235,9 +235,9 @@ fn deselect(sprite: &mut Sprite, contributor: &Contributor, transform: &mut Tran
 fn velocity_system(time: Res<Time>, mut velocity_query: Query<&mut Velocity>) {
     let delta = time.delta_seconds();
 
-    velocity_query.for_each_mut(|mut velocity| {
+    for mut velocity in velocity_query.iter_mut() {
         velocity.translation += Vec3::new(0.0, GRAVITY * delta, 0.0);
-    });
+    }
 }
 
 /// Checks for collisions of contributor-birds.
@@ -259,7 +259,7 @@ fn collision_system(
     let wall_left = -(window.width() / 2.);
     let wall_right = window.width() / 2.;
 
-    query.for_each_mut(|(mut velocity, mut transform)| {
+    for (mut velocity, mut transform) in query.iter_mut() {
         let left = transform.translation.x - SPRITE_SIZE / 2.0;
         let right = transform.translation.x + SPRITE_SIZE / 2.0;
         let top = transform.translation.y + SPRITE_SIZE / 2.0;
@@ -285,17 +285,16 @@ fn collision_system(
             velocity.translation.x *= -1.0;
             velocity.rotation *= -1.0;
         }
-    });
+    }
 }
 
 /// Apply velocity to positions and rotations.
 fn move_system(time: Res<Time>, mut velocity_query: Query<(&Velocity, &mut Transform)>) {
     let delta = time.delta_seconds();
-
-    velocity_query.for_each_mut(|(velocity, mut transform)| {
+    for (velocity, mut transform) in velocity_query.iter_mut() {
         transform.translation += delta * velocity.translation;
         transform.rotate(Quat::from_rotation_z(velocity.rotation * delta));
-    });
+    }
 }
 
 enum LoadContributorsError {

From 6b5246f5a1a2ca826dab8a457231f747285dacdc Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 25 Jan 2022 14:15:31 -0800
Subject: [PATCH 03/11] Revert unnecessary change

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index da53262d83b88..eb36c26906623 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -289,9 +289,10 @@ fn collision_system(
 }
 
 /// Apply velocity to positions and rotations.
-fn move_system(time: Res<Time>, mut velocity_query: Query<(&Velocity, &mut Transform)>) {
+fn move_system(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
     let delta = time.delta_seconds();
-    for (velocity, mut transform) in velocity_query.iter_mut() {
+
+    for (velocity, mut transform) in query.iter_mut() {
         transform.translation += delta * velocity.translation;
         transform.rotate(Quat::from_rotation_z(velocity.rotation * delta));
     }

From 6e01c0149247c8b72e3323bcc8fcab26fa4ba529 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 25 Jan 2022 14:19:28 -0800
Subject: [PATCH 04/11] Fix clippy warning (clone_from takes an &String)

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index eb36c26906623..c1214bc696631 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -203,7 +203,7 @@ fn select(
     contributor: &Contributor,
     transform: &mut Transform,
     text: &mut Text,
-    name: &String,
+    #[allow(clippy::ptr_arg)] name: &String,
 ) {
     sprite.color = Color::hsla(
         contributor.hue,

From bf008cb080a4f6de60bf679f1bc438a645409872 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 27 Jan 2022 12:33:00 -0800
Subject: [PATCH 05/11] Use local to only update first text section once

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index c1214bc696631..c54c4e5c956b2 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -164,15 +164,18 @@ fn select_system(
     mut timer_query: Query<&mut Timer, With<SelectTimer>>,
     mut query: Query<(&Contributor, &mut Sprite, &mut Transform)>,
     time: Res<Time>,
+    mut has_first_tick_occurred: Local<bool>,
 ) {
     let mut timer = timer_query.single_mut();
     if !timer.tick(time.delta()).just_finished() {
         return;
     }
-    if timer.times_finished() == 1 {
+    if !*has_first_tick_occurred {
         let mut text = text_query.single_mut();
         text.sections[0].value.clear();
         text.sections[0].value.push_str("Contributor: ");
+
+        *has_first_tick_occurred = true;
     }
 
     {

From 52d57fa0804bde772a9e83d83357f4f2160de4fd Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 27 Jan 2022 12:47:36 -0800
Subject: [PATCH 06/11] More idiomatic timer handling

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index c54c4e5c956b2..180a81123a0b0 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -28,8 +28,10 @@ struct ContributorSelection {
     idx: usize,
 }
 
-#[derive(Component)]
-struct SelectTimer;
+struct SelectTimerState {
+    timer: Timer,
+    has_triggered: bool,
+}
 
 #[derive(Component)]
 struct ContributorDisplay;
@@ -122,7 +124,10 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands.spawn_bundle(OrthographicCameraBundle::new_2d());
     commands.spawn_bundle(UiCameraBundle::default());
 
-    commands.spawn_bundle((SelectTimer, Timer::from_seconds(SHOWCASE_TIMER_SECS, true)));
+    commands.insert_resource(SelectTimerState {
+        timer: Timer::from_seconds(SHOWCASE_TIMER_SECS, true),
+        has_triggered: false,
+    });
 
     commands
         .spawn()
@@ -161,21 +166,19 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 fn select_system(
     mut contributor_selection: ResMut<ContributorSelection>,
     mut text_query: Query<&mut Text, With<ContributorDisplay>>,
-    mut timer_query: Query<&mut Timer, With<SelectTimer>>,
     mut query: Query<(&Contributor, &mut Sprite, &mut Transform)>,
+    mut timer_state: ResMut<SelectTimerState>,
     time: Res<Time>,
-    mut has_first_tick_occurred: Local<bool>,
 ) {
-    let mut timer = timer_query.single_mut();
-    if !timer.tick(time.delta()).just_finished() {
+    if !timer_state.timer.tick(time.delta()).just_finished() {
         return;
     }
-    if !*has_first_tick_occurred {
+    if !timer_state.has_triggered {
         let mut text = text_query.single_mut();
         text.sections[0].value.clear();
         text.sections[0].value.push_str("Contributor: ");
 
-        *has_first_tick_occurred = true;
+        timer_state.has_triggered = true;
     }
 
     {

From 23b6e027b3ec238dad43197ba97140242763f5f7 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 23 Feb 2022 20:27:02 -0800
Subject: [PATCH 07/11] Fix merge goof

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 45f25e1208214..bc9a774d40781 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -15,7 +15,7 @@ fn main() {
         .add_system(move_system)
         .add_system(collision_system)
         .add_system(select_system)
-        .insert_resource(SelectTimerState {
+        .insert_resource(SelectTimer {
             timer: Timer::from_seconds(SHOWCASE_TIMER_SECS, true),
             has_triggered: false,
         })

From 2d42cb65f5614c7a33779e704d858e4c2a59c416 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 23 Feb 2022 20:27:18 -0800
Subject: [PATCH 08/11] Remove clippy suppression now that it's been fixed

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index bc9a774d40781..3d525e8c7344e 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -206,7 +206,7 @@ fn select(
     contributor: &Contributor,
     transform: &mut Transform,
     text: &mut Text,
-    #[allow(clippy::ptr_arg)] name: &String,
+    name: &String,
 ) {
     sprite.color = Color::hsla(
         contributor.hue,

From bfc822c9cdaeaa16bde3937e76458677b0fa03bb Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 7 Mar 2022 14:48:52 -0800
Subject: [PATCH 09/11] Go back to simpler assignment

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 3d525e8c7344e..9c48654298530 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -172,8 +172,7 @@ fn select_system(
     }
     if !timer.has_triggered {
         let mut text = text_query.single_mut();
-        text.sections[0].value.clear();
-        text.sections[0].value.push_str("Contributor: ");
+        text.sections[0].value = "Contributor: ".to_string();
 
         timer.has_triggered = true;
     }

From 399fe3bebfd6435aa3027acb081732f980adf935 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 7 Apr 2022 17:48:18 -0700
Subject: [PATCH 10/11] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 5ccf56f994fec..f669d059557ae 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -16,7 +16,7 @@ fn main() {
         .add_system(collision_system)
         .add_system(select_system)
         .insert_resource(SelectTimer {
-            timer: Timer::from_seconds(SHOWCASE_TIMER_SECS, true),
+            inner: Timer::from_seconds(SHOWCASE_TIMER_SECS, true),
             has_triggered: false,
         })
         .run();
@@ -30,9 +30,8 @@ struct ContributorSelection {
     idx: usize,
 }
 
-#[derive(Deref, DerefMut)]
 struct SelectTimer {
-    timer: Timer,
+    inner: Timer,
     has_triggered: bool,
 }
 
@@ -168,7 +167,7 @@ fn select_system(
     mut query: Query<(&Contributor, &mut Sprite, &mut Transform)>,
     time: Res<Time>,
 ) {
-    if !timer.timer.tick(time.delta()).just_finished() {
+    if !timer.inner.tick(time.delta()).just_finished() {
         return;
     }
     if !timer.has_triggered {

From 219ce3ba2997a2f0ef49aba0e86a77d5ffa26d12 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 7 Apr 2022 19:49:04 -0700
Subject: [PATCH 11/11] Naming changes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 examples/2d/contributors.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index f669d059557ae..aba9d7970bbf3 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -15,10 +15,7 @@ fn main() {
         .add_system(move_system)
         .add_system(collision_system)
         .add_system(select_system)
-        .insert_resource(SelectTimer {
-            inner: Timer::from_seconds(SHOWCASE_TIMER_SECS, true),
-            has_triggered: false,
-        })
+        .insert_resource(SelectionState::default())
         .run();
 }
 
@@ -30,11 +27,20 @@ struct ContributorSelection {
     idx: usize,
 }
 
-struct SelectTimer {
-    inner: Timer,
+struct SelectionState {
+    timer: Timer,
     has_triggered: bool,
 }
 
+impl Default for SelectionState {
+    fn default() -> Self {
+        Self {
+            timer: Timer::from_seconds(SHOWCASE_TIMER_SECS, true),
+            has_triggered: false,
+        }
+    }
+}
+
 #[derive(Component)]
 struct ContributorDisplay;
 
@@ -161,13 +167,13 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 
 /// Finds the next contributor to display and selects the entity
 fn select_system(
-    mut timer: ResMut<SelectTimer>,
+    mut timer: ResMut<SelectionState>,
     mut contributor_selection: ResMut<ContributorSelection>,
     mut text_query: Query<&mut Text, With<ContributorDisplay>>,
     mut query: Query<(&Contributor, &mut Sprite, &mut Transform)>,
     time: Res<Time>,
 ) {
-    if !timer.inner.tick(time.delta()).just_finished() {
+    if !timer.timer.tick(time.delta()).just_finished() {
         return;
     }
     if !timer.has_triggered {