Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to bevy_egui 0.30 #372

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −9
Open

Update to bevy_egui 0.30 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
655f443
Update to hardcoded bevy_egui 0.30.
hammypants Nov 9, 2024
0e250bc
This too.
hammypants Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
Expand Down
2 changes: 1 addition & 1 deletion backends/bevy_picking_egui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion src/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
6 changes: 0 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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);
Expand Down
Loading