[Merged by Bors] - Add Gamepads resource

crates/bevy_input/src/gamepad.rs

@@ -11,8 +11,34 @@ pub struct Gamepad(pub usize);
 /// Container of unique connected [Gamepad]s
 ///
 /// [Gamepad]s are registered and deregistered in [gamepad_connection_system]
-pub struct GamepadLobby {
-    pub gamepads: HashSet<Gamepad>,
+pub struct Gamepads {
+    gamepads: HashSet<Gamepad>,
+}
+
+impl Gamepads {
+    /// Returns true if the [Gamepads] contains a [Gamepad].
+    pub fn contains(&self, gamepad: &Gamepad) -> bool {
+        self.gamepads.contains(gamepad)
+    }
+
+    /// Iterates over registered [Gamepad]s
+    pub fn iter(&self) -> std::collections::hash_set::Iter<Gamepad> {
+        self.gamepads.iter()
+    }
+
+    /// Registers [Gamepad].
+    ///
+    /// If this [Gamepad] was present, `true` is returned.
+    ///
+    /// If this [Gamepad] wasn't present, `false` is returned.
+    fn register(&mut self, gamepad: Gamepad) -> bool {
+        self.gamepads.insert(gamepad)
+    }
+
+    /// Deregisters [Gamepad] and returns whether the value was registered
+    fn deregister(&mut self, gamepad: &Gamepad) -> bool {
+        self.gamepads.remove(gamepad)
+    }
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -213,17 +239,17 @@ impl ButtonAxisSettings {
 ///
 /// By default, runs during `CoreStage::PreUpdate` when added via [InputPlugin].
 pub fn gamepad_connection_system(
-    mut lobby: ResMut<GamepadLobby>,
+    mut gamepads: ResMut<Gamepads>,
     mut gamepad_event: EventReader<GamepadEvent>,
 ) {
     for event in gamepad_event.iter() {
         match &event {
             GamepadEvent(gamepad, GamepadEventType::Connected) => {
-                lobby.gamepads.insert(*gamepad);
+                gamepads.register(*gamepad);
                 info!("{:?} Connected", gamepad);
             }
             GamepadEvent(gamepad, GamepadEventType::Disconnected) => {
-                lobby.gamepads.remove(gamepad);
+                gamepads.deregister(gamepad);
                 info!("{:?} Disconnected", gamepad);
             }
             _ => (),

crates/bevy_input/src/lib.rs

@@ -15,7 +15,7 @@ pub mod prelude {
     pub use crate::{
         gamepad::{
             Gamepad, GamepadAxis, GamepadAxisType, GamepadButton, GamepadButtonType, GamepadEvent,
-            GamepadEventType, GamepadLobby,
+            GamepadEventType, Gamepads,
         },
         keyboard::KeyCode,
         mouse::MouseButton,
@@ -27,7 +27,7 @@ pub mod prelude {
 use bevy_app::prelude::*;
 use keyboard::{keyboard_input_system, KeyCode, KeyboardInput};
 use mouse::{mouse_button_input_system, MouseButton, MouseButtonInput, MouseMotion, MouseWheel};
-use prelude::GamepadLobby;
+use prelude::Gamepads;
 use touch::{touch_screen_input_system, TouchInput, Touches};
 
 use gamepad::{
@@ -65,7 +65,7 @@ impl Plugin for InputPlugin {
             .add_event::<GamepadEvent>()
             .add_event::<GamepadEventRaw>()
             .init_resource::<GamepadSettings>()
-            .init_resource::<GamepadLobby>()
+            .init_resource::<Gamepads>()
             .init_resource::<Input<GamepadButton>>()
             .init_resource::<Axis<GamepadAxis>>()
             .init_resource::<Axis<GamepadButton>>()

examples/input/gamepad_input.rs

@@ -8,12 +8,12 @@ fn main() {
 }
 
 fn gamepad_system(
-    lobby: Res<GamepadLobby>,
+    gamepads: Res<Gamepads>,
     button_inputs: Res<Input<GamepadButton>>,
     button_axes: Res<Axis<GamepadButton>>,
     axes: Res<Axis<GamepadAxis>>,
 ) {
-    for gamepad in lobby.gamepads.iter().cloned() {
+    for gamepad in gamepads.iter().cloned() {
         if button_inputs.just_pressed(GamepadButton(gamepad, GamepadButtonType::South)) {
             info!("{:?} just pressed South", gamepad);
         } else if button_inputs.just_released(GamepadButton(gamepad, GamepadButtonType::South)) {