Remove SyncBackendFlush, init_async_colliders dummy systems

dimforge · Jul 26, 2023 · 9ee4610 · 9ee4610
1 parent e511b51
commit 9ee4610
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/bevy_rapier2d/examples/custom_system_setup2.rs b/bevy_rapier2d/examples/custom_system_setup2.rs
@@ -20,7 +20,6 @@ fn main() {
         PostUpdate,
         (
             PhysicsSet::SyncBackend,
-            PhysicsSet::SyncBackendFlush,
             PhysicsSet::StepSimulation,
             PhysicsSet::Writeback,
         )
@@ -33,8 +32,6 @@ fn main() {
         (
             RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackend)
                 .in_set(PhysicsSet::SyncBackend),
-            RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackendFlush)
-                .in_set(PhysicsSet::SyncBackendFlush),
             (
                 RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::StepSimulation),
                 despawn_one_box,

diff --git a/bevy_rapier3d/examples/custom_system_setup3.rs b/bevy_rapier3d/examples/custom_system_setup3.rs
@@ -20,7 +20,6 @@ fn main() {
         PostUpdate,
         (
             PhysicsSet::SyncBackend,
-            PhysicsSet::SyncBackendFlush,
             PhysicsSet::StepSimulation,
             PhysicsSet::Writeback,
         )
@@ -33,8 +32,6 @@ fn main() {
         (
             RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackend)
                 .in_set(PhysicsSet::SyncBackend),
-            RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackendFlush)
-                .in_set(PhysicsSet::SyncBackendFlush),
             (
                 RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::StepSimulation),
                 despawn_one_box,

diff --git a/src/plugin/plugin.rs b/src/plugin/plugin.rs
@@ -73,6 +73,7 @@ where
                     .in_set(RapierTransformPropagateSet),
                 #[cfg(all(feature = "dim3", feature = "async-collider"))]
                 systems::init_async_scene_colliders.after(bevy::scene::scene_spawner_system),
+                #[cfg(all(feature = "dim3", feature = "async-collider"))]
                 systems::init_async_colliders,
                 systems::init_rigid_bodies,
                 systems::init_colliders,

diff --git a/src/plugin/systems.rs b/src/plugin/systems.rs
@@ -695,10 +695,6 @@ pub fn step_simulation<Hooks>(
     }
 }
 
-/// NOTE: This currently does nothing in 2D, or without the async-collider feature
-#[cfg(any(feature = "dim2", not(feature = "async-collider")))]
-pub fn init_async_colliders() {}
-
 /// System responsible for creating `Collider` components from `AsyncCollider` components if the
 /// corresponding mesh has become available.
 #[cfg(all(feature = "dim3", feature = "async-collider"))]