Update to Bevy 0.16.0-rc.1

README.md

@@ -161,6 +161,7 @@ cargo run --example cubes --no-default-features --features "3d f64 parry-f64"
 
 | Bevy    | Avian |
 | ------- | ----- |
+| 0.16 RC | main  |
 | 0.15    | 0.2   |
 | 0.14    | 0.1   |
 

crates/avian2d/Cargo.toml

@@ -68,10 +68,13 @@ bench = false
 
 [dependencies]
 avian_derive = { path = "../avian_derive", version = "0.2" }
-bevy = { version = "0.15", default-features = false }
-bevy_math = { version = "0.15" }
-bevy_heavy = { version = "0.1" }
-bevy_transform_interpolation = { version = "0.1" }
+bevy = { version = "0.16.0-rc.1", default-features = false, features = [
+    "std",
+    "bevy_log",
+] }
+bevy_math = { version = "0.16.0-rc.1" }
+bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy" }
+bevy_transform_interpolation = { git = "https://github.com/Jondolf/bevy_transform_interpolation" }
 libm = { version = "0.2", optional = true }
 parry2d = { version = "0.17", optional = true }
 parry2d-f64 = { version = "0.17", optional = true }
@@ -87,13 +90,16 @@ bitflags = "2.5.0"
 [dev-dependencies]
 examples_common_2d = { path = "../examples_common_2d" }
 benches_common_2d = { path = "../benches_common_2d" }
-bevy_math = { version = "0.15", features = ["approx"] }
-bevy_heavy = { version = "0.1", features = ["approx"] }
+bevy_math = { version = "0.16.0-rc.1", features = ["approx"] }
+bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy", features = [
+    "approx",
+] }
 glam = { version = "0.29", features = ["bytemuck"] }
 approx = "0.5"
 bytemuck = "1.19"
 criterion = { version = "0.5", features = ["html_reports"] }
-bevy_mod_debugdump = { version = "0.12" }
+# TODO: Update to the latest version when it's available.
+# bevy_mod_debugdump = { version = "0.12" }
 
 [lints]
 workspace = true

crates/avian2d/examples/chain_2d.rs

@@ -71,11 +71,11 @@ fn follow_mouse(
     windows: Query<&Window, With<PrimaryWindow>>,
     camera: Query<(&Camera, &GlobalTransform)>,
     mut follower: Query<&mut Transform, With<FollowMouse>>,
-) {
+) -> Result {
     if buttons.pressed(MouseButton::Left) {
-        let window = windows.single();
-        let (camera, camera_transform) = camera.single();
-        let mut follower_position = follower.single_mut();
+        let window = windows.single()?;
+        let (camera, camera_transform) = camera.single()?;
+        let mut follower_position = follower.single_mut()?;
 
         if let Some(cursor_world_pos) = window
             .cursor_position()
@@ -85,4 +85,6 @@ fn follow_mouse(
                 cursor_world_pos.extend(follower_position.translation.z);
         }
     }
+
+    Ok(())
 }

crates/avian2d/examples/debugdump_2d.rs

@@ -1,10 +1,13 @@
 //! Run with:
 //! `cargo run --example debugdump_2d > dump.dot  && dot -Tsvg dump.dot > dump.svg`
 
-use avian2d::prelude::*;
-use bevy::prelude::*;
+// use avian2d::prelude::*;
+// use bevy::prelude::*;
 
 fn main() {
+    todo!("`bevy_mod_debugdump` is not compatible with Bevy 0.16 yet. This example will be updated when it is.");
+
+    /*
     let mut app = App::new();
 
     app.add_plugins((PhysicsPlugins::default(), PhysicsDebugPlugin::default()));
@@ -14,5 +17,7 @@ fn main() {
     // - SubstepSchedule
     // - FixedPostUpdate
     // - Update
+
     bevy_mod_debugdump::print_schedule_graph(&mut app, PhysicsSchedule);
+    */
 }

crates/avian2d/examples/determinism_2d.rs

@@ -205,7 +205,7 @@ fn clear_scene(
 ) {
     step.0 = 0;
     for entity in &query {
-        commands.entity(entity).despawn_recursive();
+        commands.entity(entity).despawn();
     }
 }
 

crates/avian2d/examples/dynamic_character_2d/plugin.rs

@@ -136,11 +136,11 @@ fn keyboard_input(
     let direction = horizontal as Scalar;
 
     if direction != 0.0 {
-        movement_event_writer.send(MovementAction::Move(direction));
+        movement_event_writer.write(MovementAction::Move(direction));
     }
 
     if keyboard_input.just_pressed(KeyCode::Space) {
-        movement_event_writer.send(MovementAction::Jump);
+        movement_event_writer.write(MovementAction::Jump);
     }
 }
 
@@ -151,11 +151,11 @@ fn gamepad_input(
 ) {
     for gamepad in gamepads.iter() {
         if let Some(x) = gamepad.get(GamepadAxis::LeftStickX) {
-            movement_event_writer.send(MovementAction::Move(x as Scalar));
+            movement_event_writer.write(MovementAction::Move(x as Scalar));
         }
 
         if gamepad.just_pressed(GamepadButton::South) {
-            movement_event_writer.send(MovementAction::Jump);
+            movement_event_writer.write(MovementAction::Jump);
         }
     }
 }

crates/avian2d/examples/kinematic_character_2d/plugin.rs

@@ -150,11 +150,11 @@ fn keyboard_input(
     let direction = horizontal as Scalar;
 
     if direction != 0.0 {
-        movement_event_writer.send(MovementAction::Move(direction));
+        movement_event_writer.write(MovementAction::Move(direction));
     }
 
     if keyboard_input.just_pressed(KeyCode::Space) {
-        movement_event_writer.send(MovementAction::Jump);
+        movement_event_writer.write(MovementAction::Jump);
     }
 }
 
@@ -165,11 +165,11 @@ fn gamepad_input(
 ) {
     for gamepad in gamepads.iter() {
         if let Some(x) = gamepad.get(GamepadAxis::LeftStickX) {
-            movement_event_writer.send(MovementAction::Move(x as Scalar));
+            movement_event_writer.write(MovementAction::Move(x as Scalar));
         }
 
         if gamepad.just_pressed(GamepadButton::South) {
-            movement_event_writer.send(MovementAction::Jump);
+            movement_event_writer.write(MovementAction::Jump);
         }
     }
 }

crates/avian2d/examples/one_way_platform_2d.rs

@@ -8,9 +8,11 @@
 
 use avian2d::{math::*, prelude::*};
 use bevy::{
-    ecs::system::{lifetimeless::Read, SystemParam},
+    ecs::{
+        entity::hash_set::EntityHashSet,
+        system::{lifetimeless::Read, SystemParam},
+    },
     prelude::*,
-    utils::HashSet,
 };
 use examples_common_2d::ExampleCommonPlugin;
 
@@ -46,7 +48,7 @@ struct JumpImpulse(Scalar);
 // Here we use required components, but you could also add it manually.
 #[derive(Clone, Eq, PartialEq, Debug, Default, Component)]
 #[require(ActiveCollisionHooks(|| ActiveCollisionHooks::MODIFY_CONTACTS))]
-pub struct OneWayPlatform(HashSet<Entity>);
+pub struct OneWayPlatform(EntityHashSet);
 
 /// A component to control how an actor interacts with a one-way platform.
 #[derive(Copy, Clone, Eq, PartialEq, Debug, Default, Component, Reflect)]

crates/avian2d/examples/sensor.rs

@@ -108,7 +108,7 @@ fn keyboard_input1(
     }
     let space = keyboard_input.pressed(KeyCode::Space);
     if space {
-        movement_event_writer.send(MovementAction::Stop);
+        movement_event_writer.write(MovementAction::Stop);
         return;
     }
 
@@ -120,7 +120,7 @@ fn keyboard_input1(
     let vertical = up as i8 - down as i8;
     let direction = Vector::new(horizontal as Scalar, vertical as Scalar);
     if direction != Vector::ZERO {
-        movement_event_writer.send(MovementAction::Velocity(direction));
+        movement_event_writer.write(MovementAction::Velocity(direction));
     }
 }
 // use position offset
@@ -140,7 +140,7 @@ fn keyboard_input2(
     let vertical = up as i8 - down as i8;
     let direction = Vector::new(horizontal as Scalar, vertical as Scalar);
     if direction != Vector::ZERO {
-        movement_event_writer.send(MovementAction::Offset(direction));
+        movement_event_writer.write(MovementAction::Offset(direction));
     }
 }
 
@@ -219,16 +219,16 @@ fn update_velocity_text(
     character_query: Query<(&LinearVelocity, Has<Sleeping>), With<Character>>,
     pressure_plate_query: Query<Has<Sleeping>, With<PressurePlate>>,
     mut text_query: Query<&mut Text, With<CharacterVelocityText>>,
-) {
-    if let (Ok((velocity, character_sleeping)), Ok(pressure_plate_sleeping)) = (
-        character_query.get_single(),
-        pressure_plate_query.get_single(),
-    ) {
-        text_query.single_mut().0 = format!(
+) -> Result {
+    if let (Ok((velocity, character_sleeping)), Ok(pressure_plate_sleeping)) =
+        (character_query.single(), pressure_plate_query.single())
+    {
+        text_query.single_mut()?.0 = format!(
             "Velocity: {:.4}, {:.4}\nCharacter sleeping:{}\nPressure plate sleeping: {}",
             velocity.x, velocity.y, character_sleeping, pressure_plate_sleeping
         );
     }
+    Ok(())
 }
 
 fn log_events(mut started: EventReader<CollisionStarted>, mut ended: EventReader<CollisionEnded>) {

crates/avian3d/Cargo.toml

@@ -70,10 +70,13 @@ bench = false
 
 [dependencies]
 avian_derive = { path = "../avian_derive", version = "0.2" }
-bevy = { version = "0.15", default-features = false }
-bevy_math = { version = "0.15" }
-bevy_heavy = { version = "0.1" }
-bevy_transform_interpolation = { version = "0.1" }
+bevy = { version = "0.16.0-rc.1", default-features = false, features = [
+    "std",
+    "bevy_log",
+] }
+bevy_math = { version = "0.16.0-rc.1" }
+bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy" }
+bevy_transform_interpolation = { git = "https://github.com/Jondolf/bevy_transform_interpolation" }
 libm = { version = "0.2", optional = true }
 parry3d = { version = "0.17", optional = true }
 parry3d-f64 = { version = "0.17", optional = true }
@@ -89,15 +92,18 @@ bitflags = "2.5.0"
 [dev-dependencies]
 examples_common_3d = { path = "../examples_common_3d" }
 benches_common_3d = { path = "../benches_common_3d" }
-bevy = { version = "0.15", default-features = false, features = [
+bevy = { version = "0.16.0-rc.1", default-features = false, features = [
     "bevy_gltf",
     "animation",
 ] }
-bevy_math = { version = "0.15", features = ["approx"] }
-bevy_heavy = { version = "0.1", features = ["approx"] }
+bevy_math = { version = "0.16.0-rc.1", features = ["approx"] }
+bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy", features = [
+    "approx",
+] }
 approx = "0.5"
 criterion = { version = "0.5", features = ["html_reports"] }
-bevy_mod_debugdump = { version = "0.12" }
+# TODO: Update to the latest version when it's available.
+# bevy_mod_debugdump = { version = "0.12" }
 
 [lints]
 workspace = true

crates/avian3d/examples/custom_constraint.rs

@@ -92,8 +92,8 @@ impl XpbdConstraint<2> for CustomDistanceConstraint {
 
 impl MapEntities for CustomDistanceConstraint {
     fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
-        self.entity1 = entity_mapper.map_entity(self.entity1);
-        self.entity2 = entity_mapper.map_entity(self.entity2);
+        self.entity1 = entity_mapper.get_mapped(self.entity1);
+        self.entity2 = entity_mapper.get_mapped(self.entity2);
     }
 }
 

crates/avian3d/examples/debugdump_3d.rs

@@ -1,11 +1,13 @@
 //! Run with:
 //! `cargo run --example debugdump_3d > dump.dot  && dot -Tsvg dump.dot > dump.svg`
 
-use avian3d::debug_render::PhysicsDebugPlugin;
-use avian3d::prelude::*;
-use bevy::prelude::*;
+// use avian3d::prelude::*;
+// use bevy::prelude::*;
 
 fn main() {
+    todo!("`bevy_mod_debugdump` is not compatible with Bevy 0.16 yet. This example will be updated when it is.");
+
+    /*
     let mut app = App::new();
 
     app.add_plugins((PhysicsPlugins::default(), PhysicsDebugPlugin::default()));
@@ -16,4 +18,5 @@ fn main() {
     // - FixedPostUpdate
     // - Update
     bevy_mod_debugdump::print_schedule_graph(&mut app, PhysicsSchedule);
+    */
 }

crates/avian3d/examples/diagnostics.rs

@@ -19,7 +19,7 @@ fn main() {
             // in a debug UI. Requires the `diagnostic_ui` feature.
             PhysicsDiagnosticsUiPlugin,
             // Optional: Add the `FrameTimeDiagnosticsPlugin` to display frame time.
-            FrameTimeDiagnosticsPlugin,
+            FrameTimeDiagnosticsPlugin::default(),
         ))
         // The `PhysicsDiagnosticsUiSettings` resource can be used to configure the diagnostics UI.
         //

crates/avian3d/examples/dynamic_character_3d/plugin.rs

@@ -144,11 +144,11 @@ fn keyboard_input(
     let direction = Vector2::new(horizontal as Scalar, vertical as Scalar).clamp_length_max(1.0);
 
     if direction != Vector2::ZERO {
-        movement_event_writer.send(MovementAction::Move(direction));
+        movement_event_writer.write(MovementAction::Move(direction));
     }
 
     if keyboard_input.just_pressed(KeyCode::Space) {
-        movement_event_writer.send(MovementAction::Jump);
+        movement_event_writer.write(MovementAction::Jump);
     }
 }
 
@@ -162,13 +162,13 @@ fn gamepad_input(
             gamepad.get(GamepadAxis::LeftStickX),
             gamepad.get(GamepadAxis::LeftStickY),
         ) {
-            movement_event_writer.send(MovementAction::Move(
+            movement_event_writer.write(MovementAction::Move(
                 Vector2::new(x as Scalar, y as Scalar).clamp_length_max(1.0),
             ));
         }
 
         if gamepad.just_pressed(GamepadButton::South) {
-            movement_event_writer.send(MovementAction::Jump);
+            movement_event_writer.write(MovementAction::Jump);
         }
     }
 }

crates/avian3d/examples/kinematic_character_3d/plugin.rs

@@ -159,11 +159,11 @@ fn keyboard_input(
     let direction = Vector2::new(horizontal as Scalar, vertical as Scalar).clamp_length_max(1.0);
 
     if direction != Vector2::ZERO {
-        movement_event_writer.send(MovementAction::Move(direction));
+        movement_event_writer.write(MovementAction::Move(direction));
     }
 
     if keyboard_input.just_pressed(KeyCode::Space) {
-        movement_event_writer.send(MovementAction::Jump);
+        movement_event_writer.write(MovementAction::Jump);
     }
 }
 
@@ -177,13 +177,13 @@ fn gamepad_input(
             gamepad.get(GamepadAxis::LeftStickX),
             gamepad.get(GamepadAxis::LeftStickY),
         ) {
-            movement_event_writer.send(MovementAction::Move(
+            movement_event_writer.write(MovementAction::Move(
                 Vector2::new(x as Scalar, y as Scalar).clamp_length_max(1.0),
             ));
         }
 
         if gamepad.just_pressed(GamepadButton::South) {
-            movement_event_writer.send(MovementAction::Jump);
+            movement_event_writer.write(MovementAction::Jump);
         }
     }
 }