Revert "Fixed dimforge#383"

This reverts many commits (fb4f69a - ee5460a).
AnthonyTornetta · Jun 15, 2023 · a21969a · a21969a
1 parent ee5460a
commit a21969a
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 436 deletions.
diff --git a/bevy_rapier2d/examples/custom_system_setup2.rs b/bevy_rapier2d/examples/custom_system_setup2.rs
@@ -29,7 +29,6 @@ fn main() {
     schedule.configure_sets(
         (
             PhysicsSet::SyncBackend,
-            PhysicsSet::SyncBackend2,
             PhysicsSet::SyncBackendFlush,
             PhysicsSet::StepSimulation,
             PhysicsSet::Writeback,
@@ -42,11 +41,6 @@ fn main() {
             .in_base_set(PhysicsSet::SyncBackend),
     );
 
-    schedule.add_systems(
-        RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackend2)
-            .in_base_set(PhysicsSet::SyncBackend2),
-    );
-
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackendFlush)
             .in_base_set(PhysicsSet::SyncBackendFlush),

diff --git a/bevy_rapier3d/Cargo.toml b/bevy_rapier3d/Cargo.toml
@@ -41,7 +41,7 @@ async-collider = [ ]
 bevy = { version = "0.10", 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 = { git = "https://github.com/AnthonyTornetta/rapier", version = "0.17.2"}
+rapier3d = "0.17.0"
 bitflags = "1"
 #bevy_prototype_debug_lines = { version = "0.6", features = ["3d"], optional = true }
 log = "0.4"

diff --git a/bevy_rapier3d/examples/custom_system_setup3.rs b/bevy_rapier3d/examples/custom_system_setup3.rs
@@ -29,7 +29,6 @@ fn main() {
     schedule.configure_sets(
         (
             PhysicsSet::SyncBackend,
-            PhysicsSet::SyncBackend2,
             PhysicsSet::SyncBackendFlush,
             PhysicsSet::StepSimulation,
             PhysicsSet::Writeback,
@@ -42,11 +41,6 @@ fn main() {
             .in_base_set(PhysicsSet::SyncBackend),
     );
 
-    schedule.add_systems(
-        RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackend2)
-            .in_base_set(PhysicsSet::SyncBackend2),
-    );
-
     schedule.add_systems(
         RapierPhysicsPlugin::<NoUserData>::get_systems(PhysicsSet::SyncBackendFlush)
             .in_base_set(PhysicsSet::SyncBackendFlush),

diff --git a/bevy_rapier3d/examples/super_fast3.rs b/bevy_rapier3d/examples/super_fast3.rs
diff --git a/src/plugin/plugin.rs b/src/plugin/plugin.rs
@@ -86,18 +86,14 @@ where
                     .after(systems::update_character_controls)
                     .in_set(PropagateTransformsSet)
                     .in_set(RapierTransformPropagateSet),
-            )
-                .into_configs(),
-            PhysicsSet::SyncBackend2 => (
                 systems::init_async_colliders.after(RapierTransformPropagateSet),
                 systems::apply_scale.after(systems::init_async_colliders),
                 systems::apply_collider_user_changes.after(systems::apply_scale),
                 systems::apply_rigid_body_user_changes.after(systems::apply_collider_user_changes),
                 systems::apply_joint_user_changes.after(systems::apply_rigid_body_user_changes),
                 systems::init_rigid_bodies.after(systems::apply_joint_user_changes),
-                systems::sync_velocity.after(systems::init_rigid_bodies),
                 systems::init_colliders
-                    .after(systems::sync_velocity)
+                    .after(systems::init_rigid_bodies)
                     .after(systems::init_async_colliders),
                 systems::init_joints.after(systems::init_colliders),
                 systems::apply_initial_rigid_body_impulses.after(systems::init_colliders),
@@ -149,11 +145,7 @@ pub enum PhysicsSet {
     /// initializing) backend data structures with current component state.
     /// These systems typically run at the after [`CoreSet::Update`].
     SyncBackend,
-    /// This set runs the systems responsible for synchronizing (and
-    /// initializing) backend data structures with current component state.
-    /// These systems typically run immediately after [`PhysicsSet::SyncBackend`].
-    SyncBackend2,
-    /// The copy of [`apply_system_buffers`] that runs immediately after [`PhysicsSet::SyncBackend2`].
+    /// The copy of [`apply_system_buffers`] that runs immediately after [`PhysicsSet::SyncBackend`].
     SyncBackendFlush,
     /// The systems responsible for advancing the physics simulation, and
     /// updating the internal state for scene queries.
@@ -213,7 +205,6 @@ where
             app.configure_sets(
                 (
                     PhysicsSet::SyncBackend,
-                    PhysicsSet::SyncBackend2,
                     PhysicsSet::SyncBackendFlush,
                     PhysicsSet::StepSimulation,
                     PhysicsSet::Writeback,
@@ -226,11 +217,6 @@ where
             app.add_systems(
                 Self::get_systems(PhysicsSet::SyncBackend).in_base_set(PhysicsSet::SyncBackend),
             );
-
-            app.add_systems(
-                Self::get_systems(PhysicsSet::SyncBackend2).in_base_set(PhysicsSet::SyncBackend2),
-            );
-
             app.add_systems(
                 Self::get_systems(PhysicsSet::SyncBackendFlush)
                     .in_base_set(PhysicsSet::SyncBackendFlush),