Make input systems disable-able (#346)

* Make input systems disable-able * Fix the docs
vladbat00 · Jan 5, 2025 · ace4aee · ace4aee
1 parent f2a157e
commit ace4aee
Show file tree

Hide file tree

Showing 10 changed files with 311 additions and 85 deletions.
diff --git a/examples/color_test.rs b/examples/color_test.rs
@@ -6,7 +6,7 @@ use bevy::{
 use bevy_egui::{
     helpers::vec2_into_egui_pos2,
     input::{EguiContextPointerPosition, HoveredNonWindowEguiContext},
-    EguiContext, EguiContexts, EguiInputSet, EguiPlugin, EguiRenderToImage, EguiSettings,
+    EguiContext, EguiContextSettings, EguiContexts, EguiInputSet, EguiPlugin, EguiRenderToImage,
 };
 
 fn main() {
@@ -157,7 +157,7 @@ fn update_egui_hovered_context(
         (
             Entity,
             &mut EguiContextPointerPosition,
-            &EguiSettings,
+            &EguiContextSettings,
             Option<&Mesh2d>,
         ),
         (With<EguiContext>, Without<PrimaryWindow>),

diff --git a/examples/simple_multipass.rs b/examples/simple_multipass.rs
@@ -1,7 +1,9 @@
 use std::num::NonZero;
 
 use bevy::prelude::*;
-use bevy_egui::{EguiContext, EguiFullOutput, EguiInput, EguiPlugin, EguiSettings, EguiStartupSet};
+use bevy_egui::{
+    EguiContext, EguiContextSettings, EguiFullOutput, EguiInput, EguiPlugin, EguiStartupSet,
+};
 
 fn main() {
     App::new()
@@ -15,7 +17,7 @@ fn main() {
         .run();
 }
 
-fn configure_context(mut egui_settings: Query<&mut EguiSettings>) {
+fn configure_context(mut egui_settings: Query<&mut EguiContextSettings>) {
     egui_settings.single_mut().run_manually = true;
 }
 

diff --git a/examples/ui.rs b/examples/ui.rs
@@ -2,7 +2,7 @@ use bevy::{
     log::{Level, LogPlugin},
     prelude::*,
 };
-use bevy_egui::{EguiContexts, EguiPlugin, EguiSettings};
+use bevy_egui::{EguiContextSettings, EguiContexts, EguiPlugin};
 
 struct Images {
     bevy_icon: Handle<Image>,
@@ -74,7 +74,7 @@ fn configure_ui_state_system(mut ui_state: ResMut<UiState>) {
 fn update_ui_scale_factor_system(
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut toggle_scale_factor: Local<Option<bool>>,
-    mut contexts: Query<(&mut EguiSettings, &Window)>,
+    mut contexts: Query<(&mut EguiContextSettings, &Window)>,
 ) {
     if keyboard_input.just_pressed(KeyCode::Slash) || toggle_scale_factor.is_none() {
         *toggle_scale_factor = Some(!toggle_scale_factor.unwrap_or(true));

diff --git a/src/egui_node.rs b/src/egui_node.rs
@@ -2,7 +2,7 @@ use crate::{
     render_systems::{
         EguiPipelines, EguiTextureBindGroups, EguiTextureId, EguiTransform, EguiTransforms,
     },
-    EguiRenderOutput, EguiRenderToImage, EguiSettings, RenderTargetSize,
+    EguiContextSettings, EguiRenderOutput, EguiRenderToImage, RenderTargetSize,
 };
 use bevy_asset::prelude::*;
 use bevy_ecs::{
@@ -248,7 +248,7 @@ impl EguiNode {
 impl Node for EguiNode {
     fn update(&mut self, world: &mut World) {
         let mut render_target_query = world.query::<(
-            &EguiSettings,
+            &EguiContextSettings,
             &RenderTargetSize,
             &mut EguiRenderOutput,
             Option<&EguiRenderToImage>,