From 9ee4610a88f87e27af0def9d245c9dd9850c58fa Mon Sep 17 00:00:00 2001 From: Aceeri Date: Wed, 26 Jul 2023 06:18:36 -0700 Subject: [PATCH] Remove SyncBackendFlush, init_async_colliders dummy systems --- bevy_rapier2d/examples/custom_system_setup2.rs | 3 --- bevy_rapier3d/examples/custom_system_setup3.rs | 3 --- src/plugin/plugin.rs | 1 + src/plugin/systems.rs | 4 ---- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/bevy_rapier2d/examples/custom_system_setup2.rs b/bevy_rapier2d/examples/custom_system_setup2.rs index 3e9c810e..8ee9d8eb 100644 --- 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::::get_systems(PhysicsSet::SyncBackend) .in_set(PhysicsSet::SyncBackend), - RapierPhysicsPlugin::::get_systems(PhysicsSet::SyncBackendFlush) - .in_set(PhysicsSet::SyncBackendFlush), ( RapierPhysicsPlugin::::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 index ea422422..073cd95f 100644 --- 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::::get_systems(PhysicsSet::SyncBackend) .in_set(PhysicsSet::SyncBackend), - RapierPhysicsPlugin::::get_systems(PhysicsSet::SyncBackendFlush) - .in_set(PhysicsSet::SyncBackendFlush), ( RapierPhysicsPlugin::::get_systems(PhysicsSet::StepSimulation), despawn_one_box, diff --git a/src/plugin/plugin.rs b/src/plugin/plugin.rs index 779c49bb..398b7bb4 100644 --- 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 index acd9ec04..f14fda65 100644 --- a/src/plugin/systems.rs +++ b/src/plugin/systems.rs @@ -695,10 +695,6 @@ pub fn step_simulation( } } -/// 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"))]