Update to Bevy 0.10

Cargo.toml

@@ -25,20 +25,33 @@ egui = ['dep:bevy_egui']
 
 [dependencies]
 leafwing_input_manager_macros = { path = "macros", version = "0.7" }
-
-bevy = {version = "0.9", default-features = false, features = ["serialize", "bevy_gilrs"]}
-bevy_egui = {version = "0.19", optional = true}
-
-petitset = {version = "0.2.1", features = ["serde_compat"]}
-derive_more = {version = "0.99", default-features = false, features = ["display", "error"]}
+bevy = { version = "0.10", default-features = false, features = [
+  "serialize",
+  "bevy_gilrs",
+] }
+bevy_egui = { version = "0.20", optional = true }
+
+petitset = { version = "0.2.1", features = ["serde_compat"] }
+derive_more = { version = "0.99", default-features = false, features = [
+  "display",
+  "error",
+] }
 itertools = "0.10"
-serde = {version = "1.0", features = ["derive"]}
-fixedbitset  = "0.4.2"
-once_cell = "1.17.0"
+serde = { version = "1.0", features = ["derive"] }
+fixedbitset = "0.4.2"
+once_cell = "1.17.1"
 
 [dev-dependencies]
-bevy = {version = "0.9", default-features = false, features = ["bevy_asset", "bevy_sprite", "bevy_text", "bevy_ui", "bevy_render", "bevy_core_pipeline", "x11"]}
-bevy_egui = {version = "0.19"}
+bevy_egui = { version = "0.20" }
+bevy = { version = "0.10", default-features = false, features = [
+  "bevy_asset",
+  "bevy_sprite",
+  "bevy_text",
+  "bevy_ui",
+  "bevy_render",
+  "bevy_core_pipeline",
+  "x11",
+] }
 serde_test = "1.0"
 
 [lib]

RELEASES.md

@@ -5,6 +5,8 @@
 ### Usability
 
 - Added `ActionState::consume_all()` to consume all actions.
+- `bevy_egui` dependency has been bumped from 0.19 to 0.20.
+- `bevy` dependency has been bumped from 0.9 to 0.10.
 
 ### Enhancements
 

examples/arpg_indirection.rs

@@ -19,9 +19,10 @@ fn main() {
         .add_plugin(InputManagerPlugin::<Ability>::default())
         .add_startup_system(spawn_player)
         // This system coordinates the state of our two actions
-        .add_system_to_stage(
-            CoreStage::PreUpdate,
-            copy_action_state.after(InputManagerSystem::ManualControl),
+        .add_system(
+            copy_action_state
+                .in_base_set(CoreSet::PreUpdate)
+                .after(InputManagerSystem::ManualControl),
         )
         // Try it out, using QWER / left click / right click!
         .add_system(report_abilities_used)

examples/binding_menu.rs

@@ -1,11 +1,17 @@
 use bevy::{
     ecs::system::SystemParam,
-    input::{keyboard::KeyboardInput, mouse::MouseButtonInput, ButtonState},
+    input::{
+        gamepad::{GamepadButtonChangedEvent, GamepadEvent},
+        keyboard::KeyboardInput,
+        mouse::MouseButtonInput,
+        ButtonState,
+    },
     prelude::*,
+    window::PrimaryWindow,
 };
 use bevy_egui::{
     egui::{Align2, Area, Grid, Window},
-    EguiContext, EguiPlugin,
+    EguiContexts, EguiPlugin,
 };
 use derive_more::Display;
 use leafwing_input_manager::{prelude::*, user_input::InputKind};
@@ -37,12 +43,12 @@ fn spawn_player_system(mut commands: Commands, control_settings: Res<ControlSett
 
 fn controls_window_system(
     mut commands: Commands,
-    mut egui: ResMut<EguiContext>,
-    windows: Res<Windows>,
+    mut egui: EguiContexts,
+    windows: Query<&bevy::window::Window, With<PrimaryWindow>>,
     control_settings: ResMut<ControlSettings>,
 ) {
     // The window may not exist when the application closes
-    let Some(main_window) = windows.get_primary() else {
+    let Ok(main_window) = windows.get_single() else {
         return;
     };
     let window_width_margin = egui.ctx_mut().style().spacing.window_margin.left * 2.0;
@@ -89,7 +95,7 @@ fn controls_window_system(
 }
 
 fn buttons_system(
-    mut egui: ResMut<EguiContext>,
+    mut egui: EguiContexts,
     mut control_settings: ResMut<ControlSettings>,
     mut player_mappings: Query<&mut InputMap<ControlAction>>,
 ) {
@@ -109,7 +115,7 @@ fn buttons_system(
 
 fn binding_window_system(
     mut commands: Commands,
-    mut egui: ResMut<EguiContext>,
+    mut egui: EguiContexts,
     mut input_events: InputEvents,
     active_binding: Option<ResMut<ActiveBinding>>,
     mut control_settings: ResMut<ControlSettings>,
@@ -265,15 +271,14 @@ impl InputEvents<'_, '_> {
                 return Some(mouse_input.button.into());
             }
         }
-        if let Some(GamepadEvent {
+        if let Some(GamepadEvent::Button(GamepadButtonChangedEvent {
             gamepad: _,
-            event_type,
-        }) = self.gamepad_events.iter().next()
+            button_type,
+            value: strength,
+        })) = self.gamepad_events.iter().next()
         {
-            if let GamepadEventType::ButtonChanged(button, strength) = event_type.to_owned() {
-                if strength <= 0.5 {
-                    return Some(button.into());
-                }
+            if *strength <= 0.5 {
+                return Some((*button_type).into());
             }
         }
         None

examples/press_duration.rs

@@ -3,7 +3,7 @@
 //!
 //! Press Left / Right or A / D to move your character to the left and right!
 
-use bevy::prelude::*;
+use bevy::{prelude::*, window::PrimaryWindow};
 use leafwing_input_manager::prelude::*;
 
 fn main() {
@@ -115,8 +115,11 @@ fn drag(mut query: Query<&mut Velocity>, time: Res<Time>) {
     }
 }
 
-fn wall_collisions(mut query: Query<(&Transform, &mut Velocity)>, windows: Res<Windows>) {
-    let window_width = windows.get_primary().unwrap().width();
+fn wall_collisions(
+    mut query: Query<(&Transform, &mut Velocity)>,
+    windows: Query<&Window, With<PrimaryWindow>>,
+) {
+    let window_width = windows.single().width();
     let left_side = 0.0 - window_width / 2.0;
     let right_side = 0.0 + window_width / 2.0;
 

examples/send_actions_over_network.rs

@@ -36,10 +36,7 @@ fn main() {
         .add_plugin(InputPlugin)
         .add_plugin(InputManagerPlugin::<FpsAction>::default())
         // Creates an event stream of `ActionDiffs` to send to the server
-        .add_system_to_stage(
-            CoreStage::PostUpdate,
-            generate_action_diffs::<FpsAction, StableId>,
-        )
+        .add_system(generate_action_diffs::<FpsAction, StableId>.in_base_set(CoreSet::PostUpdate))
         .add_event::<ActionDiff<FpsAction, StableId>>()
         .add_startup_system(spawn_player);
 
@@ -49,10 +46,7 @@ fn main() {
         .add_plugin(InputManagerPlugin::<FpsAction>::server())
         .add_event::<ActionDiff<FpsAction, StableId>>()
         // Reads in the event stream of `ActionDiffs` to update the `ActionState`
-        .add_system_to_stage(
-            CoreStage::PreUpdate,
-            process_action_diffs::<FpsAction, StableId>,
-        )
+        .add_system(process_action_diffs::<FpsAction, StableId>.in_base_set(CoreSet::PreUpdate))
         // Typically, the rest of this information would synchronized as well
         .add_startup_system(spawn_player);
 

examples/ui_driven_actions.rs

@@ -9,7 +9,7 @@ fn main() {
         .add_plugin(InputManagerPlugin::<Action>::default())
         .add_startup_system(spawn_player)
         .add_startup_system(spawn_cameras)
-        .add_startup_system_to_stage(StartupStage::PostStartup, spawn_ui)
+        .add_startup_system(spawn_ui.in_base_set(StartupSet::PostStartup))
         .add_system(move_player)
         .run();
 }

src/input_mocking.rs

@@ -18,11 +18,11 @@ use bevy::ecs::system::{ResMut, SystemState};
 use bevy::ecs::world::World;
 #[cfg(feature = "ui")]
 use bevy::ecs::{component::Component, query::With, system::Query};
-use bevy::input::gamepad::GamepadEventRaw;
+use bevy::input::gamepad::{GamepadAxisChangedEvent, GamepadButtonChangedEvent};
 use bevy::input::mouse::MouseScrollUnit;
 use bevy::input::ButtonState;
 use bevy::input::{
-    gamepad::{Gamepad, GamepadButton, GamepadEvent, GamepadEventType},
+    gamepad::{Gamepad, GamepadButton, GamepadEvent},
     keyboard::{KeyCode, KeyboardInput},
     mouse::{MouseButton, MouseButtonInput, MouseMotion, MouseWheel},
     touch::{TouchInput, Touches},
@@ -216,10 +216,12 @@ impl MockInput for MutableInputStreams<'_> {
         // Gamepad buttons
         for button_type in raw_inputs.gamepad_buttons {
             if let Some(gamepad) = gamepad {
-                self.gamepad_events.send(GamepadEventRaw {
-                    gamepad,
-                    event_type: GamepadEventType::ButtonChanged(button_type, 1.0),
-                });
+                self.gamepad_events
+                    .send(GamepadEvent::Button(GamepadButtonChangedEvent {
+                        gamepad,
+                        button_type,
+                        value: 1.0,
+                    }));
             }
         }
 
@@ -229,10 +231,12 @@ impl MockInput for MutableInputStreams<'_> {
                 match outer_axis_type {
                     AxisType::Gamepad(axis_type) => {
                         if let Some(gamepad) = gamepad {
-                            self.gamepad_events.send(GamepadEventRaw {
-                                gamepad,
-                                event_type: GamepadEventType::AxisChanged(axis_type, position_data),
-                            });
+                            self.gamepad_events
+                                .send(GamepadEvent::Axis(GamepadAxisChangedEvent {
+                                    gamepad,
+                                    axis_type,
+                                    value: position_data,
+                                }));
                         }
                     }
                     AxisType::MouseWheel(axis_type) => {
@@ -281,10 +285,12 @@ impl MockInput for MutableInputStreams<'_> {
 
         for button_type in raw_inputs.gamepad_buttons {
             if let Some(gamepad) = gamepad {
-                self.gamepad_events.send(GamepadEventRaw {
-                    gamepad,
-                    event_type: GamepadEventType::ButtonChanged(button_type, 1.0),
-                });
+                self.gamepad_events
+                    .send(GamepadEvent::Button(GamepadButtonChangedEvent {
+                        gamepad,
+                        button_type,
+                        value: 1.0,
+                    }));
             }
         }
 
@@ -481,7 +487,10 @@ impl MockInput for App {
 mod test {
     use crate::input_mocking::MockInput;
     use bevy::{
-        input::{gamepad::GamepadInfo, InputPlugin},
+        input::{
+            gamepad::{GamepadConnection, GamepadConnectionEvent, GamepadEvent, GamepadInfo},
+            InputPlugin,
+        },
         prelude::*,
     };
 
@@ -522,12 +531,12 @@ mod test {
 
         let gamepad = Gamepad { id: 0 };
         let mut gamepad_events = app.world.resource_mut::<Events<GamepadEvent>>();
-        gamepad_events.send(GamepadEvent {
+        gamepad_events.send(GamepadEvent::Connection(GamepadConnectionEvent {
             gamepad,
-            event_type: GamepadEventType::Connected(GamepadInfo {
+            connection: GamepadConnection::Connected(GamepadInfo {
                 name: "TestController".into(),
             }),
-        });
+        }));
         app.update();
 
         // Test that buttons are unpressed by default
@@ -562,12 +571,12 @@ mod test {
 
         let gamepad = Gamepad { id: 0 };
         let mut gamepad_events = app.world.resource_mut::<Events<GamepadEvent>>();
-        gamepad_events.send(GamepadEvent {
+        gamepad_events.send(GamepadEvent::Connection(GamepadConnectionEvent {
             gamepad,
-            event_type: GamepadEventType::Connected(GamepadInfo {
+            connection: GamepadConnection::Connected(GamepadInfo {
                 name: "TestController".into(),
             }),
-        });
+        }));
         app.update();
 
         // Test that buttons are unpressed by default

src/input_streams.rs

@@ -1,13 +1,10 @@
 //! Unified input streams for working with [`bevy::input`] data.
 
-use bevy::{
-    input::{
-        gamepad::{Gamepad, GamepadAxis, GamepadButton, GamepadEventRaw, Gamepads},
-        keyboard::{KeyCode, KeyboardInput},
-        mouse::{MouseButton, MouseButtonInput, MouseMotion, MouseWheel},
-        Axis, Input,
-    },
-    prelude::ScanCode,
+use bevy::input::{
+    gamepad::{Gamepad, GamepadAxis, GamepadButton, GamepadEvent, Gamepads},
+    keyboard::{KeyCode, KeyboardInput, ScanCode},
+    mouse::{MouseButton, MouseButtonInput, MouseMotion, MouseWheel},
+    Axis, Input,
 };
 use petitset::PetitSet;
 
@@ -403,7 +400,7 @@ pub struct MutableInputStreams<'a> {
     /// A list of registered [`Gamepads`]
     pub gamepads: &'a mut Gamepads,
     /// Events used for mocking gamepad-related inputs
-    pub gamepad_events: &'a mut Events<GamepadEventRaw>,
+    pub gamepad_events: &'a mut Events<GamepadEvent>,
 
     /// A [`KeyCode`] [`Input`] stream
     pub keycodes: &'a mut Input<KeyCode>,
@@ -433,7 +430,7 @@ impl<'a> MutableInputStreams<'a> {
             ResMut<Axis<GamepadButton>>,
             ResMut<Axis<GamepadAxis>>,
             ResMut<Gamepads>,
-            ResMut<Events<GamepadEventRaw>>,
+            ResMut<Events<GamepadEvent>>,
             ResMut<Input<KeyCode>>,
             ResMut<Input<ScanCode>>,
             ResMut<Events<KeyboardInput>>,