mirror of
https://github.com/bevyengine/bevy
synced 2024-11-10 07:04:33 +00:00
bevy_input: Fix process touch event (#4352)
# Objective - `process_touch_event` in `bevy_input` don't update position info. `TouchPhase::Ended` and `TouchPhase::Cancelled` should use the position info from `pressed`. Otherwise, it'll not update. The position info is updated from `TouchPhase::Moved`. ## Solution - Use updated touch info. --- ## Changelog > This section is optional. If this was a trivial fix, or has no externally-visible impact, feel free to skip this section. - Fixed: bevy_input, fix process touch event, update touch info
This commit is contained in:
parent
2cff2278ca
commit
aebd760711
1 changed files with 21 additions and 7 deletions
|
@ -297,12 +297,22 @@ impl Touches {
|
|||
}
|
||||
}
|
||||
TouchPhase::Ended => {
|
||||
self.just_released.insert(event.id, event.into());
|
||||
self.pressed.remove_entry(&event.id);
|
||||
// if touch `just_released`, add related event to it
|
||||
// the event position info is inside `pressed`, so use it unless not found
|
||||
if let Some((_, v)) = self.pressed.remove_entry(&event.id) {
|
||||
self.just_released.insert(event.id, v);
|
||||
} else {
|
||||
self.just_released.insert(event.id, event.into());
|
||||
}
|
||||
}
|
||||
TouchPhase::Cancelled => {
|
||||
self.just_cancelled.insert(event.id, event.into());
|
||||
self.pressed.remove_entry(&event.id);
|
||||
// if touch `just_cancelled`, add related event to it
|
||||
// the event position info is inside `pressed`, so use it unless not found
|
||||
if let Some((_, v)) = self.pressed.remove_entry(&event.id) {
|
||||
self.just_cancelled.insert(event.id, v);
|
||||
} else {
|
||||
self.just_cancelled.insert(event.id, event.into());
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@ -427,8 +437,8 @@ mod test {
|
|||
touches.update();
|
||||
touches.process_touch_event(&cancel_touch_event);
|
||||
|
||||
assert!(touches.just_cancelled.get(&cancel_touch_event.id).is_some());
|
||||
assert!(touches.pressed.get(&cancel_touch_event.id).is_none());
|
||||
assert!(touches.just_cancelled.get(&touch_event.id).is_some());
|
||||
assert!(touches.pressed.get(&touch_event.id).is_none());
|
||||
|
||||
// Test ending an event
|
||||
|
||||
|
@ -436,15 +446,19 @@ mod test {
|
|||
phase: TouchPhase::Ended,
|
||||
position: Vec2::splat(4.0),
|
||||
force: None,
|
||||
id: 4,
|
||||
id: touch_event.id,
|
||||
};
|
||||
|
||||
touches.update();
|
||||
touches.process_touch_event(&touch_event);
|
||||
touches.process_touch_event(&moved_touch_event);
|
||||
touches.process_touch_event(&end_touch_event);
|
||||
|
||||
assert!(touches.just_released.get(&touch_event.id).is_some());
|
||||
assert!(touches.pressed.get(&touch_event.id).is_none());
|
||||
let touch = touches.just_released.get(&touch_event.id).unwrap();
|
||||
// Make sure the position is updated from TouchPhase::Moved and TouchPhase::Ended
|
||||
assert!(touch.previous_position != touch.position);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
Loading…
Reference in a new issue