From e79b69165cebfac80cf8fe0a661ee1ec70d13ec5 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Thu, 31 Oct 2024 16:15:42 +0100
Subject: [PATCH 1/7] update bevy to 0.15, commenting out bevy_egui

---
 bevy_rapier2d/Cargo.toml                      | 15 +++----
 bevy_rapier2d/examples/boxes2.rs              |  9 ++---
 bevy_rapier2d/examples/contact_filter2.rs     | 11 ++----
 .../examples/custom_system_setup2.rs          |  9 ++---
 bevy_rapier2d/examples/debug_despawn2.rs      | 24 +++++-------
 bevy_rapier2d/examples/debug_toggle2.rs       | 17 ++++----
 bevy_rapier2d/examples/despawn2.rs            | 11 ++----
 bevy_rapier2d/examples/events2.rs             |  8 ++--
 bevy_rapier2d/examples/joints2.rs             |  7 +---
 bevy_rapier2d/examples/joints_despawn2.rs     |  7 +---
 bevy_rapier2d/examples/locked_rotations2.rs   | 13 ++-----
 bevy_rapier2d/examples/multiple_colliders2.rs | 13 +++----
 bevy_rapier2d/examples/player_movement2.rs    | 11 ++----
 bevy_rapier2d/examples/rope_joint2.rs         |  9 ++---
 bevy_rapier2d/examples/testbed2.rs            | 13 ++++---
 bevy_rapier3d/Cargo.toml                      | 12 +++---
 .../examples/character_controller3.rs         | 39 +++++--------------
 bevy_rapier3d/examples/contact_filter3.rs     | 15 ++++---
 .../examples/custom_system_setup3.rs          | 13 +++----
 bevy_rapier3d/examples/debug_toggle3.rs       | 17 ++++----
 bevy_rapier3d/examples/despawn3.rs            | 13 +++----
 bevy_rapier3d/examples/events3.rs             | 14 +++----
 bevy_rapier3d/examples/joints3.rs             | 29 ++++++--------
 bevy_rapier3d/examples/joints_despawn3.rs     | 25 +++++-------
 bevy_rapier3d/examples/locked_rotations3.rs   |  9 ++---
 bevy_rapier3d/examples/multi_world3.rs        | 15 ++++---
 bevy_rapier3d/examples/multiple_colliders3.rs | 24 ++++--------
 bevy_rapier3d/examples/ray_casting3.rs        | 18 +++++----
 bevy_rapier3d/examples/static_trimesh3.rs     | 19 ++++-----
 bevy_rapier3d/examples/testbed3.rs            | 13 ++++---
 bevy_rapier_benches3d/Cargo.toml              |  2 +-
 src/plugin/context/mod.rs                     |  4 +-
 src/plugin/plugin.rs                          |  2 +-
 src/plugin/systems/collider.rs                | 20 ++++++----
 src/plugin/systems/mod.rs                     | 16 +++-----
 .../systems/multiple_rapier_contexts.rs       | 10 ++---
 36 files changed, 210 insertions(+), 296 deletions(-)

diff --git a/bevy_rapier2d/Cargo.toml b/bevy_rapier2d/Cargo.toml
index d1d1d6ca..bee19234 100644
--- a/bevy_rapier2d/Cargo.toml
+++ b/bevy_rapier2d/Cargo.toml
@@ -49,25 +49,26 @@ headless = []
 async-collider = ["bevy/bevy_asset", "bevy/bevy_scene"]
 
 [dependencies]
-bevy = { version = "0.14", default-features = false }
-nalgebra = { version = "0.33", features = ["convert-glam027"] }
+bevy = { version = "0.15.0-rc.2", default-features = false }
+nalgebra = { version = "0.33", features = ["convert-glam029"] }
 rapier2d = "0.22"
 bitflags = "2.4"
 log = "0.4"
 serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15.0-rc.2", default-features = false, features = [
     "x11",
     "bevy_state",
     "bevy_debug_stepping",
 ] }
 oorandom = "11"
 approx = "0.5.1"
-glam = { version = "0.27", features = ["approx"] }
-bevy-inspector-egui = "0.25.1"
-bevy_egui = "0.28.0"
-bevy_mod_debugdump = "0.11"
+glam = { version = "0.29", features = ["approx"] }
+# bevy-inspector-egui = "0.25.1"
+# bevy_egui = "0.28.0"
+# bevy_mod_debugdump = "0.11"
+bevy_mod_debugdump = { git = "https://github.com/andriyDev/bevy_mod_debugdump.git", branch = "bevy-0.15" }
 
 [package.metadata.docs.rs]
 # Enable all the features when building the docs on docs.rs
diff --git a/bevy_rapier2d/examples/boxes2.rs b/bevy_rapier2d/examples/boxes2.rs
index a653575e..b63f7f56 100644
--- a/bevy_rapier2d/examples/boxes2.rs
+++ b/bevy_rapier2d/examples/boxes2.rs
@@ -18,10 +18,7 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, 20.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -32,7 +29,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 10.0;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 0.0 * -ground_height, 0.0)),
+        Transform::from_xyz(0.0, 0.0 * -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height),
     ));
 
@@ -54,7 +51,7 @@ pub fn setup_physics(mut commands: Commands) {
             let y = j as f32 * shift + centery + 30.0;
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(x, y, 0.0)),
+                Transform::from_xyz(x, y, 0.0),
                 RigidBody::Dynamic,
                 Collider::cuboid(rad, rad),
             ));
diff --git a/bevy_rapier2d/examples/contact_filter2.rs b/bevy_rapier2d/examples/contact_filter2.rs
index d286151d..7e3538c2 100644
--- a/bevy_rapier2d/examples/contact_filter2.rs
+++ b/bevy_rapier2d/examples/contact_filter2.rs
@@ -45,10 +45,7 @@ fn main() {
 }
 
 fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, 20.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -58,13 +55,13 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_size = 100.0;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -100.0, 0.0)),
+        Transform::from_xyz(0.0, -100.0, 0.0),
         Collider::cuboid(ground_size, 12.0),
         CustomFilterTag::GroupA,
     ));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 0.0, 0.0)),
+        Transform::from_xyz(0.0, 0.0, 0.0),
         Collider::cuboid(ground_size, 12.0),
         CustomFilterTag::GroupB,
     ));
@@ -89,7 +86,7 @@ pub fn setup_physics(mut commands: Commands) {
             group_id += 1;
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(x, y, 0.0)),
+                Transform::from_xyz(x, y, 0.0),
                 RigidBody::Dynamic,
                 Collider::cuboid(rad, rad),
                 ActiveHooks::FILTER_CONTACT_PAIRS,
diff --git a/bevy_rapier2d/examples/custom_system_setup2.rs b/bevy_rapier2d/examples/custom_system_setup2.rs
index 31232e9f..71b5ac56 100644
--- a/bevy_rapier2d/examples/custom_system_setup2.rs
+++ b/bevy_rapier2d/examples/custom_system_setup2.rs
@@ -61,10 +61,7 @@ fn despawn_one_box(
 }
 
 fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, 20.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -75,7 +72,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 10.0;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 0.0 * -ground_height, 0.0)),
+        Transform::from_xyz(0.0, 0.0 * -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height),
     ));
 
@@ -97,7 +94,7 @@ pub fn setup_physics(mut commands: Commands) {
             let y = j as f32 * shift + centery + 30.0;
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(x, y, 0.0)),
+                Transform::from_xyz(x, y, 0.0),
                 RigidBody::Dynamic,
                 Collider::cuboid(rad, rad),
             ));
diff --git a/bevy_rapier2d/examples/debug_despawn2.rs b/bevy_rapier2d/examples/debug_despawn2.rs
index 3eeab482..4fdf28b5 100644
--- a/bevy_rapier2d/examples/debug_despawn2.rs
+++ b/bevy_rapier2d/examples/debug_despawn2.rs
@@ -92,7 +92,7 @@ pub fn setup_game(mut commands: Commands, mut game: ResMut<Game>) {
         byte_rgb(255, 0, 0),
     ];
 
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d::default());
 
     setup_board(&mut commands, &game);
 
@@ -131,15 +131,12 @@ fn setup_board(commands: &mut Commands, game: &Game) {
 
     // Add floor
     commands.spawn((
-        SpriteBundle {
-            sprite: Sprite {
-                color: Color::srgb(0.5, 0.5, 0.5),
-                custom_size: Some(Vec2::new(game.n_lanes as f32 * 30.0, 60.0)),
-                ..Default::default()
-            },
-            transform: Transform::from_xyz(0.0, floor_y - 30.0 * 0.5, 0.0),
+        Sprite {
+            color: Color::srgb(0.5, 0.5, 0.5),
+            custom_size: Some(Vec2::new(game.n_lanes as f32 * 30.0, 60.0)),
             ..Default::default()
         },
+        Transform::from_xyz(0.0, floor_y - 30.0 * 0.5, 0.0),
         RigidBody::Fixed,
         Collider::cuboid(game.n_lanes as f32 * 30.0 / 2.0, 60.0 / 2.0),
     ));
@@ -200,15 +197,12 @@ fn spawn_block(
 
     commands
         .spawn((
-            SpriteBundle {
-                sprite: Sprite {
-                    color: game.cube_colors[kind as usize],
-                    custom_size: Some(Vec2::new(30.0, 30.0)),
-                    ..Default::default()
-                },
-                transform: Transform::from_xyz(x, y, 0.0),
+            Sprite {
+                color: game.cube_colors[kind as usize],
+                custom_size: Some(Vec2::new(30.0, 30.0)),
                 ..Default::default()
             },
+            Transform::from_xyz(x, y, 0.0),
             RigidBody::Dynamic,
             Damping {
                 linear_damping,
diff --git a/bevy_rapier2d/examples/debug_toggle2.rs b/bevy_rapier2d/examples/debug_toggle2.rs
index da161f1b..a5b1e1e0 100644
--- a/bevy_rapier2d/examples/debug_toggle2.rs
+++ b/bevy_rapier2d/examples/debug_toggle2.rs
@@ -31,11 +31,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 #[derive(Component)]
@@ -49,7 +48,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height),
     ));
 
@@ -81,12 +80,10 @@ pub fn setup_physics(mut commands: Commands) {
                 color += 1;
 
                 commands
-                    .spawn(TransformBundle::from(Transform::from_rotation(
-                        Quat::from_rotation_x(0.2),
-                    )))
+                    .spawn(Transform::from_rotation(Quat::from_rotation_x(0.2)))
                     .with_children(|child| {
                         child.spawn((
-                            TransformBundle::from(Transform::from_xyz(x, y, z)),
+                            Transform::from_xyz(x, y, z),
                             RigidBody::Dynamic,
                             Collider::cuboid(rad, rad),
                             ColliderDebugColor(colors[color % 3]),
diff --git a/bevy_rapier2d/examples/despawn2.rs b/bevy_rapier2d/examples/despawn2.rs
index a2b5288d..ed20bc80 100644
--- a/bevy_rapier2d/examples/despawn2.rs
+++ b/bevy_rapier2d/examples/despawn2.rs
@@ -43,10 +43,7 @@ pub fn setup_graphics(
     resize.timer = Timer::from_seconds(6.0, TimerMode::Once);
     despawn.timer = Timer::from_seconds(5.0, TimerMode::Once);
 
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, 20.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -58,12 +55,12 @@ pub fn setup_physics(mut commands: Commands) {
     commands.spawn((Collider::cuboid(ground_size, 12.0), Despawn));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(ground_size, ground_size * 2.0, 0.0)),
+        Transform::from_xyz(ground_size, ground_size * 2.0, 0.0),
         Collider::cuboid(12.0, ground_size * 2.0),
     ));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(-ground_size, ground_size * 2.0, 0.0)),
+        Transform::from_xyz(-ground_size, ground_size * 2.0, 0.0),
         Collider::cuboid(12.0, ground_size * 2.0),
     ));
 
@@ -83,7 +80,7 @@ pub fn setup_physics(mut commands: Commands) {
             let y = j as f32 * shift + centery + 2.0;
 
             let mut entity = commands.spawn((
-                TransformBundle::from(Transform::from_xyz(x, y, 0.0)),
+                Transform::from_xyz(x, y, 0.0),
                 RigidBody::Dynamic,
                 Collider::cuboid(rad, rad),
             ));
diff --git a/bevy_rapier2d/examples/events2.rs b/bevy_rapier2d/examples/events2.rs
index d772d3f8..0b49e486 100644
--- a/bevy_rapier2d/examples/events2.rs
+++ b/bevy_rapier2d/examples/events2.rs
@@ -19,7 +19,7 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d::default());
 }
 
 pub fn display_events(
@@ -40,18 +40,18 @@ pub fn setup_physics(mut commands: Commands) {
      * Ground
      */
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -24.0, 0.0)),
+        Transform::from_xyz(0.0, -24.0, 0.0),
         Collider::cuboid(80.0, 20.0),
     ));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 100.0, 0.0)),
+        Transform::from_xyz(0.0, 100.0, 0.0),
         Collider::cuboid(80.0, 30.0),
         Sensor,
     ));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 260.0, 0.0)),
+        Transform::from_xyz(0.0, 260.0, 0.0),
         RigidBody::Dynamic,
         Collider::cuboid(10.0, 10.0),
         ActiveEvents::COLLISION_EVENTS,
diff --git a/bevy_rapier2d/examples/joints2.rs b/bevy_rapier2d/examples/joints2.rs
index e30352ca..a7c16cee 100644
--- a/bevy_rapier2d/examples/joints2.rs
+++ b/bevy_rapier2d/examples/joints2.rs
@@ -18,10 +18,7 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, -200.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, -200.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -46,7 +43,7 @@ pub fn setup_physics(mut commands: Commands) {
 
             let child_entity = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_xyz(fk * shift, -fi * shift, 0.0)),
+                    Transform::from_xyz(fk * shift, -fi * shift, 0.0),
                     rigid_body,
                     Collider::cuboid(rad, rad),
                 ))
diff --git a/bevy_rapier2d/examples/joints_despawn2.rs b/bevy_rapier2d/examples/joints_despawn2.rs
index 736d868b..f5fa1977 100644
--- a/bevy_rapier2d/examples/joints_despawn2.rs
+++ b/bevy_rapier2d/examples/joints_despawn2.rs
@@ -28,10 +28,7 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, -200.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, -200.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands, mut despawn: ResMut<DespawnResource>) {
@@ -58,7 +55,7 @@ pub fn setup_physics(mut commands: Commands, mut despawn: ResMut<DespawnResource
 
             let child_entity = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_xyz(fk * shift, -fi * shift, 0.0)),
+                    Transform::from_xyz(fk * shift, -fi * shift, 0.0),
                     rigid_body,
                     Collider::cuboid(rad, rad),
                 ))
diff --git a/bevy_rapier2d/examples/locked_rotations2.rs b/bevy_rapier2d/examples/locked_rotations2.rs
index 2046bb8f..a6b23b30 100644
--- a/bevy_rapier2d/examples/locked_rotations2.rs
+++ b/bevy_rapier2d/examples/locked_rotations2.rs
@@ -18,10 +18,7 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, 200.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 200.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -32,7 +29,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 10.0;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height),
     ));
 
@@ -40,7 +37,7 @@ pub fn setup_physics(mut commands: Commands) {
      * A rectangle that only rotate.
      */
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 300.0, 0.0)),
+        Transform::from_xyz(0.0, 300.0, 0.0),
         RigidBody::Dynamic,
         LockedAxes::TRANSLATION_LOCKED,
         Collider::cuboid(200.0, 60.0),
@@ -50,9 +47,7 @@ pub fn setup_physics(mut commands: Commands) {
      * A tilted cuboid that cannot rotate.
      */
     commands.spawn((
-        TransformBundle::from(
-            Transform::from_xyz(50.0, 500.0, 0.0).with_rotation(Quat::from_rotation_z(1.0)),
-        ),
+        Transform::from_xyz(50.0, 500.0, 0.0).with_rotation(Quat::from_rotation_z(1.0)),
         RigidBody::Dynamic,
         LockedAxes::ROTATION_LOCKED,
         Collider::cuboid(60.0, 40.0),
diff --git a/bevy_rapier2d/examples/multiple_colliders2.rs b/bevy_rapier2d/examples/multiple_colliders2.rs
index a2cb1f85..dc41ecf2 100644
--- a/bevy_rapier2d/examples/multiple_colliders2.rs
+++ b/bevy_rapier2d/examples/multiple_colliders2.rs
@@ -18,7 +18,7 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d::default());
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -29,7 +29,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 1.0;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height),
     ));
 
@@ -51,18 +51,15 @@ pub fn setup_physics(mut commands: Commands) {
             let y = j as f32 * (shift * 5.0) + centery + 3.0;
 
             commands
-                .spawn((
-                    TransformBundle::from(Transform::from_xyz(x, y, 0.0)),
-                    RigidBody::Dynamic,
-                ))
+                .spawn((Transform::from_xyz(x, y, 0.0), RigidBody::Dynamic))
                 .with_children(|children| {
                     children.spawn(Collider::cuboid(rad * 10.0, rad));
                     children.spawn((
-                        TransformBundle::from(Transform::from_xyz(rad * 10.0, rad * 10.0, 0.0)),
+                        Transform::from_xyz(rad * 10.0, rad * 10.0, 0.0),
                         Collider::cuboid(rad, rad * 10.0),
                     ));
                     children.spawn((
-                        TransformBundle::from(Transform::from_xyz(-rad * 10.0, rad * 10.0, 0.0)),
+                        Transform::from_xyz(-rad * 10.0, rad * 10.0, 0.0),
                         Collider::cuboid(rad, rad * 10.0),
                     ));
                 });
diff --git a/bevy_rapier2d/examples/player_movement2.rs b/bevy_rapier2d/examples/player_movement2.rs
index 7cc1cab5..cded0855 100644
--- a/bevy_rapier2d/examples/player_movement2.rs
+++ b/bevy_rapier2d/examples/player_movement2.rs
@@ -28,18 +28,15 @@ pub fn spawn_player(mut commands: Commands, mut rapier_config: Query<&mut Rapier
     let mut rapier_config = rapier_config.single_mut();
     // Set gravity to 0.0 and spawn camera.
     rapier_config.gravity = Vec2::ZERO;
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d::default());
 
     let sprite_size = 100.0;
 
     // Spawn entity with `Player` struct as a component for access in movement query.
     commands.spawn((
-        SpriteBundle {
-            sprite: Sprite {
-                color: Color::srgb(0.0, 0.0, 0.0),
-                custom_size: Some(Vec2::new(sprite_size, sprite_size)),
-                ..Default::default()
-            },
+        Sprite {
+            color: Color::srgb(0.0, 0.0, 0.0),
+            custom_size: Some(Vec2::new(sprite_size, sprite_size)),
             ..Default::default()
         },
         RigidBody::Dynamic,
diff --git a/bevy_rapier2d/examples/rope_joint2.rs b/bevy_rapier2d/examples/rope_joint2.rs
index 60d3ac50..922578f8 100644
--- a/bevy_rapier2d/examples/rope_joint2.rs
+++ b/bevy_rapier2d/examples/rope_joint2.rs
@@ -18,10 +18,7 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0.0, -200.0, 0.0),
-        ..default()
-    });
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, -200.0, 0.0)));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -30,7 +27,7 @@ pub fn setup_physics(mut commands: Commands) {
 
     let parent = commands
         .spawn((
-            TransformBundle::from(Transform::from_xyz(0.0, 0.0, 0.0)),
+            Transform::from_xyz(0.0, 0.0, 0.0),
             RigidBody::Fixed,
             Collider::cuboid(rad, rad),
         ))
@@ -40,7 +37,7 @@ pub fn setup_physics(mut commands: Commands) {
 
     commands
         .spawn((
-            TransformBundle::from(Transform::from_xyz(-rad * 2.0, 0.0, 0.0)),
+            Transform::from_xyz(-rad * 2.0, 0.0, 0.0),
             RigidBody::Dynamic,
             Collider::cuboid(rad, rad),
         ))
diff --git a/bevy_rapier2d/examples/testbed2.rs b/bevy_rapier2d/examples/testbed2.rs
index 8a433e22..f8c4fd44 100644
--- 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>()
@@ -224,7 +224,7 @@ fn main() {
         .add_systems(
             Update,
             (
-                ui_example_system,
+                //ui_example_system,
                 change_example.run_if(resource_changed::<ExampleSelected>),
             )
                 .chain(),
@@ -260,7 +260,7 @@ fn change_example(
 ) {
     next_state.set(examples_available.0[example_selected.0].state);
 }
-
+/*
 fn ui_example_system(
     mut contexts: EguiContexts,
     mut current_example: ResMut<ExampleSelected>,
@@ -284,3 +284,4 @@ fn ui_example_system(
         }
     });
 }
+*/
diff --git a/bevy_rapier3d/Cargo.toml b/bevy_rapier3d/Cargo.toml
index 3ab3cfcb..fec36575 100644
--- a/bevy_rapier3d/Cargo.toml
+++ b/bevy_rapier3d/Cargo.toml
@@ -50,24 +50,24 @@ headless = []
 async-collider = ["bevy/bevy_asset", "bevy/bevy_scene"]
 
 [dependencies]
-bevy = { version = "0.14", default-features = false }
-nalgebra = { version = "0.33", features = ["convert-glam027"] }
+bevy = { version = "0.15.0-rc.2", default-features = false }
+nalgebra = { version = "0.33", features = ["convert-glam029"] }
 rapier3d = "0.22"
 bitflags = "2.4"
 log = "0.4"
 serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15.0-rc.2", default-features = false, features = [
     "x11",
     "tonemapping_luts",
     "bevy_state",
     "bevy_debug_stepping",
 ] }
 approx = "0.5.1"
-glam = { version = "0.27", features = ["approx"] }
-bevy-inspector-egui = "0.25.1"
-bevy_egui = "0.28.0"
+glam = { version = "0.29", features = ["approx"] }
+# bevy-inspector-egui = "0.25.1"
+# bevy_egui = "0.28.0"
 divan = "0.1"
 bevy_rapier_benches3d = { version = "0.1", path = "../bevy_rapier_benches3d" }
 
diff --git a/bevy_rapier3d/examples/character_controller3.rs b/bevy_rapier3d/examples/character_controller3.rs
index 7670da54..f99e3701 100644
--- a/bevy_rapier3d/examples/character_controller3.rs
+++ b/bevy_rapier3d/examples/character_controller3.rs
@@ -34,10 +34,8 @@ fn main() {
 pub fn setup_player(mut commands: Commands) {
     commands
         .spawn((
-            SpatialBundle {
-                transform: Transform::from_xyz(0.0, 5.0, 0.0),
-                ..default()
-            },
+            Transform::from_xyz(0.0, 5.0, 0.0),
+            Visibility::default(),
             Collider::round_cylinder(0.9, 0.3, 0.2),
             KinematicCharacterController {
                 custom_mass: Some(5.0),
@@ -60,10 +58,7 @@ pub fn setup_player(mut commands: Commands) {
         ))
         .with_children(|b| {
             // FPS Camera
-            b.spawn(Camera3dBundle {
-                transform: Transform::from_xyz(0.0, 0.2, -0.1),
-                ..Default::default()
-            });
+            b.spawn((Camera3d::default(), Transform::from_xyz(0.0, 0.2, -0.1)));
         });
 }
 
@@ -75,7 +70,7 @@ fn setup_map(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
     ));
     /*
@@ -87,35 +82,19 @@ fn setup_map(mut commands: Commands) {
         let step = i as f32;
         let collider = Collider::cuboid(1.0, step * stair_step, 1.0);
         commands.spawn((
-            TransformBundle::from(Transform::from_xyz(
-                40.0,
-                step * stair_step,
-                step * 2.0 - 20.0,
-            )),
+            Transform::from_xyz(40.0, step * stair_step, step * 2.0 - 20.0),
             collider.clone(),
         ));
         commands.spawn((
-            TransformBundle::from(Transform::from_xyz(
-                -40.0,
-                step * stair_step,
-                step * -2.0 + 20.0,
-            )),
+            Transform::from_xyz(-40.0, step * stair_step, step * -2.0 + 20.0),
             collider.clone(),
         ));
         commands.spawn((
-            TransformBundle::from(Transform::from_xyz(
-                step * 2.0 - 20.0,
-                step * stair_step,
-                40.0,
-            )),
+            Transform::from_xyz(step * 2.0 - 20.0, step * stair_step, 40.0),
             collider.clone(),
         ));
         commands.spawn((
-            TransformBundle::from(Transform::from_xyz(
-                step * -2.0 + 20.0,
-                step * stair_step,
-                -40.0,
-            )),
+            Transform::from_xyz(step * -2.0 + 20.0, step * stair_step, -40.0),
             collider.clone(),
         ));
     }
@@ -176,7 +155,7 @@ fn player_movement(
     let Ok((transform, mut controller, output)) = player.get_single_mut() else {
         return;
     };
-    let delta_time = time.delta_seconds();
+    let delta_time = time.delta_secs();
     // Retrieve input
     let mut movement = Vec3::new(input.x, 0.0, input.z) * MOVEMENT_SPEED;
     let jump_speed = input.y * JUMP_SPEED;
diff --git a/bevy_rapier3d/examples/contact_filter3.rs b/bevy_rapier3d/examples/contact_filter3.rs
index de9f0b9d..7aca1316 100644
--- a/bevy_rapier3d/examples/contact_filter3.rs
+++ b/bevy_rapier3d/examples/contact_filter3.rs
@@ -45,11 +45,10 @@ fn main() {
 }
 
 fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -59,13 +58,13 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_size = 10.0;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -10.0, 0.0)),
+        Transform::from_xyz(0.0, -10.0, 0.0),
         Collider::cuboid(ground_size, 1.2, ground_size),
         CustomFilterTag::GroupA,
     ));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 0.0, 0.0)),
+        Transform::from_xyz(0.0, 0.0, 0.0),
         Collider::cuboid(ground_size, 1.2, ground_size),
         CustomFilterTag::GroupB,
     ));
@@ -90,7 +89,7 @@ pub fn setup_physics(mut commands: Commands) {
             group_id += 1;
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(x, y, 0.0)),
+                Transform::from_xyz(x, y, 0.0),
                 RigidBody::Dynamic,
                 Collider::cuboid(rad, rad, rad),
                 ActiveHooks::FILTER_CONTACT_PAIRS,
diff --git a/bevy_rapier3d/examples/custom_system_setup3.rs b/bevy_rapier3d/examples/custom_system_setup3.rs
index 77b14b45..cfb88bae 100644
--- a/bevy_rapier3d/examples/custom_system_setup3.rs
+++ b/bevy_rapier3d/examples/custom_system_setup3.rs
@@ -61,11 +61,10 @@ fn despawn_one_box(
 }
 
 fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -76,7 +75,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
     ));
 
@@ -108,7 +107,7 @@ pub fn setup_physics(mut commands: Commands) {
                 color += 1;
 
                 commands.spawn((
-                    TransformBundle::from(Transform::from_xyz(x, y, z)),
+                    Transform::from_xyz(x, y, z),
                     RigidBody::Dynamic,
                     Collider::cuboid(rad, rad, rad),
                     ColliderDebugColor(colors[color % 3]),
diff --git a/bevy_rapier3d/examples/debug_toggle3.rs b/bevy_rapier3d/examples/debug_toggle3.rs
index cf1a240a..78468750 100644
--- a/bevy_rapier3d/examples/debug_toggle3.rs
+++ b/bevy_rapier3d/examples/debug_toggle3.rs
@@ -31,11 +31,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 #[derive(Component)]
@@ -49,7 +48,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
     ));
 
@@ -81,12 +80,10 @@ pub fn setup_physics(mut commands: Commands) {
                 color += 1;
 
                 commands
-                    .spawn(TransformBundle::from(Transform::from_rotation(
-                        Quat::from_rotation_x(0.2),
-                    )))
+                    .spawn(Transform::from_rotation(Quat::from_rotation_x(0.2)))
                     .with_children(|child| {
                         child.spawn((
-                            TransformBundle::from(Transform::from_xyz(x, y, z)),
+                            Transform::from_xyz(x, y, z),
                             RigidBody::Dynamic,
                             Collider::cuboid(rad, rad, rad),
                             ColliderDebugColor(colors[color % 3]),
diff --git a/bevy_rapier3d/examples/despawn3.rs b/bevy_rapier3d/examples/despawn3.rs
index cf747c95..e6eb717e 100644
--- a/bevy_rapier3d/examples/despawn3.rs
+++ b/bevy_rapier3d/examples/despawn3.rs
@@ -30,11 +30,10 @@ fn main() {
 pub fn setup_graphics(mut commands: Commands, mut res: ResMut<DespawnResource>) {
     res.timer = Timer::from_seconds(5.0, TimerMode::Once);
 
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -45,7 +44,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
         Despawn,
     ));
@@ -78,7 +77,7 @@ pub fn setup_physics(mut commands: Commands) {
                 color += 1;
 
                 commands.spawn((
-                    TransformBundle::from(Transform::from_xyz(x, y, z)),
+                    Transform::from_xyz(x, y, z),
                     RigidBody::Dynamic,
                     Collider::cuboid(rad, rad, rad),
                     ColliderDebugColor(colors[color % 3]),
diff --git a/bevy_rapier3d/examples/events3.rs b/bevy_rapier3d/examples/events3.rs
index 3f8791d7..9f1a23e8 100644
--- a/bevy_rapier3d/examples/events3.rs
+++ b/bevy_rapier3d/examples/events3.rs
@@ -19,10 +19,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(0.0, 0.0, 25.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(0.0, 0.0, 25.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
 
 pub fn display_events(
@@ -43,18 +43,18 @@ pub fn setup_physics(mut commands: Commands) {
      * Ground
      */
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -1.2, 0.0)),
+        Transform::from_xyz(0.0, -1.2, 0.0),
         Collider::cuboid(4.0, 1.0, 1.0),
     ));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 5.0, 0.0)),
+        Transform::from_xyz(0.0, 5.0, 0.0),
         Collider::cuboid(4.0, 1.5, 1.0),
         Sensor,
     ));
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 13.0, 0.0)),
+        Transform::from_xyz(0.0, 13.0, 0.0),
         RigidBody::Dynamic,
         Collider::cuboid(0.5, 0.5, 0.5),
         ActiveEvents::COLLISION_EVENTS,
diff --git a/bevy_rapier3d/examples/joints3.rs b/bevy_rapier3d/examples/joints3.rs
index 2864d33b..3edecc74 100644
--- a/bevy_rapier3d/examples/joints3.rs
+++ b/bevy_rapier3d/examples/joints3.rs
@@ -25,11 +25,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(15.0, 5.0, 42.0)
-            .looking_at(Vec3::new(13.0, 1.0, 1.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(15.0, 5.0, 42.0).looking_at(Vec3::new(13.0, 1.0, 1.0), Vec3::Y),
+    ));
 }
 
 fn create_prismatic_joints(commands: &mut Commands, origin: Vect, num: usize) {
@@ -38,7 +37,7 @@ fn create_prismatic_joints(commands: &mut Commands, origin: Vect, num: usize) {
 
     let mut curr_parent = commands
         .spawn((
-            TransformBundle::from(Transform::from_xyz(origin.x, origin.y, origin.z)),
+            Transform::from_xyz(origin.x, origin.y, origin.z),
             RigidBody::Fixed,
             Collider::cuboid(rad, rad, rad),
         ))
@@ -60,7 +59,7 @@ fn create_prismatic_joints(commands: &mut Commands, origin: Vect, num: usize) {
 
         curr_parent = commands
             .spawn((
-                TransformBundle::from(Transform::from_xyz(origin.x, origin.y, origin.z + dz)),
+                Transform::from_xyz(origin.x, origin.y, origin.z + dz),
                 RigidBody::Dynamic,
                 Collider::cuboid(rad, rad, rad),
                 joint,
@@ -75,7 +74,7 @@ fn create_rope_joints(commands: &mut Commands, origin: Vect, num: usize) {
 
     let mut curr_parent = commands
         .spawn((
-            TransformBundle::from(Transform::from_xyz(origin.x, origin.y, origin.z)),
+            Transform::from_xyz(origin.x, origin.y, origin.z),
             RigidBody::Fixed,
             Collider::cuboid(rad, rad, rad),
         ))
@@ -89,7 +88,7 @@ fn create_rope_joints(commands: &mut Commands, origin: Vect, num: usize) {
 
         curr_parent = commands
             .spawn((
-                TransformBundle::from(Transform::from_xyz(origin.x, origin.y, origin.z + dz)),
+                Transform::from_xyz(origin.x, origin.y, origin.z + dz),
                 RigidBody::Dynamic,
                 Collider::cuboid(rad, rad, rad),
                 joint,
@@ -104,7 +103,7 @@ fn create_revolute_joints(commands: &mut Commands, origin: Vec3, num: usize) {
 
     let mut curr_parent = commands
         .spawn((
-            TransformBundle::from(Transform::from_xyz(origin.x, origin.y, 0.0)),
+            Transform::from_xyz(origin.x, origin.y, 0.0),
             RigidBody::Fixed,
             Collider::cuboid(rad, rad, rad),
         ))
@@ -124,7 +123,7 @@ fn create_revolute_joints(commands: &mut Commands, origin: Vec3, num: usize) {
         for k in 0..4 {
             handles[k] = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_translation(positions[k])),
+                    Transform::from_translation(positions[k]),
                     RigidBody::Dynamic,
                     Collider::cuboid(rad, rad, rad),
                 ))
@@ -180,11 +179,7 @@ fn create_fixed_joints(commands: &mut Commands, origin: Vec3, num: usize) {
 
             let child_entity = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_xyz(
-                        origin.x + fk * shift,
-                        origin.y,
-                        origin.z + fi * shift,
-                    )),
+                    Transform::from_xyz(origin.x + fk * shift, origin.y, origin.z + fi * shift),
                     rigid_body,
                     Collider::ball(rad),
                 ))
@@ -239,7 +234,7 @@ fn create_ball_joints(commands: &mut Commands, num: usize) {
 
             let child_entity = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_xyz(fk * shift, 0.0, fi * shift)),
+                    Transform::from_xyz(fk * shift, 0.0, fi * shift),
                     rigid_body,
                     Collider::ball(rad),
                 ))
diff --git a/bevy_rapier3d/examples/joints_despawn3.rs b/bevy_rapier3d/examples/joints_despawn3.rs
index 17d1608f..fe1795c7 100644
--- a/bevy_rapier3d/examples/joints_despawn3.rs
+++ b/bevy_rapier3d/examples/joints_despawn3.rs
@@ -30,11 +30,10 @@ fn main() {
 pub fn setup_graphics(mut commands: Commands, mut res: ResMut<DespawnResource>) {
     res.timer = Timer::from_seconds(5.0, TimerMode::Once);
 
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(15.0, 5.0, 42.0)
-            .looking_at(Vec3::new(13.0, 1.0, 1.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(15.0, 5.0, 42.0).looking_at(Vec3::new(13.0, 1.0, 1.0), Vec3::Y),
+    ));
 }
 
 fn create_prismatic_joints(commands: &mut Commands, origin: Vect, num: usize) {
@@ -43,7 +42,7 @@ fn create_prismatic_joints(commands: &mut Commands, origin: Vect, num: usize) {
 
     let mut curr_parent = commands
         .spawn((
-            TransformBundle::from(Transform::from_xyz(origin.x, origin.y, origin.z)),
+            Transform::from_xyz(origin.x, origin.y, origin.z),
             RigidBody::Fixed,
             Collider::cuboid(rad, rad, rad),
         ))
@@ -64,7 +63,7 @@ fn create_prismatic_joints(commands: &mut Commands, origin: Vect, num: usize) {
         let joint = ImpulseJoint::new(curr_parent, prism);
 
         let mut entity = commands.spawn((
-            TransformBundle::from(Transform::from_xyz(origin.x, origin.y, origin.z + dz)),
+            Transform::from_xyz(origin.x, origin.y, origin.z + dz),
             RigidBody::Dynamic,
             Collider::cuboid(rad, rad, rad),
             joint,
@@ -84,7 +83,7 @@ fn create_revolute_joints(commands: &mut Commands, origin: Vec3, num: usize) {
 
     let mut curr_parent = commands
         .spawn((
-            TransformBundle::from(Transform::from_xyz(origin.x, origin.y, 0.0)),
+            Transform::from_xyz(origin.x, origin.y, 0.0),
             RigidBody::Fixed,
             Collider::cuboid(rad, rad, rad),
         ))
@@ -104,7 +103,7 @@ fn create_revolute_joints(commands: &mut Commands, origin: Vec3, num: usize) {
         for k in 0..4 {
             handles[k] = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_translation(positions[k])),
+                    Transform::from_translation(positions[k]),
                     RigidBody::Dynamic,
                     Collider::cuboid(rad, rad, rad),
                 ))
@@ -167,11 +166,7 @@ fn create_fixed_joints(commands: &mut Commands, origin: Vec3, num: usize) {
 
             let child_entity = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_xyz(
-                        origin.x + fk * shift,
-                        origin.y,
-                        origin.z + fi * shift,
-                    )),
+                    Transform::from_xyz(origin.x + fk * shift, origin.y, origin.z + fi * shift),
                     rigid_body,
                     Collider::ball(rad),
                 ))
@@ -226,7 +221,7 @@ fn create_ball_joints(commands: &mut Commands, num: usize) {
 
             let child_entity = commands
                 .spawn((
-                    TransformBundle::from(Transform::from_xyz(fk * shift, 0.0, fi * shift)),
+                    Transform::from_xyz(fk * shift, 0.0, fi * shift),
                     rigid_body,
                     Collider::ball(rad),
                 ))
diff --git a/bevy_rapier3d/examples/locked_rotations3.rs b/bevy_rapier3d/examples/locked_rotations3.rs
index 0288db5f..b78738ed 100644
--- a/bevy_rapier3d/examples/locked_rotations3.rs
+++ b/bevy_rapier3d/examples/locked_rotations3.rs
@@ -18,11 +18,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(10.0, 3.0, 0.0)
-            .looking_at(Vec3::new(0.0, 3.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(10.0, 3.0, 0.0).looking_at(Vec3::new(0.0, 3.0, 0.0), Vec3::Y),
+    ));
 }
 
 pub fn setup_physics(mut commands: Commands) {
diff --git a/bevy_rapier3d/examples/multi_world3.rs b/bevy_rapier3d/examples/multi_world3.rs
index dc5fa807..54a0ad93 100644
--- a/bevy_rapier3d/examples/multi_world3.rs
+++ b/bevy_rapier3d/examples/multi_world3.rs
@@ -38,11 +38,10 @@ fn create_worlds(mut commands: Commands) {
 }
 
 fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(0.0, 3.0, -10.0)
-            .looking_at(Vec3::new(0.0, 0.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(0.0, 3.0, -10.0).looking_at(Vec3::new(0.0, 0.0, 0.0), Vec3::Y),
+    ));
 }
 
 #[derive(Component)]
@@ -55,7 +54,7 @@ struct Platform {
 
 fn move_platforms(time: Res<Time>, mut query: Query<(&mut Transform, &Platform)>) {
     for (mut transform, platform) in query.iter_mut() {
-        transform.translation.y = platform.starting_y + -time.elapsed_seconds().sin();
+        transform.translation.y = platform.starting_y + -time.elapsed_secs().sin();
     }
 }
 
@@ -96,7 +95,7 @@ pub fn setup_physics(
         let starting_y = (id as f32) * -0.5 - ground_height;
 
         let mut platforms = commands.spawn((
-            TransformBundle::from(Transform::from_xyz(0.0, starting_y, 0.0)),
+            Transform::from_xyz(0.0, starting_y, 0.0),
             Collider::cuboid(ground_size, ground_height, ground_size),
             ColliderDebugColor(color),
             RapierContextEntityLink(context_entity),
@@ -110,7 +109,7 @@ pub fn setup_physics(
          */
 
         commands.spawn((
-            TransformBundle::from(Transform::from_xyz(0.0, 1.0 + id as f32 * 5.0, 0.0)),
+            Transform::from_xyz(0.0, 1.0 + id as f32 * 5.0, 0.0),
             RigidBody::Dynamic,
             Collider::cuboid(0.5, 0.5, 0.5),
             ColliderDebugColor(color),
diff --git a/bevy_rapier3d/examples/multiple_colliders3.rs b/bevy_rapier3d/examples/multiple_colliders3.rs
index 50451796..7ef45c72 100644
--- a/bevy_rapier3d/examples/multiple_colliders3.rs
+++ b/bevy_rapier3d/examples/multiple_colliders3.rs
@@ -18,11 +18,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -33,7 +32,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
     ));
 
@@ -66,26 +65,19 @@ pub fn setup_physics(mut commands: Commands) {
 
                 // Crate a rigid-body with multiple colliders attached, using Bevy hierarchy.
                 commands
-                    .spawn((
-                        TransformBundle::from(Transform::from_xyz(x, y, z)),
-                        RigidBody::Dynamic,
-                    ))
+                    .spawn((Transform::from_xyz(x, y, z), RigidBody::Dynamic))
                     .with_children(|children| {
                         children.spawn((
                             Collider::cuboid(rad * 10.0, rad, rad),
                             ColliderDebugColor(colors[color % 3]),
                         ));
                         children.spawn((
-                            TransformBundle::from(Transform::from_xyz(rad * 10.0, rad * 10.0, 0.0)),
+                            Transform::from_xyz(rad * 10.0, rad * 10.0, 0.0),
                             Collider::cuboid(rad, rad * 10.0, rad),
                             ColliderDebugColor(colors[color % 3]),
                         ));
                         children.spawn((
-                            TransformBundle::from(Transform::from_xyz(
-                                -rad * 10.0,
-                                rad * 10.0,
-                                0.0,
-                            )),
+                            Transform::from_xyz(-rad * 10.0, rad * 10.0, 0.0),
                             Collider::cuboid(rad, rad * 10.0, rad),
                             ColliderDebugColor(colors[color % 3]),
                         ));
diff --git a/bevy_rapier3d/examples/ray_casting3.rs b/bevy_rapier3d/examples/ray_casting3.rs
index d5e45d9e..231de6ac 100644
--- a/bevy_rapier3d/examples/ray_casting3.rs
+++ b/bevy_rapier3d/examples/ray_casting3.rs
@@ -21,11 +21,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -36,7 +35,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
     ));
 
@@ -62,7 +61,7 @@ pub fn setup_physics(mut commands: Commands) {
 
                 // Build the rigid body.
                 commands.spawn((
-                    TransformBundle::from(Transform::from_xyz(x, y, z)),
+                    Transform::from_xyz(x, y, z),
                     RigidBody::Dynamic,
                     Collider::cuboid(rad, rad, rad),
                 ));
@@ -88,7 +87,10 @@ pub fn cast_ray(
     // We will color in read the colliders hovered by the mouse.
     for (camera, camera_transform) in &cameras {
         // First, compute a ray from the mouse position.
-        let Some(ray) = camera.viewport_to_world(camera_transform, cursor_position) else {
+        let Some(ray) = camera
+            .viewport_to_world(camera_transform, cursor_position)
+            .ok()
+        else {
             return;
         };
 
diff --git a/bevy_rapier3d/examples/static_trimesh3.rs b/bevy_rapier3d/examples/static_trimesh3.rs
index 4b01ea08..27fae6b5 100644
--- a/bevy_rapier3d/examples/static_trimesh3.rs
+++ b/bevy_rapier3d/examples/static_trimesh3.rs
@@ -22,11 +22,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-15.0, 8.0, 15.0)
-            .looking_at(Vec3::new(-5.0, 0.0, 5.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-15.0, 8.0, 15.0).looking_at(Vec3::new(-5.0, 0.0, 5.0), Vec3::Y),
+    ));
 }
 
 fn ramp_size() -> Vec3 {
@@ -93,11 +92,11 @@ pub fn setup_physics(mut commands: Commands, mut ball_state: ResMut<BallState>)
     // Position so ramp connects smoothly
     // to one edge of the lip of the bowl.
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(
+        Transform::from_xyz(
             -bowl_size.x / 2.0,
             -bowl_size.y / 2.0,
             bowl_size.z / 2.0 - ramp_size.z / 2.0,
-        )),
+        ),
         Collider::trimesh(vertices, indices),
     ));
 }
@@ -130,11 +129,7 @@ pub fn ball_spawner(mut commands: Commands, time: Res<Time>, mut ball_state: Res
         let rad = 0.3;
 
         commands.spawn((
-            TransformBundle::from(Transform::from_xyz(
-                ramp_size.x * 0.9,
-                ramp_size.y / 2.0 + rad * 3.0,
-                0.0,
-            )),
+            Transform::from_xyz(ramp_size.x * 0.9, ramp_size.y / 2.0 + rad * 3.0, 0.0),
             RigidBody::Dynamic,
             Collider::ball(rad),
             Restitution::new(0.5),
diff --git a/bevy_rapier3d/examples/testbed3.rs b/bevy_rapier3d/examples/testbed3.rs
index 9ef38786..fb5c21d8 100644
--- 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>()
@@ -209,7 +209,7 @@ fn main() {
         .add_systems(
             Update,
             (
-                ui_example_system,
+                //ui_example_system,
                 change_example.run_if(resource_changed::<ExampleSelected>),
             )
                 .chain(),
@@ -245,7 +245,7 @@ fn change_example(
 ) {
     next_state.set(examples_available.0[example_selected.0].state);
 }
-
+/*
 fn ui_example_system(
     mut contexts: EguiContexts,
     mut current_example: ResMut<ExampleSelected>,
@@ -269,3 +269,4 @@ fn ui_example_system(
         }
     });
 }
+  */
diff --git a/bevy_rapier_benches3d/Cargo.toml b/bevy_rapier_benches3d/Cargo.toml
index a7529bfb..bf9441f5 100644
--- a/bevy_rapier_benches3d/Cargo.toml
+++ b/bevy_rapier_benches3d/Cargo.toml
@@ -11,4 +11,4 @@ edition = "2021"
 [dependencies]
 rapier3d = { features = ["profiler"], version = "0.22" }
 bevy_rapier3d = { version = "0.27", path = "../bevy_rapier3d" }
-bevy = { version = "0.14", default-features = false }
+bevy = { version = "0.15.0-rc.2", default-features = false }
diff --git a/src/plugin/context/mod.rs b/src/plugin/context/mod.rs
index c239ec13..b04e5848 100644
--- a/src/plugin/context/mod.rs
+++ b/src/plugin/context/mod.rs
@@ -266,7 +266,7 @@ impl RapierContext {
             } => {
                 self.integration_parameters.dt = dt;
 
-                sim_to_render_time.diff += time.delta_seconds();
+                sim_to_render_time.diff += time.delta_secs();
 
                 while sim_to_render_time.diff > 0.0 {
                     // NOTE: in this comparison we do the same computations we
@@ -315,7 +315,7 @@ impl RapierContext {
                 time_scale,
                 substeps,
             } => {
-                self.integration_parameters.dt = (time.delta_seconds() * time_scale).min(max_dt);
+                self.integration_parameters.dt = (time.delta_secs() * time_scale).min(max_dt);
 
                 let mut substep_integration_parameters = self.integration_parameters;
                 substep_integration_parameters.dt /= substeps as Real;
diff --git a/src/plugin/plugin.rs b/src/plugin/plugin.rs
index 8933a7c8..7d6907c8 100644
--- a/src/plugin/plugin.rs
+++ b/src/plugin/plugin.rs
@@ -484,7 +484,7 @@ mod test {
             }
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(0.0, 13.0, 0.0)),
+                Transform::from_xyz(0.0, 13.0, 0.0),
                 RigidBody::Dynamic,
                 cuboid(0.5, 0.5, 0.5),
                 TestMarker,
diff --git a/src/plugin/systems/collider.rs b/src/plugin/systems/collider.rs
index 7d094f0d..83d0d6dc 100644
--- a/src/plugin/systems/collider.rs
+++ b/src/plugin/systems/collider.rs
@@ -488,7 +488,7 @@ pub fn init_colliders(
 pub fn init_async_colliders(
     mut commands: Commands,
     meshes: Res<Assets<Mesh>>,
-    async_colliders: Query<(Entity, &Handle<Mesh>, &AsyncCollider)>,
+    async_colliders: Query<(Entity, &Mesh3d, &AsyncCollider)>,
 ) {
     for (entity, mesh_handle, async_collider) in async_colliders.iter() {
         if let Some(mesh) = meshes.get(mesh_handle) {
@@ -514,7 +514,7 @@ pub fn init_async_scene_colliders(
     scene_spawner: Res<SceneSpawner>,
     async_colliders: Query<(Entity, &SceneInstance, &AsyncSceneCollider)>,
     children: Query<&Children>,
-    mesh_handles: Query<(&Name, &Handle<Mesh>)>,
+    mesh_handles: Query<(&Name, &Mesh3d)>,
 ) {
     for (scene_entity, scene_instance, async_collider) in async_colliders.iter() {
         if scene_spawner.instance_is_ready(**scene_instance) {
@@ -587,7 +587,10 @@ pub mod test {
         let mut meshes = app.world_mut().resource_mut::<Assets<Mesh>>();
         let cube = meshes.add(Cuboid::default());
 
-        let entity = app.world_mut().spawn((cube, AsyncCollider::default())).id();
+        let entity = app
+            .world_mut()
+            .spawn((Mesh3d(cube), AsyncCollider::default()))
+            .id();
 
         app.update();
 
@@ -615,10 +618,13 @@ pub mod test {
         let mut meshes = app.world_mut().resource_mut::<Assets<Mesh>>();
         let cube_handle = meshes.add(Cuboid::default());
         let capsule_handle = meshes.add(Capsule3d::default());
-        let cube = app.world_mut().spawn((Name::new("Cube"), cube_handle)).id();
+        let cube = app
+            .world_mut()
+            .spawn((Name::new("Cube"), Mesh3d(cube_handle)))
+            .id();
         let capsule = app
             .world_mut()
-            .spawn((Name::new("Capsule"), capsule_handle))
+            .spawn((Name::new("Capsule"), Mesh3d(capsule_handle)))
             .id();
 
         let mut scenes = app.world_mut().resource_mut::<Assets<Scene>>();
@@ -629,13 +635,13 @@ pub mod test {
         let parent = app
             .world_mut()
             .spawn((
-                scene,
+                SceneRoot(scene),
                 AsyncSceneCollider {
                     named_shapes,
                     ..Default::default()
                 },
             ))
-            .push_children(&[cube, capsule])
+            .add_children(&[cube, capsule])
             .id();
 
         app.update();
diff --git a/src/plugin/systems/mod.rs b/src/plugin/systems/mod.rs
index b1cc80f6..fdcaa945 100644
--- a/src/plugin/systems/mod.rs
+++ b/src/plugin/systems/mod.rs
@@ -207,16 +207,12 @@ pub mod tests {
         for (child_transform, parent_transform) in [zero, same, different] {
             let child = app
                 .world_mut()
-                .spawn((
-                    TransformBundle::from(child_transform),
-                    RigidBody::Fixed,
-                    Collider::ball(1.0),
-                ))
+                .spawn((child_transform, RigidBody::Fixed, Collider::ball(1.0)))
                 .id();
 
             app.world_mut()
-                .spawn(TransformBundle::from(parent_transform))
-                .push_children(&[child]);
+                .spawn(parent_transform)
+                .add_children(&[child]);
 
             app.update();
 
@@ -267,13 +263,13 @@ pub mod tests {
         for (child_transform, parent_transform) in [zero, same, different] {
             let child = app
                 .world_mut()
-                .spawn((TransformBundle::from(child_transform), Collider::ball(1.0)))
+                .spawn((child_transform, Collider::ball(1.0)))
                 .id();
 
             let parent = app
                 .world_mut()
-                .spawn((TransformBundle::from(parent_transform), RigidBody::Fixed))
-                .push_children(&[child])
+                .spawn((parent_transform, RigidBody::Fixed))
+                .add_children(&[child])
                 .id();
 
             app.update();
diff --git a/src/plugin/systems/multiple_rapier_contexts.rs b/src/plugin/systems/multiple_rapier_contexts.rs
index ec3dbb3a..9085934f 100644
--- a/src/plugin/systems/multiple_rapier_contexts.rs
+++ b/src/plugin/systems/multiple_rapier_contexts.rs
@@ -143,7 +143,7 @@ mod test {
         .add_systems(
             PostUpdate,
             setup_physics
-                .run_if(run_once())
+                .run_if(run_once)
                 .before(PhysicsSet::SyncBackend),
         );
         // Simulates 60 updates per seconds
@@ -188,13 +188,13 @@ mod test {
         }
         pub fn setup_physics(mut commands: Commands) {
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(0.0, -1.2, 0.0)),
+                Transform::from_xyz(0.0, -1.2, 0.0),
                 cuboid(4.0, 1.0, 1.0),
                 Marker::<'R'>,
             ));
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(0.0, 5.0, 0.0)),
+                Transform::from_xyz(0.0, 5.0, 0.0),
                 cuboid(4.0, 1.5, 1.0),
                 Sensor,
                 Marker::<'R'>,
@@ -202,7 +202,7 @@ mod test {
 
             commands
                 .spawn((
-                    TransformBundle::from(Transform::from_xyz(0.0, 13.0, 0.0)),
+                    Transform::from_xyz(0.0, 13.0, 0.0),
                     RigidBody::Dynamic,
                     cuboid(0.5, 0.5, 0.5),
                     ActiveEvents::COLLISION_EVENTS,
@@ -212,7 +212,7 @@ mod test {
                 ))
                 .with_children(|child_builder| {
                     child_builder.spawn((
-                        TransformBundle::from(Transform::from_xyz(0.0, -1.2, 0.0)),
+                        Transform::from_xyz(0.0, -1.2, 0.0),
                         cuboid(4.0, 1.0, 1.0),
                         Marker::<'C'>,
                         Marker::<'R'>,

From 7c29a878f72c10605d7f5bf9c550c6c5d8ebbc97 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Tue, 5 Nov 2024 09:20:46 +0100
Subject: [PATCH 2/7] fix tests

---
 bevy_rapier3d/examples/boxes3.rs            | 17 +++++++----------
 bevy_rapier3d/examples/locked_rotations3.rs |  8 +++-----
 src/pipeline/events.rs                      | 17 ++++++-----------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/bevy_rapier3d/examples/boxes3.rs b/bevy_rapier3d/examples/boxes3.rs
index e1078f40..9f862212 100644
--- a/bevy_rapier3d/examples/boxes3.rs
+++ b/bevy_rapier3d/examples/boxes3.rs
@@ -18,11 +18,10 @@ fn main() {
 }
 
 pub fn setup_graphics(mut commands: Commands) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-30.0, 30.0, 100.0)
-            .looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
-        ..Default::default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-30.0, 30.0, 100.0).looking_at(Vec3::new(0.0, 10.0, 0.0), Vec3::Y),
+    ));
 }
 
 pub fn setup_physics(mut commands: Commands) {
@@ -33,7 +32,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
     ));
 
@@ -65,12 +64,10 @@ pub fn setup_physics(mut commands: Commands) {
                 color += 1;
 
                 commands
-                    .spawn(TransformBundle::from(Transform::from_rotation(
-                        Quat::from_rotation_x(0.2),
-                    )))
+                    .spawn(Transform::from_rotation(Quat::from_rotation_x(0.2)))
                     .with_children(|child| {
                         child.spawn((
-                            TransformBundle::from(Transform::from_xyz(x, y, z)),
+                            Transform::from_xyz(x, y, z),
                             RigidBody::Dynamic,
                             Collider::cuboid(rad, rad, rad),
                             ColliderDebugColor(colors[color % 3]),
diff --git a/bevy_rapier3d/examples/locked_rotations3.rs b/bevy_rapier3d/examples/locked_rotations3.rs
index b78738ed..a4feab94 100644
--- a/bevy_rapier3d/examples/locked_rotations3.rs
+++ b/bevy_rapier3d/examples/locked_rotations3.rs
@@ -32,7 +32,7 @@ pub fn setup_physics(mut commands: Commands) {
     let ground_height = 0.1;
 
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, -ground_height, 0.0)),
+        Transform::from_xyz(0.0, -ground_height, 0.0),
         Collider::cuboid(ground_size, ground_height, ground_size),
     ));
 
@@ -40,7 +40,7 @@ pub fn setup_physics(mut commands: Commands) {
      * A rectangle that only rotates along the `x` axis.
      */
     commands.spawn((
-        TransformBundle::from(Transform::from_xyz(0.0, 3.0, 0.0)),
+        Transform::from_xyz(0.0, 3.0, 0.0),
         RigidBody::Dynamic,
         LockedAxes::TRANSLATION_LOCKED
             | LockedAxes::ROTATION_LOCKED_Y
@@ -52,9 +52,7 @@ pub fn setup_physics(mut commands: Commands) {
      * A tilted cuboid that cannot rotate.
      */
     commands.spawn((
-        TransformBundle::from(
-            Transform::from_xyz(0.0, 5.0, 0.0).with_rotation(Quat::from_rotation_x(1.0)),
-        ),
+        Transform::from_xyz(0.0, 5.0, 0.0).with_rotation(Quat::from_rotation_x(1.0)),
         RigidBody::Dynamic,
         LockedAxes::ROTATION_LOCKED,
         Collider::cuboid(0.6, 0.4, 0.4),
diff --git a/src/pipeline/events.rs b/src/pipeline/events.rs
index 4a169932..aee04803 100644
--- a/src/pipeline/events.rs
+++ b/src/pipeline/events.rs
@@ -129,7 +129,7 @@ mod test {
         app::{App, Startup, Update},
         prelude::{Commands, Component, Entity, Query, With},
         time::{TimePlugin, TimeUpdateStrategy},
-        transform::{bundles::TransformBundle, components::Transform, TransformPlugin},
+        transform::{components::Transform, TransformPlugin},
         MinimalPlugins,
     };
     use systems::tests::HeadlessRenderPlugin;
@@ -214,19 +214,16 @@ mod test {
             /*
              * Ground
              */
-            commands.spawn((
-                TransformBundle::from(Transform::from_xyz(0.0, -1.2, 0.0)),
-                cuboid(4.0, 1.0, 1.0),
-            ));
+            commands.spawn((Transform::from_xyz(0.0, -1.2, 0.0), cuboid(4.0, 1.0, 1.0)));
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(0.0, 5.0, 0.0)),
+                Transform::from_xyz(0.0, 5.0, 0.0),
                 cuboid(4.0, 1.5, 1.0),
                 Sensor,
             ));
 
             commands.spawn((
-                TransformBundle::from(Transform::from_xyz(0.0, 13.0, 0.0)),
+                Transform::from_xyz(0.0, 13.0, 0.0),
                 RigidBody::Dynamic,
                 cuboid(0.5, 0.5, 0.5),
                 ActiveEvents::COLLISION_EVENTS,
@@ -274,8 +271,7 @@ mod test {
         }
         pub fn setup_physics(mut commands: Commands) {
             for _i in 0..100 {
-                commands.spawn((
-                    TransformBundle::from(Transform::from_xyz(0.0, 0.0, 0.0)),
+                commands.spawn((Transform::from_xyz(0.0, 0.0, 0.0),
                     RigidBody::Dynamic,
                     cuboid(0.5, 0.5, 0.5),
                     ActiveEvents::all(),
@@ -289,8 +285,7 @@ mod test {
             let ground_height = 0.1;
             let starting_y = -0.5 - ground_height;
 
-            commands.spawn((
-                TransformBundle::from(Transform::from_xyz(0.0, starting_y, 0.0)),
+            commands.spawn((Transform::from_xyz(0.0, starting_y, 0.0),
                 cuboid(ground_size, ground_height, ground_size),
             ));
         }

From 8dc9d5f13b74e3f24a458b8c5f6ca92ad67b68cd Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Thu, 7 Nov 2024 09:22:05 +0100
Subject: [PATCH 3/7] re-enable inspector

---
 Cargo.toml                         | 3 ++-
 bevy_rapier2d/Cargo.toml           | 4 ++--
 bevy_rapier2d/examples/testbed2.rs | 8 ++++----
 bevy_rapier3d/Cargo.toml           | 6 +++---
 bevy_rapier3d/examples/testbed3.rs | 8 ++++----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 684265ff..cd1b8bc9 100644
--- 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
index bee19234..a41257da 100644
--- 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
index f8c4fd44..c13d290f 100644
--- 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
index fec36575..c17f1ccf 100644
--- a/bevy_rapier3d/Cargo.toml
+++ b/bevy_rapier3d/Cargo.toml
@@ -58,7 +58,7 @@ 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",
@@ -66,8 +66,8 @@ bevy = { version = "0.15.0-rc.2", default-features = false, features = [
 ] }
 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
index fb5c21d8..753a9d1f 100644
--- 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>()

From 41bc2f379eff451ed033849c96e84bb4e8abebb8 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Thu, 7 Nov 2024 09:26:27 +0100
Subject: [PATCH 4/7] fix fmt

---
 src/pipeline/events.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pipeline/events.rs b/src/pipeline/events.rs
index aee04803..eac362d1 100644
--- a/src/pipeline/events.rs
+++ b/src/pipeline/events.rs
@@ -271,7 +271,8 @@ mod test {
         }
         pub fn setup_physics(mut commands: Commands) {
             for _i in 0..100 {
-                commands.spawn((Transform::from_xyz(0.0, 0.0, 0.0),
+                commands.spawn((
+                    Transform::from_xyz(0.0, 0.0, 0.0),
                     RigidBody::Dynamic,
                     cuboid(0.5, 0.5, 0.5),
                     ActiveEvents::all(),
@@ -285,7 +286,8 @@ mod test {
             let ground_height = 0.1;
             let starting_y = -0.5 - ground_height;
 
-            commands.spawn((Transform::from_xyz(0.0, starting_y, 0.0),
+            commands.spawn((
+                Transform::from_xyz(0.0, starting_y, 0.0),
                 cuboid(ground_size, ground_height, ground_size),
             ));
         }

From 61d3ef2ffc0793008f652a3a2f3552f40bbecdcb Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Fri, 8 Nov 2024 10:23:36 +0100
Subject: [PATCH 5/7] fix warning

---
 bevy_rapier2d/examples/testbed2.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bevy_rapier2d/examples/testbed2.rs b/bevy_rapier2d/examples/testbed2.rs
index c13d290f..debfc0f0 100644
--- a/bevy_rapier2d/examples/testbed2.rs
+++ b/bevy_rapier2d/examples/testbed2.rs
@@ -13,7 +13,7 @@ mod player_movement2;
 mod rope_joint2;
 
 use bevy::prelude::*;
-use bevy_egui::{egui, EguiContexts, EguiPlugin};
+use bevy_egui::EguiPlugin;
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use bevy_rapier2d::prelude::*;
 

From a57d80c1db6fd4fe3023e6b735625a49f921a9d0 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Mon, 18 Nov 2024 17:12:29 +0100
Subject: [PATCH 6/7] interpolation exploration heavy wip

---
 bevy_rapier2d/Cargo.toml                 |  1 +
 bevy_rapier2d/examples/debugdump2.rs     |  2 +-
 bevy_rapier2d/examples/interpolation2.rs | 90 ++++++++++++++++++++++++
 src/plugin/context/mod.rs                |  5 +-
 4 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 bevy_rapier2d/examples/interpolation2.rs

diff --git a/bevy_rapier2d/Cargo.toml b/bevy_rapier2d/Cargo.toml
index a41257da..983e9b33 100644
--- a/bevy_rapier2d/Cargo.toml
+++ b/bevy_rapier2d/Cargo.toml
@@ -69,6 +69,7 @@ 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" }
+bevy_transform_interpolation = { git = "https://github.com/Jondolf/bevy_transform_interpolation.git" }
 
 [package.metadata.docs.rs]
 # Enable all the features when building the docs on docs.rs
diff --git a/bevy_rapier2d/examples/debugdump2.rs b/bevy_rapier2d/examples/debugdump2.rs
index 190a5079..88b302d0 100644
--- a/bevy_rapier2d/examples/debugdump2.rs
+++ b/bevy_rapier2d/examples/debugdump2.rs
@@ -28,6 +28,6 @@ fn main() {
             }
             true
         }));
-    let dot = schedule_graph_dot(&mut app, PostUpdate, &debugdump_settings);
+    let dot = schedule_graph_dot(&mut app, FixedUpdate, &debugdump_settings);
     println!("{dot}");
 }
diff --git a/bevy_rapier2d/examples/interpolation2.rs b/bevy_rapier2d/examples/interpolation2.rs
new file mode 100644
index 00000000..31b2184e
--- /dev/null
+++ b/bevy_rapier2d/examples/interpolation2.rs
@@ -0,0 +1,90 @@
+use std::{fs::File, io::Write};
+
+use bevy::prelude::*;
+use bevy_mod_debugdump::{schedule_graph, schedule_graph_dot};
+use bevy_rapier2d::prelude::*;
+use bevy_transform_interpolation::{
+    RotationInterpolation, TransformInterpolationPlugin, TranslationInterpolation,
+};
+
+fn main() {
+    let mut app = App::new();
+    app.insert_resource(ClearColor(Color::srgb(
+        0xF9 as f32 / 255.0,
+        0xF9 as f32 / 255.0,
+        0xFF as f32 / 255.0,
+    )))
+    .insert_resource(TimestepMode::Variable {
+        max_dt: 100f32,
+        time_scale: 1f32,
+        substeps: 10,
+    })
+    .insert_resource(Time::<Fixed>::from_seconds(0.4))
+    .add_plugins((
+        DefaultPlugins,
+        TransformInterpolationPlugin::default(),
+        RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0).in_fixed_schedule(),
+        RapierDebugRenderPlugin::default(),
+    ))
+    .add_systems(Startup, (setup_graphics, setup_physics));
+    let mut debugdump_settings = schedule_graph::Settings::default();
+    // Filter out some less relevant systems.
+    debugdump_settings.include_system =
+        Some(Box::new(|system: &(dyn System<In = (), Out = ()>)| {
+            if system.name().starts_with("bevy_pbr")
+                || system.name().starts_with("bevy_render")
+                || system.name().starts_with("bevy_gizmos")
+                || system.name().starts_with("bevy_winit")
+                || system.name().starts_with("bevy_sprite")
+            {
+                return false;
+            }
+            true
+        }));
+    let dot = schedule_graph_dot(&mut app, PostUpdate, &debugdump_settings);
+
+    let mut file = File::create("interpolation2.dot").expect("could not create file.");
+    file.set_len(0).unwrap();
+    file.write_all(&dot.as_bytes())
+        .expect("Could not write to file");
+
+    app.run();
+}
+
+pub fn setup_graphics(mut commands: Commands) {
+    commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
+}
+
+pub fn setup_physics(mut commands: Commands) {
+    /*
+     * Ground
+     */
+    let ground_size = 500.0;
+    let ground_height = 10.0;
+
+    commands.spawn((
+        Transform::from_xyz(0.0, 0.0 * -ground_height, 0.0),
+        Collider::cuboid(ground_size, ground_height),
+    ));
+
+    commands.spawn((
+        Transform::from_xyz(-40.0, 200.0, 0.0),
+        RigidBody::Dynamic,
+        Collider::ball(20.0),
+        Restitution {
+            coefficient: 1.0,
+            combine_rule: CoefficientCombineRule::Max,
+        },
+        TranslationInterpolation,
+        RotationInterpolation,
+    ));
+    commands.spawn((
+        Transform::from_xyz(40.0, 200.0, 0.0),
+        RigidBody::Dynamic,
+        Collider::ball(20.0),
+        Restitution {
+            coefficient: 1.0,
+            combine_rule: CoefficientCombineRule::Max,
+        },
+    ));
+}
diff --git a/src/plugin/context/mod.rs b/src/plugin/context/mod.rs
index b04e5848..c1bbba1e 100644
--- a/src/plugin/context/mod.rs
+++ b/src/plugin/context/mod.rs
@@ -320,6 +320,8 @@ impl RapierContext {
                 let mut substep_integration_parameters = self.integration_parameters;
                 substep_integration_parameters.dt /= substeps as Real;
 
+                dbg!(self.integration_parameters.dt);
+                dbg!(substep_integration_parameters.dt);
                 for _ in 0..substeps {
                     self.pipeline.step(
                         &gravity.into(),
@@ -345,7 +347,8 @@ impl RapierContext {
                 let mut substep_integration_parameters = self.integration_parameters;
                 substep_integration_parameters.dt = dt / (substeps as Real);
 
-                for _ in 0..substeps {
+                dbg!(substep_integration_parameters.dt);
+                for _ in 0..dbg!(substeps) {
                     self.pipeline.step(
                         &gravity.into(),
                         &substep_integration_parameters,

From 66c0b2ec1a32bec672ca9f8f1dcdc6542af17b2e Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Mon, 25 Nov 2024 16:07:55 +0100
Subject: [PATCH 7/7] add example for interpolation using
 bevy_transform_interpolation

---
 bevy_rapier2d/examples/interpolation2.rs | 42 +++++++++++++++++++-----
 src/plugin/context/mod.rs                |  5 +--
 src/render/mod.rs                        | 14 ++++++++
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/bevy_rapier2d/examples/interpolation2.rs b/bevy_rapier2d/examples/interpolation2.rs
index 31b2184e..535b6356 100644
--- a/bevy_rapier2d/examples/interpolation2.rs
+++ b/bevy_rapier2d/examples/interpolation2.rs
@@ -1,9 +1,9 @@
 use std::{fs::File, io::Write};
 
-use bevy::prelude::*;
+use bevy::{color::palettes, prelude::*};
 use bevy_mod_debugdump::{schedule_graph, schedule_graph_dot};
 use bevy_rapier2d::prelude::*;
-use bevy_transform_interpolation::{
+use bevy_transform_interpolation::prelude::{
     RotationInterpolation, TransformInterpolationPlugin, TranslationInterpolation,
 };
 
@@ -19,7 +19,7 @@ fn main() {
         time_scale: 1f32,
         substeps: 10,
     })
-    .insert_resource(Time::<Fixed>::from_seconds(0.4))
+    .insert_resource(Time::<Fixed>::from_hz(5.0))
     .add_plugins((
         DefaultPlugins,
         TransformInterpolationPlugin::default(),
@@ -27,6 +27,10 @@ fn main() {
         RapierDebugRenderPlugin::default(),
     ))
     .add_systems(Startup, (setup_graphics, setup_physics));
+    app.add_systems(
+        PostUpdate,
+        debug_with_transform_info.after(TransformSystem::TransformPropagate),
+    );
     let mut debugdump_settings = schedule_graph::Settings::default();
     // Filter out some less relevant systems.
     debugdump_settings.include_system =
@@ -50,6 +54,8 @@ fn main() {
 
     app.run();
 }
+#[derive(Component, Clone)]
+pub struct VisualBallDebug;
 
 pub fn setup_graphics(mut commands: Commands) {
     commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
@@ -67,24 +73,44 @@ pub fn setup_physics(mut commands: Commands) {
         Collider::cuboid(ground_size, ground_height),
     ));
 
-    commands.spawn((
-        Transform::from_xyz(-40.0, 200.0, 0.0),
+    let interpolated_ball = (
+        Transform::from_xyz(-0.0, 200.0, 0.0),
         RigidBody::Dynamic,
         Collider::ball(20.0),
         Restitution {
-            coefficient: 1.0,
+            coefficient: 0.99,
             combine_rule: CoefficientCombineRule::Max,
         },
         TranslationInterpolation,
         RotationInterpolation,
+        VisualBallDebug,
+    );
+    commands.spawn(interpolated_ball.clone());
+    commands.spawn(interpolated_ball).insert((
+        ColliderDebug::NeverRender,
+        Transform::from_xyz(-80.0, 200.0, 0.0),
     ));
     commands.spawn((
-        Transform::from_xyz(40.0, 200.0, 0.0),
+        Transform::from_xyz(80.0, 200.0, 0.0),
         RigidBody::Dynamic,
         Collider::ball(20.0),
         Restitution {
-            coefficient: 1.0,
+            coefficient: 0.99,
             combine_rule: CoefficientCombineRule::Max,
         },
+        VisualBallDebug,
     ));
 }
+
+pub fn debug_with_transform_info(
+    mut gizmos: Gizmos,
+    entities: Query<(&Transform, &Collider), With<VisualBallDebug>>,
+) {
+    for (transform, collider) in entities.iter() {
+        gizmos.circle(
+            transform.translation,
+            collider.as_ball().unwrap().radius(),
+            palettes::basic::RED,
+        );
+    }
+}
diff --git a/src/plugin/context/mod.rs b/src/plugin/context/mod.rs
index c1bbba1e..b04e5848 100644
--- a/src/plugin/context/mod.rs
+++ b/src/plugin/context/mod.rs
@@ -320,8 +320,6 @@ impl RapierContext {
                 let mut substep_integration_parameters = self.integration_parameters;
                 substep_integration_parameters.dt /= substeps as Real;
 
-                dbg!(self.integration_parameters.dt);
-                dbg!(substep_integration_parameters.dt);
                 for _ in 0..substeps {
                     self.pipeline.step(
                         &gravity.into(),
@@ -347,8 +345,7 @@ impl RapierContext {
                 let mut substep_integration_parameters = self.integration_parameters;
                 substep_integration_parameters.dt = dt / (substeps as Real);
 
-                dbg!(substep_integration_parameters.dt);
-                for _ in 0..dbg!(substeps) {
+                for _ in 0..substeps {
                     self.pipeline.step(
                         &gravity.into(),
                         &substep_integration_parameters,
diff --git a/src/render/mod.rs b/src/render/mod.rs
index abdd20b4..1d6fc2b6 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -161,6 +161,20 @@ impl<'world, 'state, 'world2, 'state2, 'a, 'b, 'c, 'v, 'p>
                     };
                 collider_debug == ColliderDebug::AlwaysRender
             }
+            DebugRenderObject::RigidBody(h, ..) => {
+                let Some(collider) = self.context.bodies.get(h) else {
+                    return false;
+                };
+                let entity = Entity::from_bits(collider.user_data as u64);
+
+                let collider_debug =
+                    if let Ok(collider_override) = self.override_visibility.get(entity) {
+                        *collider_override
+                    } else {
+                        self.default_collider_debug
+                    };
+                collider_debug == ColliderDebug::AlwaysRender
+            }
             _ => true,
         }
     }