Merge branch 'master' into infinite_fall_memory

2 files changed, 22 insertions, 20 deletions

diff --git a/examples3d/add_remove3.rs b/examples3d/add_remove3.rs
index 17aad44..6b58adf 100644
--- a/examples3d/add_remove3.rs
+++ b/examples3d/add_remove3.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);
         }
     });
diff --git a/examples3d/platform3.rs b/examples3d/platform3.rs
index 3836baf..6c3483e 100644
--- a/examples3d/platform3.rs
+++ b/examples3d/platform3.rs
@@ -64,22 +64,29 @@ pub fn init_world(testbed: &mut Testbed) {
     /*
      * Setup a callback to control the platform.
      */
+    let mut count = 0;
     testbed.add_callback(move |_, physics, _, _, time| {
-        let mut platform = physics.bodies.get_mut(platform_handle).unwrap();
-        let mut next_pos = platform.position;
+        count += 1;
+        if count % 100 > 50 {
+            return;
+        }
 
-        let dt = 0.016;
-        next_pos.translation.vector.y += (time * 5.0).sin() * dt;
-        next_pos.translation.vector.z += time.sin() * 5.0 * dt;
+        if let Some(mut platform) = physics.bodies.get_mut(platform_handle) {
+            let mut next_pos = platform.position;
 
-        if next_pos.translation.vector.z >= rad * 10.0 {
-            next_pos.translation.vector.z -= dt;
-        }
-        if next_pos.translation.vector.z <= -rad * 10.0 {
-            next_pos.translation.vector.z += dt;
-        }
+            let dt = 0.016;
+            next_pos.translation.vector.y += (time * 5.0).sin() * dt;
+            next_pos.translation.vector.z += time.sin() * 5.0 * dt;
 
-        platform.set_next_kinematic_position(next_pos);
+            if next_pos.translation.vector.z >= rad * 10.0 {
+                next_pos.translation.vector.z -= dt;
+            }
+            if next_pos.translation.vector.z <= -rad * 10.0 {
+                next_pos.translation.vector.z += dt;
+            }
+
+            platform.set_next_kinematic_position(next_pos);
+        }
     });
 
     /*