Merge branch 'master' into split_geom

# Conflicts:
#	examples2d/sensor2.rs
#	examples3d/sensor3.rs
#	src/dynamics/integration_parameters.rs
#	src/dynamics/solver/parallel_island_solver.rs
#	src/dynamics/solver/velocity_constraint.rs
#	src/dynamics/solver/velocity_ground_constraint.rs
#	src_testbed/nphysics_backend.rs
#	src_testbed/physx_backend.rs
#	src_testbed/testbed.rs

1 files changed, 3 insertions, 3 deletions

diff --git a/examples3d/platform3.rs b/examples3d/platform3.rs
index 0975f39..7b5c986 100644
--- a/examples3d/platform3.rs
+++ b/examples3d/platform3.rs
@@ -65,7 +65,7 @@ pub fn init_world(testbed: &mut Testbed) {
      * Setup a callback to control the platform.
      */
     let mut count = 0;
-    testbed.add_callback(move |_, physics, _, _, time| {
+    testbed.add_callback(move |_, _, physics, _, run_state| {
         count += 1;
         if count % 100 > 50 {
             return;
@@ -75,8 +75,8 @@ pub fn init_world(testbed: &mut Testbed) {
             let mut next_pos = *platform.position();
 
             let dt = 0.016;
-            next_pos.translation.vector.y += (time * 5.0).sin() * dt;
-            next_pos.translation.vector.z += time.sin() * 5.0 * dt;
+            next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt;
+            next_pos.translation.vector.z += run_state.time.sin() * 5.0 * dt;
 
             if next_pos.translation.vector.z >= rad * 10.0 {
                 next_pos.translation.vector.z -= dt;