Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-26 06:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect behavior of just_pressed and just_released in Input<GamepadButton> (#7238)

Browse source 
# Objective

- Fixes a bug where `just_pressed` and `just_released` in `Input<GamepadButton>` might behave incorrectly due calling `clear` 3 times in a single frame through these three different systems: `gamepad_button_event_system`, `gamepad_axis_event_system` and `gamepad_connection_system` in any order

## Solution

- Call `clear` only once and before all the above three systems, i.e. in `gamepad_event_system`

## Additional Info

- Discussion in Discord: https://discord.com/channels/691052431525675048/768253008416342076/1064621963693273279
This commit is contained in:
Elbert Ronnie 2023-01-16 21:09:24 +00:00
parent addc36fe29
commit d4e3fcdfbf
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/bevy_input/src/gamepad.rs
View file

@ -992,7 +992,6 @@ pub fn gamepad_connection_system(
mut button_axis: ResMut<Axis<GamepadButton>>, mut button_axis: ResMut<Axis<GamepadButton>>,
mut button_input: ResMut<Input<GamepadButton>>, mut button_input: ResMut<Input<GamepadButton>>,
) { ) {
button_input.bypass_change_detection().clear();
for connection_event in connection_events.iter() { for connection_event in connection_events.iter() {
let gamepad = connection_event.gamepad; let gamepad = connection_event.gamepad;
@ -1117,27 +1116,24 @@ impl GamepadButtonChangedEvent {
} }
} }
/// Uses [`GamepadAxisChangedEvent`]s to update update the relevant `Input` and `Axis` values. /// Uses [`GamepadAxisChangedEvent`]s to update the relevant `Input` and `Axis` values.
pub fn gamepad_axis_event_system( pub fn gamepad_axis_event_system(
mut button_input: ResMut<Input<GamepadButton>>,
mut gamepad_axis: ResMut<Axis<GamepadAxis>>, mut gamepad_axis: ResMut<Axis<GamepadAxis>>,
mut axis_events: EventReader<GamepadAxisChangedEvent>, mut axis_events: EventReader<GamepadAxisChangedEvent>,
) { ) {
button_input.bypass_change_detection().clear();
for axis_event in axis_events.iter() { for axis_event in axis_events.iter() {
let axis = GamepadAxis::new(axis_event.gamepad, axis_event.axis_type); let axis = GamepadAxis::new(axis_event.gamepad, axis_event.axis_type);
gamepad_axis.set(axis, axis_event.value); gamepad_axis.set(axis, axis_event.value);
} }
} }
/// Uses [`GamepadButtonChangedEvent`]s to update update the relevant `Input` and `Axis` values. /// Uses [`GamepadButtonChangedEvent`]s to update the relevant `Input` and `Axis` values.
pub fn gamepad_button_event_system( pub fn gamepad_button_event_system(
mut button_events: EventReader<GamepadButtonChangedEvent>, mut button_events: EventReader<GamepadButtonChangedEvent>,
mut button_input: ResMut<Input<GamepadButton>>, mut button_input: ResMut<Input<GamepadButton>>,
mut button_axis: ResMut<Axis<GamepadButton>>, mut button_axis: ResMut<Axis<GamepadButton>>,
settings: Res<GamepadSettings>, settings: Res<GamepadSettings>,
) { ) {
button_input.bypass_change_detection().clear();
for button_event in button_events.iter() { for button_event in button_events.iter() {
let button = GamepadButton::new(button_event.gamepad, button_event.button_type); let button = GamepadButton::new(button_event.gamepad, button_event.button_type);
let value = button_event.value; let value = button_event.value;
@ -1197,7 +1193,9 @@ pub fn gamepad_event_system(
mut connection_events: EventWriter<GamepadConnectionEvent>, mut connection_events: EventWriter<GamepadConnectionEvent>,
mut button_events: EventWriter<GamepadButtonChangedEvent>, mut button_events: EventWriter<GamepadButtonChangedEvent>,
mut axis_events: EventWriter<GamepadAxisChangedEvent>, mut axis_events: EventWriter<GamepadAxisChangedEvent>,
mut button_input: ResMut<Input<GamepadButton>>,
) { ) {
button_input.bypass_change_detection().clear();
for gamepad_event in gamepad_events.iter() { for gamepad_event in gamepad_events.iter() {
match gamepad_event { match gamepad_event {
GamepadEvent::Connection(connection_event) => { GamepadEvent::Connection(connection_event) => {