dimforge · flmng0 · Apr 19, 2023 · Apr 20, 2023 · Apr 20, 2023 · Apr 20, 2023
diff --git a/bevy_rapier2d/Cargo.toml b/bevy_rapier2d/Cargo.toml
@@ -37,7 +37,7 @@ async-collider = [ ]
 
 
 [dependencies]
-bevy = { version = "0.10", default-features = false, features = ["bevy_asset", "bevy_scene"] }
+bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = ["bevy_asset", "bevy_scene"] }
 nalgebra = { version = "0.32.2", features = [ "convert-glam023" ] }
 # Don't enable the default features because we don't need the ColliderSet/RigidBodySet
 rapier2d = "0.17.0"
@@ -47,7 +47,7 @@ log = "0.4"
 serde = { version = "1", features = [ "derive" ], optional = true}
 
 [dev-dependencies]
-bevy = { version = "0.10", default-features = false, features = ["x11"]}
+bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = ["x11"]}
 oorandom = "11"
 approx = "0.5.1"
 glam = { version = "0.23", features = [ "approx" ] }

diff --git a/bevy_rapier2d/examples/boxes2.rs b/bevy_rapier2d/examples/boxes2.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/contact_filter2.rs b/bevy_rapier2d/examples/contact_filter2.rs
@@ -40,8 +40,8 @@ fn main() {
             100.0,
         ))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, setup_graphics)
+        .add_systems(Startup, setup_physics)
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/custom_system_setup2.rs b/bevy_rapier2d/examples/custom_system_setup2.rs
@@ -1,4 +1,6 @@
-use bevy::{core::FrameCount, ecs::schedule::ScheduleLabel, prelude::*};
+use bevy::{
+    core::FrameCount, ecs::schedule::ScheduleLabel, prelude::*, transform::TransformSystem,
+};
 use bevy_rapier2d::prelude::*;
 
 #[derive(ScheduleLabel, Hash, Debug, PartialEq, Eq, Clone)]
@@ -14,14 +16,10 @@ fn main() {
     )))
     .add_plugins(DefaultPlugins)
     .add_plugin(RapierDebugRenderPlugin::default())
-    .add_startup_system(setup_graphics)
-    .add_startup_system(setup_physics)
-    .add_system(
-        (|world: &mut World| {
-            world.run_schedule(SpecialSchedule);
-        })
-        .in_base_set(CoreSet::PostUpdate),
-    );
+    .add_systems(Startup, (setup_graphics, setup_physics))
+    .add_systems(PostUpdate, |world: &mut World| {
+        world.run_schedule(SpecialSchedule);
+    });
 
     // Do the setup however we want, maybe in its very own schedule
     let mut schedule = Schedule::new();
@@ -33,28 +31,29 @@ fn main() {
             PhysicsSet::StepSimulation,
             PhysicsSet::Writeback,
         )
-            .chain(),
+            .chain()
+            .before(TransformSystem::TransformPropagate),
     );
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackend)
-            .in_base_set(PhysicsSet::SyncBackend),
+            .in_set(PhysicsSet::SyncBackend),
     );
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackendFlush)
-            .in_base_set(PhysicsSet::SyncBackendFlush),
+            .in_set(PhysicsSet::SyncBackendFlush),
     );
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::StepSimulation)
-            .in_base_set(PhysicsSet::StepSimulation),
+            .in_set(PhysicsSet::StepSimulation),
     );
-    schedule.add_system(despawn_one_box.in_base_set(PhysicsSet::StepSimulation));
+    schedule.add_systems(despawn_one_box.in_set(PhysicsSet::StepSimulation));
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::Writeback)
-            .in_base_set(PhysicsSet::Writeback),
+            .in_set(PhysicsSet::Writeback),
     );
 
     app.add_schedule(SpecialSchedule, schedule)

diff --git a/bevy_rapier2d/examples/debug_despawn2.rs b/bevy_rapier2d/examples/debug_despawn2.rs
@@ -10,8 +10,8 @@ fn main() {
         .init_resource::<Game>()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .add_plugins(DefaultPlugins)
-        .add_startup_system(setup_game)
-        .add_system(cube_sleep_detection)
+        .add_systems(Startup, setup_game)
+        .add_systems(Update, cube_sleep_detection)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
         .run();

diff --git a/bevy_rapier2d/examples/despawn2.rs b/bevy_rapier2d/examples/despawn2.rs
@@ -23,10 +23,8 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
-        .add_system(despawn)
-        .add_system(resize)
+        .add_systems(Startup, (setup_graphics, setup_physics))
+        .add_systems(Update, (despawn, resize))
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/events2.rs b/bevy_rapier2d/examples/events2.rs
@@ -11,9 +11,8 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
-        .add_system(display_events.in_base_set(CoreSet::PostUpdate))
+        .add_systems(Startup, (setup_graphics, setup_physics))
+        .add_systems(PostUpdate, display_events)
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/joints2.rs b/bevy_rapier2d/examples/joints2.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/joints_despawn2.rs b/bevy_rapier2d/examples/joints_despawn2.rs
@@ -17,9 +17,8 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
-        .add_system(despawn)
+        .add_systems(Startup, (setup_graphics, setup_physics))
+        .add_systems(Update, despawn)
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/locked_rotations2.rs b/bevy_rapier2d/examples/locked_rotations2.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/multiple_colliders2.rs b/bevy_rapier2d/examples/multiple_colliders2.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier2d/examples/player_movement2.rs b/bevy_rapier2d/examples/player_movement2.rs
@@ -11,8 +11,8 @@ fn main() {
             }),
             ..default()
         }))
-        .add_startup_system(spawn_player)
-        .add_system(player_movement)
+        .add_systems(Startup, spawn_player)
+        .add_systems(Update, player_movement)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(RapierDebugRenderPlugin::default())
         .run();

diff --git a/bevy_rapier3d/Cargo.toml b/bevy_rapier3d/Cargo.toml
@@ -38,7 +38,7 @@ headless = [ ]
 async-collider = [ ]
 
 [dependencies]
-bevy = { version = "0.10", default-features = false, features = ["bevy_asset", "bevy_scene"] }
+bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = ["bevy_asset", "bevy_scene"] }
 nalgebra = { version = "0.32.2", features = [ "convert-glam023" ] }
 # Don't enable the default features because we don't need the ColliderSet/RigidBodySet
 rapier3d = "0.17.0"
@@ -48,10 +48,10 @@ log = "0.4"
 serde = { version = "1", features = [ "derive" ], optional = true}
 
 [dev-dependencies]
-bevy = { version = "0.10", default-features = false, features = ["x11"]}
+bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = ["x11"]}
 approx = "0.5.1"
 glam = { version = "0.23", features = [ "approx" ] }
 
 [package.metadata.docs.rs]
 # Enable all the features when building the docs on docs.rs
-features = [ "debug-render-3d", "serde-serialize" ]
+features = [ "debug-render-3d", "serde-serialize" ]
diff --git a/bevy_rapier3d/examples/boxes3.rs b/bevy_rapier3d/examples/boxes3.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/contact_filter3.rs b/bevy_rapier3d/examples/contact_filter3.rs
@@ -38,8 +38,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<SameUserDataFilter>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/custom_system_setup3.rs b/bevy_rapier3d/examples/custom_system_setup3.rs
@@ -14,14 +14,10 @@ fn main() {
     )))
     .add_plugins(DefaultPlugins)
     .add_plugin(RapierDebugRenderPlugin::default())
-    .add_startup_system(setup_graphics)
-    .add_startup_system(setup_physics)
-    .add_system(
-        (|world: &mut World| {
-            world.run_schedule(SpecialSchedule);
-        })
-        .in_base_set(CoreSet::PostUpdate),
-    );
+    .add_systems(Startup, (setup_graphics, setup_physics))
+    .add_systems(PostUpdate, |world: &mut World| {
+        world.run_schedule(SpecialSchedule);
+    });
 
     // Do the setup however we want, maybe in its very own schedule
     let mut schedule = Schedule::new();
@@ -38,23 +34,23 @@ fn main() {
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackend)
-            .in_base_set(PhysicsSet::SyncBackend),
+            .in_set(PhysicsSet::SyncBackend),
     );
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackendFlush)
-            .in_base_set(PhysicsSet::SyncBackendFlush),
+            .in_set(PhysicsSet::SyncBackendFlush),
     );
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::StepSimulation)
-            .in_base_set(PhysicsSet::StepSimulation),
+            .in_set(PhysicsSet::StepSimulation),
     );
-    schedule.add_system(despawn_one_box.in_base_set(PhysicsSet::StepSimulation));
+    schedule.add_systems(despawn_one_box.in_set(PhysicsSet::StepSimulation));
 
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::Writeback)
-            .in_base_set(PhysicsSet::Writeback),
+            .in_set(PhysicsSet::Writeback),
     );
 
     app.add_schedule(SpecialSchedule, schedule)

diff --git a/bevy_rapier3d/examples/despawn3.rs b/bevy_rapier3d/examples/despawn3.rs
@@ -17,9 +17,8 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
-        .add_system(despawn)
+        .add_systems(Startup, (setup_graphics, setup_physics))
+        .add_systems(Update, despawn)
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/events3.rs b/bevy_rapier3d/examples/events3.rs
@@ -11,9 +11,8 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
-        .add_system(display_events.in_base_set(CoreSet::PostUpdate))
+        .add_systems(Startup, (setup_graphics, setup_physics))
+        .add_systems(PostUpdate, display_events)
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/joints3.rs b/bevy_rapier3d/examples/joints3.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/joints_despawn3.rs b/bevy_rapier3d/examples/joints_despawn3.rs
@@ -17,9 +17,8 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
-        .add_system(despawn)
+        .add_systems(Startup, (setup_graphics, setup_physics))
+        .add_systems(Update, despawn)
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/locked_rotations3.rs b/bevy_rapier3d/examples/locked_rotations3.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/multiple_colliders3.rs b/bevy_rapier3d/examples/multiple_colliders3.rs
@@ -11,8 +11,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/ray_casting3.rs b/bevy_rapier3d/examples/ray_casting3.rs
@@ -12,9 +12,8 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
-        .add_system(cast_ray)
+        .add_systems(Startup, (setup_graphics, setup_physics))
+        .add_systems(Update, cast_ray)
         .run();
 }
 

diff --git a/bevy_rapier3d/examples/static_trimesh3.rs b/bevy_rapier3d/examples/static_trimesh3.rs
@@ -13,10 +13,9 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugin(RapierDebugRenderPlugin::default())
-        .add_startup_system(setup_graphics)
-        .add_startup_system(setup_physics)
+        .add_systems(Startup, (setup_graphics, setup_physics))
         .insert_resource(BallState::default())
-        .add_system(ball_spawner)
+        .add_systems(Update, ball_spawner)
         .run();
 }