mirror of
https://github.com/bevyengine/bevy
synced 2024-11-23 05:03:47 +00:00
ced216f59a
# Objective - Update winit dependency to 0.29 ## Changelog ### KeyCode changes - Removed `ScanCode`, as it was [replaced by KeyCode](https://github.com/rust-windowing/winit/blob/master/CHANGELOG.md#0292). - `ReceivedCharacter.char` is now a `SmolStr`, [relevant doc](https://docs.rs/winit/latest/winit/event/struct.KeyEvent.html#structfield.text). - Changed most `KeyCode` values, and added more. KeyCode has changed meaning. With this PR, it refers to physical position on keyboard rather than the printed letter on keyboard keys. In practice this means: - On QWERTY keyboard layouts, nothing changes - On any other keyboard layout, `KeyCode` no longer reflects the label on key. - This is "good". In bevy 0.12, when you used WASD for movement, users with non-QWERTY keyboards couldn't play your game! This was especially bad for non-latin keyboards. Now, WASD represents the physical keys. A French player will press the ZQSD keys, which are near each other, Kyrgyz players will use "Цфыв". - This is "bad" as well. You can't know in advance what the label of the key for input is. Your UI says "press WASD to move", even if in reality, they should be pressing "ZQSD" or "Цфыв". You also no longer can use `KeyCode` for text inputs. In any case, it was a pretty bad API for text input. You should use `ReceivedCharacter` now instead. ### Other changes - Use `web-time` rather than `instant` crate. (https://github.com/rust-windowing/winit/pull/2836) - winit did split `run_return` in `run_onDemand` and `pump_events`, I did the same change in bevy_winit and used `pump_events`. - Removed `return_from_run` from `WinitSettings` as `winit::run` now returns on supported platforms. - I left the example "return_after_run" as I think it's still useful. - This winit change is done partly to allow to create a new window after quitting all windows: https://github.com/emilk/egui/issues/1918 ; this PR doesn't address. - added `width` and `height` properties in the `canvas` from wasm example (https://github.com/bevyengine/bevy/pull/10702#discussion_r1420567168) ## Known regressions (important follow ups?) - Provide an API for reacting when a specific key from current layout was released. - possible solutions: use winit::Key from winit::KeyEvent ; mapping between KeyCode and Key ; or . - We don't receive characters through alt+numpad (e.g. alt + 151 = "ù") anymore ; reproduced on winit example "ime". maybe related to https://github.com/rust-windowing/winit/issues/2945 - (windows) Window content doesn't refresh at all when resizing. By reading https://github.com/rust-windowing/winit/issues/2900 ; I suspect we should just fire a `window.request_redraw();` from `AboutToWait`, and handle actual redrawing within `RedrawRequested`. I'm not sure how to move all that code so I'd appreciate it to be a follow up. - (windows) unreleased winit fix for using set_control_flow in AboutToWait https://github.com/rust-windowing/winit/issues/3215 ; ⚠️ I'm not sure what the implications are, but that feels bad 🤔 ## Follow up I'd like to avoid bloating this PR, here are a few follow up tasks worthy of a separate PR, or new issue to track them once this PR is closed, as they would either complicate reviews, or at risk of being controversial: - remove CanvasParentResizePlugin (https://github.com/bevyengine/bevy/pull/10702#discussion_r1417068856) - avoid mentionning explicitly winit in docs from bevy_window ? - NamedKey integration on bevy_input: https://github.com/rust-windowing/winit/pull/3143 introduced a new NamedKey variant. I implemented it only on the converters but we'd benefit making the same changes to bevy_input. - Add more info in KeyboardInput https://github.com/bevyengine/bevy/pull/10702#pullrequestreview-1748336313 - https://github.com/bevyengine/bevy/pull/9905 added a workaround on a bug allegedly fixed by winit 0.29. We should check if it's still necessary. - update to raw_window_handle 0.6 - blocked by wgpu - Rename `KeyCode` to `PhysicalKeyCode` https://github.com/bevyengine/bevy/pull/10702#discussion_r1404595015 - remove `instant` dependency, [replaced by](https://github.com/rust-windowing/winit/pull/2836) `web_time`), we'd need to update to : - fastrand >= 2.0 - [`async-executor`](https://github.com/smol-rs/async-executor) >= 1.7 - [`futures-lite`](https://github.com/smol-rs/futures-lite) >= 2.0 - Verify license, see [discussion](https://github.com/bevyengine/bevy/pull/8745#discussion_r1402439800) - we might be missing a short notice or description of changes made - Consider using https://github.com/rust-windowing/cursor-icon directly rather than vendoring it in bevy. - investigate [this unwrap](https://github.com/bevyengine/bevy/pull/8745#discussion_r1387044986) (`winit_window.canvas().unwrap();`) - Use more good things about winit's update - https://github.com/bevyengine/bevy/pull/10689#issuecomment-1823560428 ## Migration Guide This PR should have one.
220 lines
7.8 KiB
Rust
220 lines
7.8 KiB
Rust
use bevy_reflect::Reflect;
|
|
use bevy_utils::{Duration, Instant};
|
|
|
|
use crate::time::Time;
|
|
|
|
/// Real time clock representing elapsed wall clock time.
|
|
///
|
|
/// A specialization of the [`Time`] structure. **For method documentation, see
|
|
/// [`Time<Real>#impl-Time<Real>`].**
|
|
///
|
|
/// It is automatically inserted as a resource by
|
|
/// [`TimePlugin`](crate::TimePlugin) and updated with time instants according
|
|
/// to [`TimeUpdateStrategy`](crate::TimeUpdateStrategy).
|
|
///
|
|
/// The [`delta()`](Time::delta) and [`elapsed()`](Time::elapsed) values of this
|
|
/// clock should be used for anything which deals specifically with real time
|
|
/// (wall clock time). It will not be affected by relative game speed
|
|
/// adjustments, pausing or other adjustments.
|
|
///
|
|
/// The clock does not count time from [`startup()`](Time::startup) to
|
|
/// [`first_update()`](Time::first_update()) into elapsed, but instead will
|
|
/// start counting time from the first update call. [`delta()`](Time::delta) and
|
|
/// [`elapsed()`](Time::elapsed) will report zero on the first update as there
|
|
/// is no previous update instant. This means that a [`delta()`](Time::delta) of
|
|
/// zero must be handled without errors in application logic, as it may
|
|
/// theoretically also happen at other times.
|
|
///
|
|
/// [`Instant`]s for [`startup()`](Time::startup),
|
|
/// [`first_update()`](Time::first_update) and
|
|
/// [`last_update()`](Time::last_update) are recorded and accessible.
|
|
#[derive(Debug, Copy, Clone, Reflect)]
|
|
pub struct Real {
|
|
startup: Instant,
|
|
first_update: Option<Instant>,
|
|
last_update: Option<Instant>,
|
|
}
|
|
|
|
impl Default for Real {
|
|
fn default() -> Self {
|
|
Self {
|
|
startup: Instant::now(),
|
|
first_update: None,
|
|
last_update: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Time<Real> {
|
|
/// Constructs a new `Time<Real>` instance with a specific startup
|
|
/// [`Instant`].
|
|
pub fn new(startup: Instant) -> Self {
|
|
Self::new_with(Real {
|
|
startup,
|
|
..Default::default()
|
|
})
|
|
}
|
|
|
|
/// Updates the internal time measurements.
|
|
///
|
|
/// Calling this method as part of your app will most likely result in
|
|
/// inaccurate timekeeping, as the [`Time`] resource is ordinarily managed
|
|
/// by the [`TimePlugin`](crate::TimePlugin).
|
|
pub fn update(&mut self) {
|
|
let instant = Instant::now();
|
|
self.update_with_instant(instant);
|
|
}
|
|
|
|
/// Updates time with a specified [`Duration`].
|
|
///
|
|
/// This method is provided for use in tests.
|
|
///
|
|
/// Calling this method as part of your app will most likely result in
|
|
/// inaccurate timekeeping, as the [`Time`] resource is ordinarily managed
|
|
/// by the [`TimePlugin`](crate::TimePlugin).
|
|
pub fn update_with_duration(&mut self, duration: Duration) {
|
|
let last_update = self.context().last_update.unwrap_or(self.context().startup);
|
|
self.update_with_instant(last_update + duration);
|
|
}
|
|
|
|
/// Updates time with a specified [`Instant`].
|
|
///
|
|
/// This method is provided for use in tests.
|
|
///
|
|
/// Calling this method as part of your app will most likely result in inaccurate timekeeping,
|
|
/// as the [`Time`] resource is ordinarily managed by the [`TimePlugin`](crate::TimePlugin).
|
|
pub fn update_with_instant(&mut self, instant: Instant) {
|
|
let Some(last_update) = self.context().last_update else {
|
|
let context = self.context_mut();
|
|
context.first_update = Some(instant);
|
|
context.last_update = Some(instant);
|
|
return;
|
|
};
|
|
let delta = instant - last_update;
|
|
self.advance_by(delta);
|
|
self.context_mut().last_update = Some(instant);
|
|
}
|
|
|
|
/// Returns the [`Instant`] the clock was created.
|
|
///
|
|
/// This usually represents when the app was started.
|
|
#[inline]
|
|
pub fn startup(&self) -> Instant {
|
|
self.context().startup
|
|
}
|
|
|
|
/// Returns the [`Instant`] when [`Self::update`] was first called, if it
|
|
/// exists.
|
|
///
|
|
/// This usually represents when the first app update started.
|
|
#[inline]
|
|
pub fn first_update(&self) -> Option<Instant> {
|
|
self.context().first_update
|
|
}
|
|
|
|
/// Returns the [`Instant`] when [`Self::update`] was last called, if it
|
|
/// exists.
|
|
///
|
|
/// This usually represents when the current app update started.
|
|
#[inline]
|
|
pub fn last_update(&self) -> Option<Instant> {
|
|
self.context().last_update
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_update() {
|
|
let startup = Instant::now();
|
|
let mut time = Time::<Real>::new(startup);
|
|
|
|
assert_eq!(time.startup(), startup);
|
|
assert_eq!(time.first_update(), None);
|
|
assert_eq!(time.last_update(), None);
|
|
assert_eq!(time.delta(), Duration::ZERO);
|
|
assert_eq!(time.elapsed(), Duration::ZERO);
|
|
|
|
time.update();
|
|
|
|
assert_ne!(time.first_update(), None);
|
|
assert_ne!(time.last_update(), None);
|
|
assert_eq!(time.delta(), Duration::ZERO);
|
|
assert_eq!(time.elapsed(), Duration::ZERO);
|
|
|
|
time.update();
|
|
|
|
assert_ne!(time.first_update(), None);
|
|
assert_ne!(time.last_update(), None);
|
|
assert_ne!(time.last_update(), time.first_update());
|
|
assert_ne!(time.delta(), Duration::ZERO);
|
|
assert_eq!(time.elapsed(), time.delta());
|
|
|
|
let prev_elapsed = time.elapsed();
|
|
time.update();
|
|
|
|
assert_ne!(time.delta(), Duration::ZERO);
|
|
assert_eq!(time.elapsed(), prev_elapsed + time.delta());
|
|
}
|
|
|
|
#[test]
|
|
fn test_update_with_instant() {
|
|
let startup = Instant::now();
|
|
let mut time = Time::<Real>::new(startup);
|
|
|
|
let first_update = Instant::now();
|
|
time.update_with_instant(first_update);
|
|
|
|
assert_eq!(time.startup(), startup);
|
|
assert_eq!(time.first_update(), Some(first_update));
|
|
assert_eq!(time.last_update(), Some(first_update));
|
|
assert_eq!(time.delta(), Duration::ZERO);
|
|
assert_eq!(time.elapsed(), Duration::ZERO);
|
|
|
|
let second_update = Instant::now();
|
|
time.update_with_instant(second_update);
|
|
|
|
assert_eq!(time.first_update(), Some(first_update));
|
|
assert_eq!(time.last_update(), Some(second_update));
|
|
assert_eq!(time.delta(), second_update - first_update);
|
|
assert_eq!(time.elapsed(), second_update - first_update);
|
|
|
|
let third_update = Instant::now();
|
|
time.update_with_instant(third_update);
|
|
|
|
assert_eq!(time.first_update(), Some(first_update));
|
|
assert_eq!(time.last_update(), Some(third_update));
|
|
assert_eq!(time.delta(), third_update - second_update);
|
|
assert_eq!(time.elapsed(), third_update - first_update);
|
|
}
|
|
|
|
#[test]
|
|
fn test_update_with_duration() {
|
|
let startup = Instant::now();
|
|
let mut time = Time::<Real>::new(startup);
|
|
|
|
time.update_with_duration(Duration::from_secs(1));
|
|
|
|
assert_eq!(time.startup(), startup);
|
|
assert_eq!(time.first_update(), Some(startup + Duration::from_secs(1)));
|
|
assert_eq!(time.last_update(), Some(startup + Duration::from_secs(1)));
|
|
assert_eq!(time.delta(), Duration::ZERO);
|
|
assert_eq!(time.elapsed(), Duration::ZERO);
|
|
|
|
time.update_with_duration(Duration::from_secs(1));
|
|
|
|
assert_eq!(time.first_update(), Some(startup + Duration::from_secs(1)));
|
|
assert_eq!(time.last_update(), Some(startup + Duration::from_secs(2)));
|
|
assert_eq!(time.delta(), Duration::from_secs(1));
|
|
assert_eq!(time.elapsed(), Duration::from_secs(1));
|
|
|
|
time.update_with_duration(Duration::from_secs(1));
|
|
|
|
assert_eq!(time.first_update(), Some(startup + Duration::from_secs(1)));
|
|
assert_eq!(time.last_update(), Some(startup + Duration::from_secs(3)));
|
|
assert_eq!(time.delta(), Duration::from_secs(1));
|
|
assert_eq!(time.elapsed(), Duration::from_secs(2));
|
|
}
|
|
}
|