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/examples2d/platform2.rs b/examples2d/platform2.rs
index 20b2e59..afd4d64 100644
--- a/examples2d/platform2.rs
+++ b/examples2d/platform2.rs
@@ -60,13 +60,13 @@ pub fn init_world(testbed: &mut Testbed) {
     /*
      * Setup a callback to control the platform.
      */
-    testbed.add_callback(move |_, physics, _, _, time| {
+    testbed.add_callback(move |_, _, physics, _, run_state| {
         let platform = physics.bodies.get_mut(platform_handle).unwrap();
         let mut next_pos = *platform.position();
 
         let dt = 0.016;
-        next_pos.translation.vector.y += (time * 5.0).sin() * dt;
-        next_pos.translation.vector.x += time.sin() * 5.0 * dt;
+        next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt;
+        next_pos.translation.vector.x += run_state.time.sin() * 5.0 * dt;
 
         if next_pos.translation.vector.x >= rad * 10.0 {
             next_pos.translation.vector.x -= dt;