Merge branch 'master' into infinite_fall_memory

2020-10-06 14:22:26 -05:00
parent 0c1b210109 6b1cd9cd40
commit dd8e25bc47
39 changed files with 1781 additions and 707 deletions
--- a/examples2d/add_remove2.rs
+++ b/examples2d/add_remove2.rs
@@ -28,14 +28,9 @@ pub fn init_world(testbed: &mut Testbed) {
            .map(|e| e.0)
            .collect();
        for handle in to_remove {
-            physics.pipeline.remove_rigid_body(
-                handle,
-                &mut physics.broad_phase,
-                &mut physics.narrow_phase,
-                &mut physics.bodies,
-                &mut physics.colliders,
-                &mut physics.joints,
-            );
+            physics
+                .bodies
+                .remove(handle, &mut physics.colliders, &mut physics.joints);
            graphics.remove_body_nodes(window, handle);
        }
    });