re-enable inspector

dimforge · Nov 7, 2024 · 8dc9d5f · 8dc9d5f
1 parent 7c29a87
commit 8dc9d5f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,9 +20,10 @@ codegen-units = 1
 #parry3d = { path = "../parry/crates/parry3d" }
 #rapier2d = { path = "../rapier/crates/rapier2d" }
 #rapier3d = { path = "../rapier/crates/rapier3d" }
-
 #nalgebra = { git = "https://github.com/dimforge/nalgebra", branch = "dev" }
 #parry2d = { git = "https://github.com/dimforge/parry", branch = "master" }
 #parry3d = { git = "https://github.com/dimforge/parry", branch = "master" }
 #rapier2d = { git = "https://github.com/dimforge/rapier", branch = "character-controller" }
 #rapier3d = { git = "https://github.com/dimforge/rapier", branch = "character-controller" }
+bevy_egui = { git = "https://github.com/Vrixyz/bevy_egui", branch = "bevy_main" }
+bevy-inspector-egui = { git = "https://github.com/Vrixyz/bevy-inspector-egui", branch = "bevy_0.15" }
diff --git a/bevy_rapier2d/Cargo.toml b/bevy_rapier2d/Cargo.toml
@@ -65,8 +65,8 @@ bevy = { version = "0.15.0-rc.2", default-features = false, features = [
 oorandom = "11"
 approx = "0.5.1"
 glam = { version = "0.29", features = ["approx"] }
-# bevy-inspector-egui = "0.25.1"
-# bevy_egui = "0.28.0"
+bevy-inspector-egui = "0.28.0"
+bevy_egui = "0.30.0"
 # bevy_mod_debugdump = "0.11"
 bevy_mod_debugdump = { git = "https://github.com/andriyDev/bevy_mod_debugdump.git", branch = "bevy-0.15" }
 

diff --git a/bevy_rapier2d/examples/testbed2.rs b/bevy_rapier2d/examples/testbed2.rs
@@ -13,8 +13,8 @@ mod player_movement2;
 mod rope_joint2;
 
 use bevy::prelude::*;
-// use bevy_egui::{egui, EguiContexts, EguiPlugin};
-//use bevy_inspector_egui::quick::WorldInspectorPlugin;
+use bevy_egui::{egui, EguiContexts, EguiPlugin};
+use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use bevy_rapier2d::prelude::*;
 
 #[derive(Debug, Reflect, Clone, Copy, Eq, PartialEq, Default, Hash, States)]
@@ -62,10 +62,10 @@ fn main() {
     app.init_resource::<ExamplesRes>()
         .add_plugins((
             DefaultPlugins,
-            //EguiPlugin,
+            EguiPlugin,
             RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(10.0),
             RapierDebugRenderPlugin::default(),
-            //WorldInspectorPlugin::new(),
+            WorldInspectorPlugin::new(),
         ))
         .register_type::<Examples>()
         .register_type::<ExamplesRes>()

diff --git a/bevy_rapier3d/Cargo.toml b/bevy_rapier3d/Cargo.toml
@@ -58,16 +58,16 @@ log = "0.4"
 serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.15.0-rc.2", default-features = false, features = [
+bevy = { version = "0.15.0-rc.3", default-features = false, features = [
     "x11",
     "tonemapping_luts",
     "bevy_state",
     "bevy_debug_stepping",
 ] }
 approx = "0.5.1"
 glam = { version = "0.29", features = ["approx"] }
-# bevy-inspector-egui = "0.25.1"
-# bevy_egui = "0.28.0"
+bevy-inspector-egui = "0.28"
+bevy_egui = "0.30.0"
 divan = "0.1"
 bevy_rapier_benches3d = { version = "0.1", path = "../bevy_rapier_benches3d" }
 

diff --git a/bevy_rapier3d/examples/testbed3.rs b/bevy_rapier3d/examples/testbed3.rs
@@ -12,8 +12,8 @@ mod ray_casting3;
 mod static_trimesh3;
 
 use bevy::prelude::*;
-// use bevy_egui::{egui, EguiContexts, EguiPlugin};
-// use bevy_inspector_egui::quick::WorldInspectorPlugin;
+use bevy_egui::{egui, EguiContexts, EguiPlugin};
+use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use bevy_rapier3d::prelude::*;
 
 #[derive(Debug, Reflect, Clone, Copy, Eq, PartialEq, Default, Hash, States)]
@@ -60,10 +60,10 @@ fn main() {
     app.init_resource::<ExamplesRes>()
         .add_plugins((
             DefaultPlugins,
-            //EguiPlugin,
+            EguiPlugin,
             RapierPhysicsPlugin::<NoUserData>::default(),
             RapierDebugRenderPlugin::default(),
-            //WorldInspectorPlugin::new(),
+            WorldInspectorPlugin::new(),
         ))
         .register_type::<Examples>()
         .register_type::<ExamplesRes>()