 061bee7e3c
			
		
	
	
		061bee7e3c
		
			
		
	
	
	
	
		
			
			# 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>
		
			
				
	
	
		
			123 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			123 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Shows how to create a custom event that can be handled by `winit`'s event loop.
 | |
| 
 | |
| use bevy::prelude::*;
 | |
| use bevy::winit::{EventLoopProxy, WakeUp, WinitPlugin};
 | |
| use std::fmt::Formatter;
 | |
| use std::sync::OnceLock;
 | |
| 
 | |
| #[derive(Default, Debug, Event)]
 | |
| enum CustomEvent {
 | |
|     #[default]
 | |
|     WakeUp,
 | |
|     Key(char),
 | |
| }
 | |
| 
 | |
| impl std::fmt::Display for CustomEvent {
 | |
|     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
 | |
|         match self {
 | |
|             Self::WakeUp => write!(f, "Wake up"),
 | |
|             Self::Key(ch) => write!(f, "Key: {ch}"),
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| static EVENT_LOOP_PROXY: OnceLock<EventLoopProxy<CustomEvent>> = OnceLock::new();
 | |
| 
 | |
| fn main() {
 | |
|     let winit_plugin = WinitPlugin::<CustomEvent>::default();
 | |
| 
 | |
|     App::new()
 | |
|         .add_plugins(
 | |
|             DefaultPlugins
 | |
|                 .build()
 | |
|                 // Only one event type can be handled at once
 | |
|                 // so we must disable the default event type
 | |
|                 .disable::<WinitPlugin<WakeUp>>()
 | |
|                 .add(winit_plugin),
 | |
|         )
 | |
|         .add_systems(
 | |
|             Startup,
 | |
|             (
 | |
|                 setup,
 | |
|                 expose_event_loop_proxy,
 | |
|                 #[cfg(target_arch = "wasm32")]
 | |
|                 wasm::setup_js_closure,
 | |
|             ),
 | |
|         )
 | |
|         .add_systems(Update, (send_event, handle_event))
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| fn setup(mut commands: Commands) {
 | |
|     commands.spawn(Camera2dBundle::default());
 | |
| }
 | |
| 
 | |
| fn send_event(input: Res<ButtonInput<KeyCode>>) {
 | |
|     let Some(event_loop_proxy) = EVENT_LOOP_PROXY.get() else {
 | |
|         return;
 | |
|     };
 | |
| 
 | |
|     if input.just_pressed(KeyCode::Space) {
 | |
|         let _ = event_loop_proxy.send_event(CustomEvent::WakeUp);
 | |
|     }
 | |
| 
 | |
|     // This simulates sending a custom event through an external thread.
 | |
|     #[cfg(not(target_arch = "wasm32"))]
 | |
|     if input.just_pressed(KeyCode::KeyE) {
 | |
|         let handler = std::thread::spawn(|| {
 | |
|             let _ = event_loop_proxy.send_event(CustomEvent::Key('e'));
 | |
|         });
 | |
| 
 | |
|         handler.join().unwrap();
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn expose_event_loop_proxy(event_loop_proxy: NonSend<EventLoopProxy<CustomEvent>>) {
 | |
|     EVENT_LOOP_PROXY.set((*event_loop_proxy).clone()).unwrap();
 | |
| }
 | |
| 
 | |
| fn handle_event(mut events: EventReader<CustomEvent>) {
 | |
|     for evt in events.read() {
 | |
|         info!("Received event: {evt:?}");
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// Since the [`EventLoopProxy`] can be exposed to the javascript environment, it can
 | |
| /// be used to send events inside the loop, to be handled by a system or simply to wake up
 | |
| /// the loop if that's currently waiting for a timeout or a user event.
 | |
| #[cfg(target_arch = "wasm32")]
 | |
| pub(crate) mod wasm {
 | |
|     use crate::{CustomEvent, EVENT_LOOP_PROXY};
 | |
|     use wasm_bindgen::prelude::*;
 | |
|     use wasm_bindgen::JsCast;
 | |
|     use web_sys::KeyboardEvent;
 | |
| 
 | |
|     pub(crate) fn setup_js_closure() {
 | |
|         let window = web_sys::window().unwrap();
 | |
|         let document = window.document().unwrap();
 | |
| 
 | |
|         let closure = Closure::wrap(Box::new(move |event: KeyboardEvent| {
 | |
|             let key = event.key();
 | |
|             if key == "e" {
 | |
|                 send_custom_event('e').unwrap();
 | |
|             }
 | |
|         }) as Box<dyn FnMut(KeyboardEvent)>);
 | |
| 
 | |
|         document
 | |
|             .add_event_listener_with_callback("keydown", closure.as_ref().unchecked_ref())
 | |
|             .unwrap();
 | |
| 
 | |
|         closure.forget();
 | |
|     }
 | |
| 
 | |
|     fn send_custom_event(ch: char) -> Result<(), String> {
 | |
|         if let Some(proxy) = EVENT_LOOP_PROXY.get() {
 | |
|             proxy
 | |
|                 .send_event(CustomEvent::Key(ch))
 | |
|                 .map_err(|_| "Failed to send event".to_string())
 | |
|         } else {
 | |
|             Err("Event loop proxy not found".to_string())
 | |
|         }
 | |
|     }
 | |
| }
 |