bcc33f6757
# Objective Fixes #6339. ## Solution This PR adds a new type, `GamepadInfo`, which holds metadata associated with a particular `Gamepad`. The `Gamepads` resource now holds a `HashMap<Gamepad, GamepadInfo>`. The `GamepadInfo` is created when the gamepad backend (by default `bevy_gilrs`) emits a "gamepad connected" event. The `gamepad_viewer` example has been updated to showcase the new functionality. Before:  After:  --- ## Changelog ### Added - Added `GamepadInfo`. - Added `Gamepads::name()`, which returns the name of the specified gamepad if it exists. ### Changed - `GamepadEventType::Connected` is now a tuple variant with a single field of type `GamepadInfo`. - Since `GamepadInfo` is not `Copy`, `GamepadEventType` is no longer `Copy`. The same is true of `GamepadEvent` and `GamepadEventRaw`. ## Migration Guide - Pattern matches on `GamepadEventType::Connected` will need to be updated, as the form of the variant has changed. - Code that requires `GamepadEvent`, `GamepadEventRaw` or `GamepadEventType` to be `Copy` will need to be updated.
67 lines
2.4 KiB
Rust
67 lines
2.4 KiB
Rust
use crate::converter::{convert_axis, convert_button, convert_gamepad_id};
|
|
use bevy_ecs::event::EventWriter;
|
|
use bevy_ecs::system::{NonSend, NonSendMut};
|
|
use bevy_input::gamepad::GamepadInfo;
|
|
use bevy_input::{gamepad::GamepadEventRaw, prelude::*};
|
|
use gilrs::{ev::filter::axis_dpad_to_button, EventType, Filter, Gilrs};
|
|
|
|
pub fn gilrs_event_startup_system(gilrs: NonSend<Gilrs>, mut events: EventWriter<GamepadEventRaw>) {
|
|
for (id, gamepad) in gilrs.gamepads() {
|
|
let info = GamepadInfo {
|
|
name: gamepad.name().into(),
|
|
};
|
|
|
|
events.send(GamepadEventRaw::new(
|
|
convert_gamepad_id(id),
|
|
GamepadEventType::Connected(info),
|
|
));
|
|
}
|
|
}
|
|
|
|
pub fn gilrs_event_system(mut gilrs: NonSendMut<Gilrs>, mut events: EventWriter<GamepadEventRaw>) {
|
|
while let Some(gilrs_event) = gilrs
|
|
.next_event()
|
|
.filter_ev(&axis_dpad_to_button, &mut gilrs)
|
|
{
|
|
gilrs.update(&gilrs_event);
|
|
|
|
match gilrs_event.event {
|
|
EventType::Connected => {
|
|
let pad = gilrs.gamepad(gilrs_event.id);
|
|
let info = GamepadInfo {
|
|
name: pad.name().into(),
|
|
};
|
|
|
|
events.send(GamepadEventRaw::new(
|
|
convert_gamepad_id(gilrs_event.id),
|
|
GamepadEventType::Connected(info),
|
|
));
|
|
}
|
|
EventType::Disconnected => {
|
|
events.send(GamepadEventRaw::new(
|
|
convert_gamepad_id(gilrs_event.id),
|
|
GamepadEventType::Disconnected,
|
|
));
|
|
}
|
|
EventType::ButtonChanged(gilrs_button, value, _) => {
|
|
if let Some(button_type) = convert_button(gilrs_button) {
|
|
events.send(GamepadEventRaw::new(
|
|
convert_gamepad_id(gilrs_event.id),
|
|
GamepadEventType::ButtonChanged(button_type, value),
|
|
));
|
|
}
|
|
}
|
|
EventType::AxisChanged(gilrs_axis, value, _) => {
|
|
if let Some(axis_type) = convert_axis(gilrs_axis) {
|
|
events.send(GamepadEventRaw::new(
|
|
convert_gamepad_id(gilrs_event.id),
|
|
GamepadEventType::AxisChanged(axis_type, value),
|
|
));
|
|
}
|
|
}
|
|
_ => (),
|
|
};
|
|
}
|
|
gilrs.inc();
|
|
}
|