forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use EventWriter for gilrs_system (#3413)

Browse Source 
# Objective

- fixes #3397 

## Solution

- Uses EventWriter instead of ResMut<Event> in gilrs_system.rs.

I also renamed the argument from `event` to `events` for consistency. All other instances I could find in the engine of EventWriter use a plural argument name. Happy to undo or modify this change if desired.
This commit is contained in:
PaperCow 2021-12-21 23:56:58 +00:00
parent c04dfc1174
commit 004bbe9f04
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/bevy_gilrs/src/gilrs_system.rs
View File

@ -1,42 +1,36 @@
use crate::converter::{convert_axis, convert_button, convert_gamepad_id}; use crate::converter::{convert_axis, convert_button, convert_gamepad_id};
use bevy_app::Events; use bevy_app::EventWriter;
use bevy_ecs::system::{NonSend, NonSendMut, ResMut}; use bevy_ecs::system::{NonSend, NonSendMut};
use bevy_input::{gamepad::GamepadEventRaw, prelude::*}; use bevy_input::{gamepad::GamepadEventRaw, prelude::*};
use gilrs::{EventType, Gilrs}; use gilrs::{EventType, Gilrs};
pub fn gilrs_event_startup_system( pub fn gilrs_event_startup_system(gilrs: NonSend<Gilrs>, mut events: EventWriter<GamepadEventRaw>) {
gilrs: NonSend<Gilrs>,
mut event: ResMut<Events<GamepadEventRaw>>,
) {
for (id, _) in gilrs.gamepads() { for (id, _) in gilrs.gamepads() {
event.send(GamepadEventRaw( events.send(GamepadEventRaw(
convert_gamepad_id(id), convert_gamepad_id(id),
GamepadEventType::Connected, GamepadEventType::Connected,
)); ));
} }
} }
pub fn gilrs_event_system( pub fn gilrs_event_system(mut gilrs: NonSendMut<Gilrs>, mut events: EventWriter<GamepadEventRaw>) {
mut gilrs: NonSendMut<Gilrs>,
mut event: ResMut<Events<GamepadEventRaw>>,
) {
while let Some(gilrs_event) = gilrs.next_event() { while let Some(gilrs_event) = gilrs.next_event() {
match gilrs_event.event { match gilrs_event.event {
EventType::Connected => { EventType::Connected => {
event.send(GamepadEventRaw( events.send(GamepadEventRaw(
convert_gamepad_id(gilrs_event.id), convert_gamepad_id(gilrs_event.id),
GamepadEventType::Connected, GamepadEventType::Connected,
)); ));
} }
EventType::Disconnected => { EventType::Disconnected => {
event.send(GamepadEventRaw( events.send(GamepadEventRaw(
convert_gamepad_id(gilrs_event.id), convert_gamepad_id(gilrs_event.id),
GamepadEventType::Disconnected, GamepadEventType::Disconnected,
)); ));
} }
EventType::ButtonChanged(gilrs_button, value, _) => { EventType::ButtonChanged(gilrs_button, value, _) => {
if let Some(button_type) = convert_button(gilrs_button) { if let Some(button_type) = convert_button(gilrs_button) {
event.send(GamepadEventRaw( events.send(GamepadEventRaw(
convert_gamepad_id(gilrs_event.id), convert_gamepad_id(gilrs_event.id),
GamepadEventType::ButtonChanged(button_type, value), GamepadEventType::ButtonChanged(button_type, value),
)); ));
@ -44,7 +38,7 @@ pub fn gilrs_event_system(
} }
EventType::AxisChanged(gilrs_axis, value, _) => { EventType::AxisChanged(gilrs_axis, value, _) => {
if let Some(axis_type) = convert_axis(gilrs_axis) { if let Some(axis_type) = convert_axis(gilrs_axis) {
event.send(GamepadEventRaw( events.send(GamepadEventRaw(
convert_gamepad_id(gilrs_event.id), convert_gamepad_id(gilrs_event.id),
GamepadEventType::AxisChanged(axis_type, value), GamepadEventType::AxisChanged(axis_type, value),
)); ));