From 101d2d4be6e0b2f2b9d2914505d97a3b7fdeb37e Mon Sep 17 00:00:00 2001
From: devil-ira <justthecooldude@gmail.com>
Date: Sun, 10 Jul 2022 22:25:25 +0200
Subject: [PATCH 1/2] Bounce!

---
 examples/games/contributors.rs | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/examples/games/contributors.rs b/examples/games/contributors.rs
index 0bad27798aea0..c863e3299218e 100644
--- a/examples/games/contributors.rs
+++ b/examples/games/contributors.rs
@@ -58,7 +58,7 @@ struct Velocity {
     rotation: f32,
 }
 
-const GRAVITY: f32 = -9.821 * 100.0;
+const GRAVITY: f32 = 9.821 * 100.0;
 const SPRITE_SIZE: f32 = 75.0;
 
 const SATURATION_DESELECTED: f32 = 0.3;
@@ -243,7 +243,7 @@ fn velocity_system(time: Res<Time>, mut velocity_query: Query<&mut Velocity>) {
     let delta = time.delta_seconds();
 
     for mut velocity in &mut velocity_query {
-        velocity.translation += Vec3::new(0.0, GRAVITY * delta, 0.0);
+        velocity.translation.y -= GRAVITY * delta;
     }
 }
 
@@ -256,9 +256,12 @@ fn collision_system(
     windows: Res<Windows>,
     mut query: Query<(&mut Velocity, &mut Transform), With<Contributor>>,
 ) {
-    let mut rng = rand::thread_rng();
-
-    let window = windows.primary();
+    let window = if let Some(window) = windows.get_primary() {
+        window
+    } else {
+        println!("The window was closed. Bye!");
+        return;
+    };
 
     let ceiling = window.height() / 2.;
     let ground = -(window.height() / 2.);
@@ -266,6 +269,11 @@ fn collision_system(
     let wall_left = -(window.width() / 2.);
     let wall_right = window.width() / 2.;
 
+    // The maximum height the birbs should try to reach is one birb below the top of the window.
+    let max_bounce_height = window.height() - SPRITE_SIZE * 2.0;
+
+    let mut rng = rand::thread_rng();
+
     for (mut velocity, mut transform) in &mut query {
         let left = transform.translation.x - SPRITE_SIZE / 2.0;
         let right = transform.translation.x + SPRITE_SIZE / 2.0;
@@ -275,11 +283,16 @@ fn collision_system(
         // clamp the translation to not go out of the bounds
         if bottom < ground {
             transform.translation.y = ground + SPRITE_SIZE / 2.0;
-            // apply an impulse upwards
-            velocity.translation.y = rng.gen_range(700.0..1000.0);
+
+            // How high this birb will bounce.
+            let bounce_height = rng.gen_range((max_bounce_height * 0.4)..max_bounce_height);
+
+            // Apply the velocity that would bounce the birb up to bounce_height.
+            velocity.translation.y = (bounce_height * GRAVITY * 2.).sqrt();
         }
         if top > ceiling {
             transform.translation.y = ceiling - SPRITE_SIZE / 2.0;
+            velocity.translation.y *= -1.0;
         }
         // on side walls flip the horizontal velocity
         if left < wall_left {

From 4879138e09e8b2ddb30c8d6c9ad8248f46d5b6d5 Mon Sep 17 00:00:00 2001
From: devil-ira <justthecooldude@gmail.com>
Date: Sun, 17 Jul 2022 12:00:23 +0200
Subject: [PATCH 2/2] Remove println.

---
 examples/games/contributors.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/games/contributors.rs b/examples/games/contributors.rs
index c863e3299218e..c3842c4ec7851 100644
--- a/examples/games/contributors.rs
+++ b/examples/games/contributors.rs
@@ -259,7 +259,6 @@ fn collision_system(
     let window = if let Some(window) = windows.get_primary() {
         window
     } else {
-        println!("The window was closed. Bye!");
         return;
     };