From 6277d0e81e982a00d88b0295391301fbc03172e0 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Thu, 3 Jul 2025 16:40:53 +0100 Subject: [PATCH] Updated to Bevy 0.16. --- .gitignore | 2 ++ Cargo.toml | 7 ++++--- examples/anchors.rs | 10 +++------- examples/fullscreen.rs | 8 ++++---- examples/leptos-csr/leptos-ui.rs | 2 +- examples/leptos-csr/ui/dist/index.html | 6 +++--- .../ui/dist/ui-4806616c12bf9cb4_bg.wasm | Bin 524080 -> 0 bytes ...6616c12bf9cb4.js => ui-beddfcf870bf0c04.js} | 8 ++++---- .../ui/dist/ui-beddfcf870bf0c04_bg.wasm | Bin 0 -> 513423 bytes src/components/webview.rs | 4 ++-- src/lib.rs | 4 ++-- src/systems/events.rs | 2 +- src/systems/webview.rs | 8 ++++---- 13 files changed, 30 insertions(+), 31 deletions(-) delete mode 100644 examples/leptos-csr/ui/dist/ui-4806616c12bf9cb4_bg.wasm rename examples/leptos-csr/ui/dist/{ui-4806616c12bf9cb4.js => ui-beddfcf870bf0c04.js} (98%) create mode 100644 examples/leptos-csr/ui/dist/ui-beddfcf870bf0c04_bg.wasm diff --git a/.gitignore b/.gitignore index 3df35fc..039c2dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /target /Cargo.lock /.nvim +examples/leptos-csr/ui/target +examples/leptos-ssr/ui/target diff --git a/Cargo.toml b/Cargo.toml index 0961a58..d58edbe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,18 +11,19 @@ repository = "https://github.com/PawelBis/bevy_wry" [dependencies] wry = { version = "0.48.1", features = ["transparent", "devtools"] } -bevy = { version = "0.15", default-features = false, features = ["bevy_winit"] } +bevy = { version = "0.16", default-features = false, features = ["bevy_winit"] } winit = { version = "0.30", features = ["rwh_06"] } thiserror = "1.0" -serde = { version = "1.0", default-features = false } +serde = { version = "1.0", default-features = false, features = ["derive"] } serde_json = { version = "1.0" } +hashbrown = "0.15.4" [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] gtk = { version = "0.18" } x11-dl = "2.21.0" [dev-dependencies] -bevy = { version = "0.15", default-features = true } +bevy = { version = "0.16", default-features = true } [[example]] name = "fullscreen" diff --git a/examples/anchors.rs b/examples/anchors.rs index 1ca3bf2..bd58536 100644 --- a/examples/anchors.rs +++ b/examples/anchors.rs @@ -72,13 +72,9 @@ fn setup(mut commands: Commands) { fn next_anchor( _: Trigger, mut exit_writer: EventWriter, - mut webviews: Query<&mut Anchor, With>, + webviews: Single<&mut Anchor, With>, ) { - if webviews.is_empty() { - return; - } - - let mut anchor = webviews.single_mut(); + let mut anchor = webviews.into_inner(); let new_anchor = match *anchor { Anchor::Top => Anchor::TopRight, Anchor::Bottom => Anchor::BottomLeft, @@ -96,7 +92,7 @@ fn next_anchor( Anchor::CenterVerticalStretch => Anchor::CenterHorizontalStretch, Anchor::CenterHorizontalStretch => Anchor::FullScreen, Anchor::FullScreen => { - exit_writer.send(AppExit::Success); + exit_writer.write(AppExit::Success); return; } }; diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs index 7888851..f82fa29 100644 --- a/examples/fullscreen.rs +++ b/examples/fullscreen.rs @@ -68,14 +68,14 @@ fn in_commands( trigger: Trigger, mut commands: Commands, mut exit_writer: EventWriter, - mut sprite: Query<(&mut Transform, &Sprite)>, + sprite: Single<(&mut Transform, &Sprite)>, ) { let event = trigger.event(); - let webview_entity = trigger.entity(); + let webview_entity = trigger.target(); match event { InCommand::Rotate { angle } => { - let (mut transform, _) = sprite.single_mut(); + let (mut transform, _) = sprite.into_inner(); transform.rotate_z(f32::to_radians(*angle)); let (_, z) = transform.rotation.to_axis_angle(); @@ -84,7 +84,7 @@ fn in_commands( } } InCommand::Exit => { - exit_writer.send(AppExit::Success); + exit_writer.write(AppExit::Success); } } } diff --git a/examples/leptos-csr/leptos-ui.rs b/examples/leptos-csr/leptos-ui.rs index bcf3688..a499879 100644 --- a/examples/leptos-csr/leptos-ui.rs +++ b/examples/leptos-csr/leptos-ui.rs @@ -25,7 +25,7 @@ impl Drop for CommandGuard { fn main() { let manifest_path = env::var("CARGO_MANIFEST_DIR").unwrap(); - let ui_path = format!("{manifest_path}/examples/leptos/ui"); + let ui_path = format!("{manifest_path}/examples/leptos-csr/ui"); // Use trunk to build `ui` which is a leptos project Command::new("trunk") diff --git a/examples/leptos-csr/ui/dist/index.html b/examples/leptos-csr/ui/dist/index.html index acfc77c..300f6c5 100644 --- a/examples/leptos-csr/ui/dist/index.html +++ b/examples/leptos-csr/ui/dist/index.html @@ -1,10 +1,10 @@ - +