Update bevy to 0.15

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" }

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.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" }
 
 [package.metadata.docs.rs]
 # Enable all the features when building the docs on docs.rs

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),
             ));

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,

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),
             ));

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,

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]),

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),
             ));

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,

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),
                 ))

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),
                 ))

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,15 +29,15 @@ 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),
     ));
 
     /*
      * 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),