From 1a0a859feccb37526f07f4de4e5873ce7ab2c089 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 8 Dec 2024 18:49:41 +0200 Subject: [PATCH] refactor(devt-tools): remove custom inspector --- src/dev_tools/plugin.rs | 8 ++++---- src/dev_tools/ui/inspector.rs | 20 -------------------- src/dev_tools/ui/mod.rs | 2 -- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 src/dev_tools/ui/inspector.rs diff --git a/src/dev_tools/plugin.rs b/src/dev_tools/plugin.rs index 660cf20..f94886a 100644 --- a/src/dev_tools/plugin.rs +++ b/src/dev_tools/plugin.rs @@ -8,9 +8,9 @@ use bevy::{ prelude::*, }; use bevy_egui::EguiPlugin; -use bevy_inspector_egui::DefaultInspectorConfigPlugin; +use bevy_inspector_egui::quick::WorldInspectorPlugin; -use super::ui::{inspector_ui, maze_controls_ui}; +use super::ui::maze_controls_ui; #[derive(Debug)] pub struct DevToolsPlugin; @@ -19,9 +19,9 @@ impl Plugin for DevToolsPlugin { fn build(&self, app: &mut App) { app.add_systems(Update, log_transitions::) .add_plugins(EguiPlugin) + .add_plugins(WorldInspectorPlugin::new()) .add_plugins(DebugUiPlugin) - .add_plugins(DefaultInspectorConfigPlugin) - .add_systems(Update, (inspector_ui, maze_controls_ui)) + .add_systems(Update, maze_controls_ui) .add_systems( Update, toggle_debug_ui.run_if(input_just_pressed(TOGGLE_KEY)), diff --git a/src/dev_tools/ui/inspector.rs b/src/dev_tools/ui/inspector.rs deleted file mode 100644 index 04c8212..0000000 --- a/src/dev_tools/ui/inspector.rs +++ /dev/null @@ -1,20 +0,0 @@ -use bevy::{prelude::*, window::PrimaryWindow}; -use bevy_egui::egui::{self, ScrollArea}; -use bevy_inspector_egui::bevy_egui::EguiContext; - -pub(crate) fn inspector_ui(world: &mut World) { - let Ok(egui_context) = world - .query_filtered::<&mut EguiContext, With>() - .get_single(world) - else { - return; - }; - - let mut egui_context = egui_context.clone(); - - egui::Window::new("UI").show(egui_context.get_mut(), |ui| { - ScrollArea::vertical().show(ui, |ui| { - bevy_inspector_egui::bevy_inspector::ui_for_world(world, ui); - }); - }); -} diff --git a/src/dev_tools/ui/mod.rs b/src/dev_tools/ui/mod.rs index 6aca3ec..63c404f 100644 --- a/src/dev_tools/ui/mod.rs +++ b/src/dev_tools/ui/mod.rs @@ -1,5 +1,3 @@ -mod inspector; mod maze_controls; -pub(crate) use inspector::inspector_ui; pub(crate) use maze_controls::maze_controls_ui;