Update to use new API

From bevyengine/bevy#2760
DJMcNab · Sep 7, 2021 · 8c46ade · 8c46ade
1 parent 7f1338e
commit 8c46ade
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bevy-intro/Cargo.toml b/bevy-intro/Cargo.toml
@@ -7,4 +7,4 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "c5717b5a9124c7c2f7431c4be07f15243ebd60b5" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "e3170586776b165f40e446780fc4f9a4ed04187d" }
diff --git a/dino-runner/Cargo.toml b/dino-runner/Cargo.toml
@@ -7,4 +7,4 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "c5717b5a9124c7c2f7431c4be07f15243ebd60b5" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "e3170586776b165f40e446780fc4f9a4ed04187d" }
diff --git a/dino-runner/src/movement.rs b/dino-runner/src/movement.rs
@@ -63,9 +63,7 @@ fn jump(
 ) {
     let (mut dino_velocity, mut grounded) = dino.single_mut().unwrap();
     if matches!(*grounded, GroundState::OnGround)
-        && (keyboard.pressed(KeyCode::Space)
-            || keyboard.pressed(KeyCode::Up)
-            || keyboard.pressed(KeyCode::W))
+        && keyboard.any_pressed([KeyCode::Space, KeyCode::Up, KeyCode::W])
     {
         *grounded = GroundState::InAir;
         dino_velocity.0 = 300.;
@@ -77,9 +75,7 @@ fn snap(
     keyboard: Res<Input<KeyCode>>,
 ) {
     let (mut velocity, grounded) = dino.single_mut().unwrap();
-    if matches!(grounded, GroundState::InAir)
-        && (keyboard.pressed(KeyCode::Down) || keyboard.pressed(KeyCode::S))
-    {
+    if matches!(grounded, GroundState::InAir) && keyboard.any_pressed([KeyCode::Down, KeyCode::S]) {
         velocity.0 -= 600.;
     }
 }