update bevy_egui to 0.35, bump bevy to 0.16.1 (#115)

Author: kiperz

Cargo.toml

@@ -15,17 +15,17 @@ readme = "README.md"
 bevy_egui = ["dep:bevy_egui"]
 
 [dependencies]
-bevy = { version = "0.16", default-features = false, features = [
+bevy = { version = "0.16.1", default-features = false, features = [
     "bevy_core_pipeline",
     "bevy_render",
     "bevy_window",
 ] }
-bevy_egui = { version = "0.34", optional = true, default-features = false }
+bevy_egui = { version = "0.35", optional = true, default-features = false }
 
 [dev-dependencies]
-bevy = { version = "0.16" }
+bevy = { version = "0.16.1" }
 float-cmp = "0.10.0"
-bevy_egui = { version = "0.34", default-features = false, features = [
+bevy_egui = { version = "0.35", default-features = false, features = [
     "render",
     "default_fonts",
 ] }

examples/egui.rs

@@ -2,18 +2,16 @@
 //! egui windows
 
 use bevy::prelude::*;
-use bevy_egui::{egui, EguiContexts, EguiPlugin};
+use bevy_egui::{egui, EguiContexts, EguiPlugin, EguiPrimaryContextPass};
 use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin};
 
 fn main() {
     let mut app = App::new();
     app.add_plugins(DefaultPlugins)
-        .add_plugins(EguiPlugin {
-            enable_multipass_for_primary_context: false,
-        })
+        .add_plugins(EguiPlugin::default())
         .add_plugins(PanOrbitCameraPlugin)
         .add_systems(Startup, setup)
-        .add_systems(Update, ui_example_system);
+        .add_systems(EguiPrimaryContextPass, ui_example_system);
 
     app.run();
 }
@@ -49,20 +47,21 @@ fn setup(
     ));
 }
 
-fn ui_example_system(mut contexts: EguiContexts) {
+fn ui_example_system(mut contexts: EguiContexts) -> Result {
     egui::SidePanel::left("left_panel")
         .resizable(true)
-        .show(contexts.ctx_mut(), |ui| {
+        .show(contexts.ctx_mut()?, |ui| {
             ui.label("Left resizeable panel");
         });
 
-    egui::Window::new("Movable Window").show(contexts.ctx_mut(), |ui| {
+    egui::Window::new("Movable Window").show(contexts.ctx_mut()?, |ui| {
         ui.label("Hello world");
     });
 
     egui::Window::new("Immovable Window")
         .movable(false)
-        .show(contexts.ctx_mut(), |ui| {
+        .show(contexts.ctx_mut()?, |ui| {
             ui.label("Hello world");
         });
+    Ok(())
 }

examples/egui_multiple_windows.rs

@@ -2,21 +2,26 @@
 //! This is a combination of the egui and multiple_windows examples, and doesn't show anything new,
 //! it's primarily here for easy e2e testing.
 
-use bevy::prelude::*;
 use bevy::render::camera::RenderTarget;
 use bevy::window::WindowRef;
-use bevy_egui::{egui, EguiContexts, EguiPlugin};
+use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
+use bevy_egui::{
+    egui, EguiContext, EguiMultipassSchedule, EguiPlugin, EguiPrimaryContextPass,
+    PrimaryEguiContext,
+};
 use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin};
 
+#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
+pub struct SecondWindowContextPass;
+
 fn main() {
     let mut app = App::new();
     app.add_plugins(DefaultPlugins)
-        .add_plugins(EguiPlugin {
-            enable_multipass_for_primary_context: false,
-        })
+        .add_plugins(EguiPlugin::default())
         .add_plugins(PanOrbitCameraPlugin)
         .add_systems(Startup, setup)
-        .add_systems(Update, ui_example_system);
+        .add_systems(EguiPrimaryContextPass, ui_example_system_first_window)
+        .add_systems(SecondWindowContextPass, ui_example_system_second_window);
 
     app.run();
 }
@@ -49,6 +54,7 @@ fn setup(
     commands.spawn((
         Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)),
         PanOrbitCamera::default(),
+        PrimaryEguiContext,
     ));
 
     // Spawn a second window
@@ -67,13 +73,24 @@ fn setup(
         },
         Transform::from_translation(Vec3::new(5.0, 1.5, 7.0)),
         PanOrbitCamera::default(),
+        EguiMultipassSchedule::new(SecondWindowContextPass),
     ));
 }
 
-fn ui_example_system(mut contexts: EguiContexts, windows: Query<Entity, With<Window>>) {
-    for window in windows.iter() {
-        egui::Window::new("Hello").show(contexts.ctx_for_entity_mut(window), |ui| {
-            ui.label("world");
-        });
-    }
+fn ui_example_system_first_window(
+    mut egui_ctx: Single<&mut EguiContext, With<PrimaryEguiContext>>,
+) -> Result {
+    egui::Window::new("Hello").show(egui_ctx.get_mut(), |ui| {
+        ui.label("world");
+    });
+    Ok(())
+}
+
+fn ui_example_system_second_window(
+    mut egui_ctx: Single<&mut EguiContext, Without<PrimaryEguiContext>>,
+) -> Result {
+    egui::Window::new("Hello").show(egui_ctx.get_mut(), |ui| {
+        ui.label("world2");
+    });
+    Ok(())
 }

src/egui.rs

@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use bevy_egui::EguiContext;
 
 /// A resource that tracks whether egui wants focus on the current and previous frames,
 /// in order to determine whether PanOrbitCamera should react to input events.
@@ -29,29 +30,27 @@ pub struct EguiWantsFocus {
 pub struct EguiFocusIncludesHover(pub bool);
 
 pub fn check_egui_wants_focus(
-    mut contexts: bevy_egui::EguiContexts,
+    mut contexts: Query<&mut EguiContext>,
     mut wants_focus: ResMut<EguiWantsFocus>,
     include_hover: Res<EguiFocusIncludesHover>,
-    windows: Query<Entity, With<Window>>,
-) {
-    // The window that the user is interacting with and the window that contains the egui context
-    // that the user is interacting with are always going to be the same. Therefore, we can assume
-    // that if any of the egui contexts want focus, then it must be the one that the user is
-    // interacting with.
-    let new_wants_focus = windows.iter().any(|window| {
-        if let Some(ctx) = contexts.try_ctx_for_entity_mut(window) {
-            let mut value = ctx.wants_pointer_input() || ctx.wants_keyboard_input();
-            if include_hover.0 {
-                value |= ctx.is_pointer_over_area()
-            }
-            value
-        } else {
-            false
+) -> Result {
+    // Check all egui contexts to see if any of them want focus. If any context wants focus,
+    // we assume that's the one the user is interacting with and prevent camera input.
+    let mut new_wants_focus = false;
+    for mut context in contexts.iter_mut() {
+        let context = context.get_mut();
+        let mut context_wants_focus =
+            context.wants_pointer_input() || context.wants_keyboard_input();
+        if include_hover.0 {
+            context_wants_focus |= context.is_pointer_over_area();
         }
-    });
+        new_wants_focus |= context_wants_focus;
+    }
+
     let new_res = EguiWantsFocus {
         prev: wants_focus.curr,
         curr: new_wants_focus,
     };
     wants_focus.set_if_neq(new_res);
+    Ok(())
 }