completed the upgrade to bevy 0.11

Author: CleanCut

CHANGELOG.md

@@ -7,13 +7,27 @@
 - You must new add `#[derive(Resource)]` above your `GameState` struct.
 - It is no longer possible to use the unit type `()` instead of a `GameState` struct. Always create a `GameState` struct (it can be an empty struct with no fields).
 - The `Timer` now takes a `TimerMode` enum variant instead of a `bool`. Use `TimerMode::Once` for a timer that runs once, or `TimerMode::Repeating` for a repeating timer.
+- The following `KeyCode` variants have been renamed:
+  - `LShift` -> `ShiftLeft`
+  - `RShift` -> `ShiftRight`
+  - `LAlt` -> `AltLeft`
+  - `RAlt` -> `AltRight`
+  - `LBracket` -> `BracketLeft`
+  - `RBracket` -> `BracketRight`
+  - `LControl` -> `ControlLeft`
+  - `RControl` -> `ControlRight`
+  - `LShift` -> `ShiftLeft`
+  - `LWin` -> `SuperLeft`
+  - `RWin` -> `SuperRight`
+  
 
 ### Improved
 
-- Update bevy from 0.8 to 0.10
-- Update bevy_prototype_lyon from 0.6 to 0.8
+- Update bevy from 0.8 to 0.11
+- Update bevy_prototype_lyon from 0.6 to 0.9
 - Update ron from 0.7 to 0.8
 - Fixed some inconsistent parameter names in examples
+- Some examples' audio was turned down lower
 
 
 ## [5.2.1] - 2022-11-15

examples/collider.rs

@@ -154,7 +154,7 @@ fn game_logic(engine: &mut Engine, game_state: &mut GameState) {
             let location = (((location / game_state.scale) * 2.0).round() * 0.5) * game_state.scale;
             if engine
                 .keyboard_state
-                .pressed_any(&[KeyCode::RShift, KeyCode::LShift])
+                .pressed_any(&[KeyCode::ShiftLeft, KeyCode::ShiftRight])
             {
                 sprite.change_last_collider_point(location);
             } else {

examples/keyboard_events.rs

@@ -33,6 +33,7 @@ fn logic(engine: &mut Engine, _: &mut GameState) {
             scan_code: _,
             key_code: Some(key_code),
             state: ButtonState::Pressed,
+            window: _,
         } = keyboard_event
         {
             // Handle various keypresses. The extra keys are for the Dvorak keyboard layout. ;-)

examples/level_creator.rs

@@ -99,14 +99,15 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
             scan_code: _,
             key_code: Some(key_code),
             state,
+            window: _,
         } = keyboard_event
         {
             if *state == ButtonState::Pressed {
                 match key_code {
                     KeyCode::Z | KeyCode::Semicolon => {
                         print_level = true;
                     }
-                    KeyCode::LShift | KeyCode::RShift => {
+                    KeyCode::ShiftLeft | KeyCode::ShiftRight => {
                         game_state.shift_pressed = true;
                     }
                     KeyCode::R | KeyCode::P => {
@@ -128,7 +129,7 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
                 }
             } else {
                 match key_code {
-                    KeyCode::LShift | KeyCode::RShift => {
+                    KeyCode::ShiftLeft | KeyCode::ShiftRight => {
                         game_state.shift_pressed = false;
                     }
                     _ => {}
@@ -140,7 +141,7 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
     // Print out the level?
     if print_level {
         println!(
-            "---------------\n\nuse rusty_engine::prelude::*;\n\nstruct GameState {{}}\n\nfn main() {{\n    let mut game = Game::new();\n"
+            "---------------\n\nuse rusty_engine::prelude::*;\n\n#[derive(Resource)]\nstruct GameState {{}}\n\nfn main() {{\n    let mut game = Game::new();\n"
         );
         for sprite in engine.sprites.values() {
             if sprite.label == game_state.current_label {

examples/scenarios/extreme_drivers_ed.rs

@@ -806,7 +806,7 @@ fn main() {
     a.collision = true;
 
     // Music!
-    game.audio_manager.play_music(MusicPreset::Classy8Bit, 0.5);
+    game.audio_manager.play_music(MusicPreset::Classy8Bit, 0.1);
 
     // Stuff used to keep and display score
     let score_text = game.add_text("score_text", "Score: 0");
@@ -916,7 +916,7 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
                 event.pair.1.clone()
             };
             engine.sprites.remove(&shiny_label);
-            engine.audio_manager.play_sfx(SfxPreset::Confirmation1, 1.0);
+            engine.audio_manager.play_sfx(SfxPreset::Confirmation1, 0.5);
             game_state.score += 1;
             score_text.value = format!("Score: {}", game_state.score);
             if game_state.score >= game_state.win_amount {
@@ -928,14 +928,14 @@ fn logic(engine: &mut Engine, game_state: &mut GameState) {
         // Crash!
         game_state.crashed = true;
         //game_state.add_text("crashed", "You crashed. You fail. :-(");
-        engine.audio_manager.play_sfx(SfxPreset::Jingle3, 1.0);
+        engine.audio_manager.play_sfx(SfxPreset::Jingle3, 0.5);
         engine.audio_manager.stop_music();
     }
 
     if game_state.won {
         engine
             .audio_manager
-            .play_sfx(SfxPreset::Congratulations, 1.0);
+            .play_sfx(SfxPreset::Congratulations, 0.5);
         let you_win = engine.add_text("you win", "You Win!");
         you_win.font_size = 120.0;
         you_win.translation.y = -50.0;

src/audio.rs

@@ -61,7 +61,7 @@ pub struct AudioManagerPlugin;
 
 impl Plugin for AudioManagerPlugin {
     fn build(&self, app: &mut bevy::prelude::App) {
-        app.add_system(queue_managed_audio_system);
+        app.add_systems(Update, queue_managed_audio_system);
     }
 }
 
@@ -231,7 +231,7 @@ impl From<MusicPreset> for String {
 }
 
 #[derive(Component)]
-struct Music;
+pub struct Music;
 
 /// The Bevy system that checks to see if there is any audio management that needs to be done.
 #[doc(hidden)]
@@ -271,6 +271,7 @@ pub fn queue_managed_audio_system(
                         ..Default::default()
                     },
                 })
+                .insert(Music)
                 .id();
             game_state.audio_manager.playing = Some(entity);
         }

src/game.rs

@@ -316,18 +316,24 @@ impl<S: Resource + Send + Sync + 'static> Game<S> {
                     })
                     .set(ImagePlugin::default_nearest()),
             )
-            .add_system(close_on_esc)
+            .add_systems(
+                Update,
+                (
+                    (close_on_esc),
+                    (update_window_dimensions, game_logic_sync::<S>),
+                ),
+            )
             // External Plugins
-            .add_plugin(ShapePlugin) // bevy_prototype_lyon, for displaying sprite colliders
+            .add_plugins(ShapePlugin) // bevy_prototype_lyon, for displaying sprite colliders
             // Rusty Engine Plugins
-            .add_plugin(AudioManagerPlugin)
-            .add_plugin(KeyboardPlugin)
-            .add_plugin(MousePlugin)
-            .add_plugin(PhysicsPlugin)
+            .add_plugins((
+                AudioManagerPlugin,
+                KeyboardPlugin,
+                MousePlugin,
+                PhysicsPlugin,
+            ))
             //.insert_resource(ReportExecutionOrderAmbiguities) // for debugging
-            .add_system(update_window_dimensions)
-            .add_system(game_logic_sync::<S>) // this should happen after all the rest of the systems
-            .add_startup_system(setup);
+            .add_systems(Startup, setup);
         self.app.world.spawn(Camera2dBundle::default());
         let engine = std::mem::take(&mut self.engine);
         self.app.insert_resource(engine);

src/keyboard.rs

@@ -11,8 +11,7 @@ pub(crate) struct KeyboardPlugin;
 impl Plugin for KeyboardPlugin {
     fn build(&self, app: &mut bevy::prelude::App) {
         app.insert_resource::<KeyboardState>(KeyboardState::default())
-            .add_system(sync_keyboard_events)
-            .add_system(sync_keyboard_state);
+            .add_systems(Update, (sync_keyboard_events, sync_keyboard_state));
     }
 }
 
@@ -264,20 +263,20 @@ const KEYCODEVARIANTS: [KeyCode; 163] = [
     Grave,
     Kana,
     Kanji,
-    LAlt,
-    LBracket,
-    LControl,
-    LShift,
-    LWin,
+    AltLeft,
+    BracketLeft,
+    ControlLeft,
+    ShiftLeft,
+    SuperLeft,
     Mail,
     MediaSelect,
     MediaStop,
     Minus,
     NumpadMultiply,
     Mute,
     MyComputer,
-    NavigateForward,  // also called "Prior"
-    NavigateBackward, // also called "Next"
+    NavigateForward,
+    NavigateBackward,
     NextTrack,
     NoConvert,
     NumpadComma,
@@ -288,11 +287,11 @@ const KEYCODEVARIANTS: [KeyCode; 163] = [
     PlayPause,
     Power,
     PrevTrack,
-    RAlt,
-    RBracket,
-    RControl,
-    RShift,
-    RWin,
+    AltRight,
+    BracketRight,
+    ControlRight,
+    ShiftRight,
+    SuperRight,
     Semicolon,
     Slash,
     Sleep,

src/mouse.rs

@@ -17,8 +17,7 @@ pub(crate) struct MousePlugin;
 impl Plugin for MousePlugin {
     fn build(&self, app: &mut bevy::prelude::App) {
         app.insert_resource(MouseState::default())
-            .add_system(sync_mouse_state)
-            .add_system(sync_mouse_events);
+            .add_systems(Update, (sync_mouse_state, sync_mouse_events));
     }
 }
 
@@ -199,7 +198,8 @@ fn sync_mouse_events(
         let mut new_event = ev.clone();
         // Convert from screen space to game space
         // TODO: Check to see if this needs to be adjusted for different DPIs
-        new_event.position -= game_state.window_dimensions * 0.5;
+        new_event.position.x -= game_state.window_dimensions.x * 0.5;
+        new_event.position.y = -new_event.position.y + (game_state.window_dimensions.y * 0.5);
         game_state.mouse_location_events.push(new_event);
     }
     for ev in mouse_motion_events.iter() {
@@ -225,7 +225,9 @@ fn sync_mouse_state(
     // Only changes when we get a new event, otherwise we preserve the last location.
     if let Some(event) = cursor_moved_events.iter().last() {
         // Convert from bevy's window space to our game space
-        let location = event.position - game_state.window_dimensions * 0.5;
+        let mut location = event.position.clone();
+        location.x -= game_state.window_dimensions.x * 0.5;
+        location.y = -location.y + (game_state.window_dimensions.y * 0.5);
         mouse_state.location = Some(location);
     }
     // Sync the relative mouse motion. This is the cumulative relative motion during the last frame.

src/physics.rs

@@ -14,7 +14,7 @@ pub(crate) struct PhysicsPlugin;
 impl Plugin for PhysicsPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<CollisionEvent>()
-            .add_system(collision_detection);
+            .add_systems(Update, collision_detection);
     }
 }
 
@@ -25,7 +25,7 @@ impl Plugin for PhysicsPlugin {
 /// [Sprite]s which:
 /// - have colliders (you can use the `collider` example to create your own colliders)
 /// - have their `collision` flags set to `true`.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Event)]
 pub struct CollisionEvent {
     pub state: CollisionState,
     pub pair: CollisionPair,