From 655f443a626b7fda5b22b6ad59c542b2b3fadc9b Mon Sep 17 00:00:00 2001 From: cory richerson Date: Sat, 9 Nov 2024 00:26:58 -0500 Subject: [PATCH 1/2] Update to hardcoded bevy_egui 0.30. --- Cargo.toml | 2 +- src/debug.rs | 2 +- src/lib.rs | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ad067f0d..23846831 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ bevy_color = { version = "0.14.0", optional = true, default-features = false } bevy_ui = { version = "0.14.0", optional = true, default-features = false } bevy_eventlistener = "0.8.0" -bevy_egui = { optional = true, version = "0.28.0" } # >=0.28, <=0.XX +bevy_egui = { optional = true, version = "0.30" } bevy_rapier3d = { optional = true, version = "0.27.0-rc.1" } bevy_xpbd_3d = { optional = true, version = "0.5.0" } avian3d = { optional = true, version = '0.1' } diff --git a/src/debug.rs b/src/debug.rs index 3f49128e..1439acd2 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -306,7 +306,7 @@ pub fn debug_draw_egui( let NormalizedRenderTarget::Window(window_ref) = location.target else { continue; }; - let ctx = egui.ctx_for_window_mut(window_ref.entity()); + let ctx = egui.ctx_for_entity_mut(window_ref.entity()); let to_egui_pos = |v: Vec2| egui::pos2(v.x, v.y); let dbg_painter = ctx.layer_painter(egui::LayerId::debug()); diff --git a/src/lib.rs b/src/lib.rs index bc6b2605..4a368bd5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -256,8 +256,6 @@ pub mod prelude { pub use backends::rapier::prelude::*; #[cfg(feature = "backend_raycast")] pub use backends::raycast::prelude::*; - #[cfg(feature = "backend_shader")] - pub use backends::shader::prelude::*; #[cfg(feature = "backend_sprite")] pub use backends::sprite::prelude::*; #[cfg(feature = "backend_xpbd")] @@ -342,10 +340,6 @@ impl bevy_app::PluginGroup for DefaultPickingPlugins { { builder = builder.add(bevy_picking_xpbd::XpbdBackend); } - #[cfg(feature = "backend_shader")] - { - builder = builder.add(bevy_picking_shader::ShaderBackend); - } #[cfg(feature = "backend_sprite")] { builder = builder.add(bevy_picking_sprite::SpriteBackend); From 0e250bca9fa7449ad64e1b4858dbf3d94d82bf30 Mon Sep 17 00:00:00 2001 From: cory richerson Date: Sat, 9 Nov 2024 01:11:33 -0500 Subject: [PATCH 2/2] This too. --- backends/bevy_picking_egui/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/bevy_picking_egui/Cargo.toml b/backends/bevy_picking_egui/Cargo.toml index ce0223e1..58d4fdb8 100644 --- a/backends/bevy_picking_egui/Cargo.toml +++ b/backends/bevy_picking_egui/Cargo.toml @@ -18,7 +18,7 @@ bevy_ecs = { version = "0.14.0", default-features = false } bevy_reflect = { version = "0.14.0", default-features = false } bevy_render = { version = "0.14.0", default-features = false } -bevy_egui = "0.28" +bevy_egui = "0.30" # Local bevy_picking_core = { path = "../../crates/bevy_picking_core", version = "0.20.0" } bevy_picking_selection = { path = "../../crates/bevy_picking_selection", optional = true, version = "0.20.0" }