chore: update to bevy 0.17

Author: nuzzles

CHANGELOG.md

@@ -10,6 +10,16 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
 
 ## Unreleased
 
+## 0.8.0
+
+### Added
+
+- Egui support with the `bevy_egui_0_38` feature. This will make inputs ignored during egui focus.
+
+### Changed
+
+- Updated to bevy 0.17
+
 ## 0.7.0
 
 ### Added

Cargo.toml

@@ -4,7 +4,7 @@ members = ["examples/run_wasm", "examples/demo"]
 
 [workspace.package]
 edition = "2021"
-version = "0.7.0"
+version = "0.8.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/loopystudios/bevy_ogle"
 
@@ -24,7 +24,7 @@ readme = "README.md"
 
 
 [workspace.dependencies]
-bevy = { version = "0.16.0", default-features = false }
+bevy = { version = "0.17.3", default-features = false }
 
 [dependencies]
 bevy = { workspace = true, default-features = false, features = [
@@ -33,9 +33,12 @@ bevy = { workspace = true, default-features = false, features = [
 ] }
 dolly = "0.6.0"
 mint = "0.5.9"
+bevy_egui_0_38 = { package = "bevy_egui", version = "0.38.1", optional = true, default-features = false }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.50"
+wasm-bindgen-test = "0.3.56"
 
 [features]
-default = []
+default = ["bevy_egui_0_38"]
+bevy_egui_0_38 = ["dep:bevy_egui_0_38", "internal_bevy_egui"]
+internal_bevy_egui = []

README.md

@@ -24,7 +24,8 @@ cargo run -p demo
 
 |bevy|bevy_ogle|
 |---|---|
-|0.16|0.5-0.7, main|
+|0.17|0.8,main|
+|0.16|0.5-0.7|
 |0.15|0.3-0.4|
 |0.14|0.1-0.2|
 |< 0.13| unsupported |

examples/demo/Cargo.toml

@@ -10,5 +10,5 @@ publish = false
 [dependencies]
 bevy = { workspace = true, default-features = true }
 bevy_ogle = { path = "../.." }
-bevy_egui = "0.36.0"
+bevy_egui = "0.38.1"
 rand = "0.9.1"

src/egui_support.rs

@@ -0,0 +1,40 @@
+use bevy::prelude::*;
+
+use crate::OgleSystems;
+
+#[derive(Resource, Deref, DerefMut, PartialEq, Eq, Default)]
+struct EguiWantsFocus(bool);
+
+pub(crate) struct EguiPanCamPlugin;
+
+impl Plugin for EguiPanCamPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<EguiWantsFocus>()
+            .add_systems(PostUpdate, check_egui_wants_focus)
+            .configure_sets(
+                Update,
+                OgleSystems.run_if(resource_equals(EguiWantsFocus(false))),
+            );
+    }
+}
+
+// todo: make run condition when Bevy supports mutable resources in them
+fn check_egui_wants_focus(
+    #[cfg(feature = "bevy_egui_0_38")] mut contexts_0_38: Query<&mut bevy_egui_0_38::EguiContext>,
+    mut wants_focus: ResMut<EguiWantsFocus>,
+) {
+    let mut new_wants_focus = false;
+
+    #[cfg(feature = "bevy_egui_0_38")]
+    {
+        let ctx = contexts_0_38.iter_mut().next();
+        if let Some(ctx) = ctx {
+            let ctx = ctx.into_inner().get_mut();
+            if ctx.wants_keyboard_input() || ctx.is_using_pointer() {
+                new_wants_focus = true;
+            }
+        }
+    }
+
+    wants_focus.set_if_neq(EguiWantsFocus(new_wants_focus));
+}

src/lib.rs

@@ -6,9 +6,12 @@ mod systems;
 mod plugin;
 pub use plugin::OglePlugin;
 
-/// System set to allow ordering of `OglePlugin`
+#[cfg(feature = "internal_bevy_egui")]
+mod egui_support;
+
+/// System sets of the camera
 #[derive(Debug, Clone, Copy, SystemSet, PartialEq, Eq, Hash)]
-pub struct OgleSystemSet;
+pub struct OgleSystems;
 
 #[derive(Component, Debug)]
 #[require(Camera2d)]

src/plugin.rs

@@ -1,4 +1,4 @@
-use crate::{systems, OgleSystemSet};
+use crate::{systems, OgleSystems};
 use bevy::prelude::*;
 
 #[derive(Default)]
@@ -16,7 +16,10 @@ impl Plugin for OglePlugin {
                 systems::commit_camera_changes,
             )
                 .chain()
-                .in_set(OgleSystemSet),
+                .in_set(OgleSystems),
         );
+
+        #[cfg(feature = "internal_bevy_egui")]
+        app.add_plugins(crate::egui_support::EguiPanCamPlugin);
     }
 }

src/systems.rs

@@ -49,7 +49,7 @@ pub fn do_follow_target(query_transform: Query<&Transform>, mut query_cam: Query
 
 pub fn do_camera_zooming(
     mut query_cam: Query<&mut OgleCam>,
-    mut scroll_events: EventReader<MouseWheel>,
+    mut scroll_events: MessageReader<MouseWheel>,
 ) {
     for mut cam in query_cam.iter_mut() {
         match cam.mode {