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, 7 insertions, 1 deletions

diff --git a/src_testbed/plugin.rs b/src_testbed/plugin.rs
index 872cdf5..877e7f6 100644
--- a/src_testbed/plugin.rs
+++ b/src_testbed/plugin.rs
@@ -1,3 +1,4 @@
+use crate::harness::RunState;
 use crate::physics::PhysicsState;
 use kiss3d::window::Window;
 use na::Point3;
@@ -5,7 +6,12 @@ use na::Point3;
 pub trait TestbedPlugin {
     fn init_graphics(&mut self, window: &mut Window, gen_color: &mut dyn FnMut() -> Point3<f32>);
     fn clear_graphics(&mut self, window: &mut Window);
-    fn run_callbacks(&mut self, window: &mut Window, physics: &mut PhysicsState, t: f32);
+    fn run_callbacks(
+        &mut self,
+        window: &mut Window,
+        physics: &mut PhysicsState,
+        run_state: &RunState,
+    );
     fn step(&mut self, physics: &mut PhysicsState);
     fn draw(&mut self);
     fn profiling_string(&self) -> String;