2024-04-30 00:49:41 +00:00
|
|
|
#![allow(deprecated)]
|
2024-03-03 23:51:53 +00:00
|
|
|
#![allow(missing_docs)]
|
|
|
|
|
|
|
|
use bevy_ecs::prelude::*;
|
|
|
|
use bevy_input::keyboard::KeyboardInput;
|
|
|
|
use bevy_input::touch::TouchInput;
|
|
|
|
use bevy_input::{
|
|
|
|
mouse::{MouseButtonInput, MouseMotion, MouseWheel},
|
|
|
|
touchpad::{TouchpadMagnify, TouchpadRotate},
|
|
|
|
};
|
|
|
|
use bevy_reflect::Reflect;
|
2024-03-04 07:48:09 +00:00
|
|
|
#[cfg(feature = "serialize")]
|
|
|
|
use bevy_reflect::{ReflectDeserialize, ReflectSerialize};
|
2024-03-03 23:51:53 +00:00
|
|
|
use bevy_window::{
|
fix: upgrade to winit v0.30 (#13366)
# Objective
- Upgrade winit to v0.30
- Fixes https://github.com/bevyengine/bevy/issues/13331
## Solution
This is a rewrite/adaptation of the new trait system described and
implemented in `winit` v0.30.
## Migration Guide
The custom UserEvent is now renamed as WakeUp, used to wake up the loop
if anything happens outside the app (a new
[custom_user_event](https://github.com/bevyengine/bevy/pull/13366/files#diff-2de8c0a8d3028d0059a3d80ae31b2bbc1cde2595ce2d317ea378fe3e0cf6ef2d)
shows this behavior.
The internal `UpdateState` has been removed and replaced internally by
the AppLifecycle. When changed, the AppLifecycle is sent as an event.
The `UpdateMode` now accepts only two values: `Continuous` and
`Reactive`, but the latter exposes 3 new properties to enable reactive
to device, user or window events. The previous `UpdateMode::Reactive` is
now equivalent to `UpdateMode::reactive()`, while
`UpdateMode::ReactiveLowPower` to `UpdateMode::reactive_low_power()`.
The `ApplicationLifecycle` has been renamed as `AppLifecycle`, and now
contains the possible values of the application state inside the event
loop:
* `Idle`: the loop has not started yet
* `Running` (previously called `Started`): the loop is running
* `WillSuspend`: the loop is going to be suspended
* `Suspended`: the loop is suspended
* `WillResume`: the loop is going to be resumed
Note: the `Resumed` state has been removed since the resumed app is just
running.
Finally, now that `winit` enables this, it extends the `WinitPlugin` to
support custom events.
## Test platforms
- [x] Windows
- [x] MacOs
- [x] Linux (x11)
- [x] Linux (Wayland)
- [x] Android
- [x] iOS
- [x] WASM/WebGPU
- [x] WASM/WebGL2
## Outstanding issues / regressions
- [ ] iOS: build failed in CI
- blocking, but may just be flakiness
- [x] Cross-platform: when the window is maximised, changes in the scale
factor don't apply, to make them apply one has to make the window
smaller again. (Re-maximising keeps the updated scale factor)
- non-blocking, but good to fix
- [ ] Android: it's pretty easy to quickly open and close the app and
then the music keeps playing when suspended.
- non-blocking but worrying
- [ ] Web: the application will hang when switching tabs
- Not new, duplicate of https://github.com/bevyengine/bevy/issues/13486
- [ ] Cross-platform?: Screenshot failure, `ERROR present_frames:
wgpu_core::present: No work has been submitted for this frame before`
taking the first screenshot, but after pressing space
- non-blocking, but good to fix
---------
Co-authored-by: François <francois.mockers@vleue.com>
2024-06-03 13:06:48 +00:00
|
|
|
AppLifecycle, CursorEntered, CursorLeft, CursorMoved, FileDragAndDrop, Ime, ReceivedCharacter,
|
|
|
|
RequestRedraw, WindowBackendScaleFactorChanged, WindowCloseRequested, WindowCreated,
|
|
|
|
WindowDestroyed, WindowFocused, WindowMoved, WindowOccluded, WindowResized,
|
2024-03-03 23:51:53 +00:00
|
|
|
WindowScaleFactorChanged, WindowThemeChanged,
|
|
|
|
};
|
|
|
|
|
|
|
|
/// Wraps all `bevy_window` events in a common enum.
|
|
|
|
///
|
|
|
|
/// Read these events with `EventReader<WinitEvent>` if you need to
|
|
|
|
/// access window events in the order they were received from `winit`.
|
|
|
|
/// Otherwise, the event types are individually readable with
|
|
|
|
/// `EventReader<E>` (e.g. `EventReader<KeyboardInput>`).
|
|
|
|
#[derive(Event, Debug, Clone, PartialEq, Reflect)]
|
|
|
|
#[reflect(Debug, PartialEq)]
|
|
|
|
#[cfg_attr(
|
|
|
|
feature = "serialize",
|
|
|
|
derive(serde::Serialize, serde::Deserialize),
|
|
|
|
reflect(Serialize, Deserialize)
|
|
|
|
)]
|
|
|
|
pub enum WinitEvent {
|
fix: upgrade to winit v0.30 (#13366)
# Objective
- Upgrade winit to v0.30
- Fixes https://github.com/bevyengine/bevy/issues/13331
## Solution
This is a rewrite/adaptation of the new trait system described and
implemented in `winit` v0.30.
## Migration Guide
The custom UserEvent is now renamed as WakeUp, used to wake up the loop
if anything happens outside the app (a new
[custom_user_event](https://github.com/bevyengine/bevy/pull/13366/files#diff-2de8c0a8d3028d0059a3d80ae31b2bbc1cde2595ce2d317ea378fe3e0cf6ef2d)
shows this behavior.
The internal `UpdateState` has been removed and replaced internally by
the AppLifecycle. When changed, the AppLifecycle is sent as an event.
The `UpdateMode` now accepts only two values: `Continuous` and
`Reactive`, but the latter exposes 3 new properties to enable reactive
to device, user or window events. The previous `UpdateMode::Reactive` is
now equivalent to `UpdateMode::reactive()`, while
`UpdateMode::ReactiveLowPower` to `UpdateMode::reactive_low_power()`.
The `ApplicationLifecycle` has been renamed as `AppLifecycle`, and now
contains the possible values of the application state inside the event
loop:
* `Idle`: the loop has not started yet
* `Running` (previously called `Started`): the loop is running
* `WillSuspend`: the loop is going to be suspended
* `Suspended`: the loop is suspended
* `WillResume`: the loop is going to be resumed
Note: the `Resumed` state has been removed since the resumed app is just
running.
Finally, now that `winit` enables this, it extends the `WinitPlugin` to
support custom events.
## Test platforms
- [x] Windows
- [x] MacOs
- [x] Linux (x11)
- [x] Linux (Wayland)
- [x] Android
- [x] iOS
- [x] WASM/WebGPU
- [x] WASM/WebGL2
## Outstanding issues / regressions
- [ ] iOS: build failed in CI
- blocking, but may just be flakiness
- [x] Cross-platform: when the window is maximised, changes in the scale
factor don't apply, to make them apply one has to make the window
smaller again. (Re-maximising keeps the updated scale factor)
- non-blocking, but good to fix
- [ ] Android: it's pretty easy to quickly open and close the app and
then the music keeps playing when suspended.
- non-blocking but worrying
- [ ] Web: the application will hang when switching tabs
- Not new, duplicate of https://github.com/bevyengine/bevy/issues/13486
- [ ] Cross-platform?: Screenshot failure, `ERROR present_frames:
wgpu_core::present: No work has been submitted for this frame before`
taking the first screenshot, but after pressing space
- non-blocking, but good to fix
---------
Co-authored-by: François <francois.mockers@vleue.com>
2024-06-03 13:06:48 +00:00
|
|
|
AppLifecycle(AppLifecycle),
|
2024-03-03 23:51:53 +00:00
|
|
|
CursorEntered(CursorEntered),
|
|
|
|
CursorLeft(CursorLeft),
|
|
|
|
CursorMoved(CursorMoved),
|
|
|
|
FileDragAndDrop(FileDragAndDrop),
|
|
|
|
Ime(Ime),
|
|
|
|
ReceivedCharacter(ReceivedCharacter),
|
|
|
|
RequestRedraw(RequestRedraw),
|
|
|
|
WindowBackendScaleFactorChanged(WindowBackendScaleFactorChanged),
|
|
|
|
WindowCloseRequested(WindowCloseRequested),
|
|
|
|
WindowCreated(WindowCreated),
|
|
|
|
WindowDestroyed(WindowDestroyed),
|
|
|
|
WindowFocused(WindowFocused),
|
|
|
|
WindowMoved(WindowMoved),
|
|
|
|
WindowOccluded(WindowOccluded),
|
|
|
|
WindowResized(WindowResized),
|
|
|
|
WindowScaleFactorChanged(WindowScaleFactorChanged),
|
|
|
|
WindowThemeChanged(WindowThemeChanged),
|
|
|
|
|
|
|
|
MouseButtonInput(MouseButtonInput),
|
|
|
|
MouseMotion(MouseMotion),
|
|
|
|
MouseWheel(MouseWheel),
|
|
|
|
|
|
|
|
TouchpadMagnify(TouchpadMagnify),
|
|
|
|
TouchpadRotate(TouchpadRotate),
|
|
|
|
|
|
|
|
TouchInput(TouchInput),
|
|
|
|
|
|
|
|
KeyboardInput(KeyboardInput),
|
|
|
|
}
|
|
|
|
|
fix: upgrade to winit v0.30 (#13366)
# Objective
- Upgrade winit to v0.30
- Fixes https://github.com/bevyengine/bevy/issues/13331
## Solution
This is a rewrite/adaptation of the new trait system described and
implemented in `winit` v0.30.
## Migration Guide
The custom UserEvent is now renamed as WakeUp, used to wake up the loop
if anything happens outside the app (a new
[custom_user_event](https://github.com/bevyengine/bevy/pull/13366/files#diff-2de8c0a8d3028d0059a3d80ae31b2bbc1cde2595ce2d317ea378fe3e0cf6ef2d)
shows this behavior.
The internal `UpdateState` has been removed and replaced internally by
the AppLifecycle. When changed, the AppLifecycle is sent as an event.
The `UpdateMode` now accepts only two values: `Continuous` and
`Reactive`, but the latter exposes 3 new properties to enable reactive
to device, user or window events. The previous `UpdateMode::Reactive` is
now equivalent to `UpdateMode::reactive()`, while
`UpdateMode::ReactiveLowPower` to `UpdateMode::reactive_low_power()`.
The `ApplicationLifecycle` has been renamed as `AppLifecycle`, and now
contains the possible values of the application state inside the event
loop:
* `Idle`: the loop has not started yet
* `Running` (previously called `Started`): the loop is running
* `WillSuspend`: the loop is going to be suspended
* `Suspended`: the loop is suspended
* `WillResume`: the loop is going to be resumed
Note: the `Resumed` state has been removed since the resumed app is just
running.
Finally, now that `winit` enables this, it extends the `WinitPlugin` to
support custom events.
## Test platforms
- [x] Windows
- [x] MacOs
- [x] Linux (x11)
- [x] Linux (Wayland)
- [x] Android
- [x] iOS
- [x] WASM/WebGPU
- [x] WASM/WebGL2
## Outstanding issues / regressions
- [ ] iOS: build failed in CI
- blocking, but may just be flakiness
- [x] Cross-platform: when the window is maximised, changes in the scale
factor don't apply, to make them apply one has to make the window
smaller again. (Re-maximising keeps the updated scale factor)
- non-blocking, but good to fix
- [ ] Android: it's pretty easy to quickly open and close the app and
then the music keeps playing when suspended.
- non-blocking but worrying
- [ ] Web: the application will hang when switching tabs
- Not new, duplicate of https://github.com/bevyengine/bevy/issues/13486
- [ ] Cross-platform?: Screenshot failure, `ERROR present_frames:
wgpu_core::present: No work has been submitted for this frame before`
taking the first screenshot, but after pressing space
- non-blocking, but good to fix
---------
Co-authored-by: François <francois.mockers@vleue.com>
2024-06-03 13:06:48 +00:00
|
|
|
impl From<AppLifecycle> for WinitEvent {
|
|
|
|
fn from(e: AppLifecycle) -> Self {
|
|
|
|
Self::AppLifecycle(e)
|
2024-03-03 23:51:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<CursorEntered> for WinitEvent {
|
|
|
|
fn from(e: CursorEntered) -> Self {
|
|
|
|
Self::CursorEntered(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<CursorLeft> for WinitEvent {
|
|
|
|
fn from(e: CursorLeft) -> Self {
|
|
|
|
Self::CursorLeft(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<CursorMoved> for WinitEvent {
|
|
|
|
fn from(e: CursorMoved) -> Self {
|
|
|
|
Self::CursorMoved(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<FileDragAndDrop> for WinitEvent {
|
|
|
|
fn from(e: FileDragAndDrop) -> Self {
|
|
|
|
Self::FileDragAndDrop(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<Ime> for WinitEvent {
|
|
|
|
fn from(e: Ime) -> Self {
|
|
|
|
Self::Ime(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<ReceivedCharacter> for WinitEvent {
|
|
|
|
fn from(e: ReceivedCharacter) -> Self {
|
|
|
|
Self::ReceivedCharacter(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<RequestRedraw> for WinitEvent {
|
|
|
|
fn from(e: RequestRedraw) -> Self {
|
|
|
|
Self::RequestRedraw(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowBackendScaleFactorChanged> for WinitEvent {
|
|
|
|
fn from(e: WindowBackendScaleFactorChanged) -> Self {
|
|
|
|
Self::WindowBackendScaleFactorChanged(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowCloseRequested> for WinitEvent {
|
|
|
|
fn from(e: WindowCloseRequested) -> Self {
|
|
|
|
Self::WindowCloseRequested(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowCreated> for WinitEvent {
|
|
|
|
fn from(e: WindowCreated) -> Self {
|
|
|
|
Self::WindowCreated(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowDestroyed> for WinitEvent {
|
|
|
|
fn from(e: WindowDestroyed) -> Self {
|
|
|
|
Self::WindowDestroyed(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowFocused> for WinitEvent {
|
|
|
|
fn from(e: WindowFocused) -> Self {
|
|
|
|
Self::WindowFocused(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowMoved> for WinitEvent {
|
|
|
|
fn from(e: WindowMoved) -> Self {
|
|
|
|
Self::WindowMoved(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowOccluded> for WinitEvent {
|
|
|
|
fn from(e: WindowOccluded) -> Self {
|
|
|
|
Self::WindowOccluded(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowResized> for WinitEvent {
|
|
|
|
fn from(e: WindowResized) -> Self {
|
|
|
|
Self::WindowResized(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowScaleFactorChanged> for WinitEvent {
|
|
|
|
fn from(e: WindowScaleFactorChanged) -> Self {
|
|
|
|
Self::WindowScaleFactorChanged(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<WindowThemeChanged> for WinitEvent {
|
|
|
|
fn from(e: WindowThemeChanged) -> Self {
|
|
|
|
Self::WindowThemeChanged(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<MouseButtonInput> for WinitEvent {
|
|
|
|
fn from(e: MouseButtonInput) -> Self {
|
|
|
|
Self::MouseButtonInput(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<MouseMotion> for WinitEvent {
|
|
|
|
fn from(e: MouseMotion) -> Self {
|
|
|
|
Self::MouseMotion(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<MouseWheel> for WinitEvent {
|
|
|
|
fn from(e: MouseWheel) -> Self {
|
|
|
|
Self::MouseWheel(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<TouchpadMagnify> for WinitEvent {
|
|
|
|
fn from(e: TouchpadMagnify) -> Self {
|
|
|
|
Self::TouchpadMagnify(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<TouchpadRotate> for WinitEvent {
|
|
|
|
fn from(e: TouchpadRotate) -> Self {
|
|
|
|
Self::TouchpadRotate(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<TouchInput> for WinitEvent {
|
|
|
|
fn from(e: TouchInput) -> Self {
|
|
|
|
Self::TouchInput(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<KeyboardInput> for WinitEvent {
|
|
|
|
fn from(e: KeyboardInput) -> Self {
|
|
|
|
Self::KeyboardInput(e)
|
|
|
|
}
|
|
|
|
}
|