diff options
Diffstat (limited to 'src_testbed')
| -rw-r--r-- | src_testbed/harness/mod.rs | 13 | ||||
| -rw-r--r-- | src_testbed/harness/plugin.rs | 12 | ||||
| -rw-r--r-- | src_testbed/lib.rs | 2 | ||||
| -rw-r--r-- | src_testbed/plugin.rs | 1 |
4 files changed, 15 insertions, 13 deletions
diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs index 7d6a939..8ea141f 100644 --- a/src_testbed/harness/mod.rs +++ b/src_testbed/harness/mod.rs @@ -145,7 +145,9 @@ impl Harness { } // type StepCallback = FnMut(&mut PhysicsState, &PhysicsEvents, f32); - pub fn add_callback<F: FnMut(&mut PhysicsState, &PhysicsEvents, &HarnessState, f32) + 'static>( + pub fn add_callback< + F: FnMut(&mut PhysicsState, &PhysicsEvents, &HarnessState, f32) + 'static, + >( &mut self, callback: F, ) { @@ -196,16 +198,11 @@ impl Harness { } for f in &mut self.callbacks { - f( - &mut self.physics, - &self.events, - &self.state, - self.time, - ) + f(&mut self.physics, &self.events, &self.state, self.time) } for plugin in &mut self.plugins { - plugin.run_callbacks(&mut self.physics, &self.events,&self.state, self.time) + plugin.run_callbacks(&mut self.physics, &self.events, &self.state, self.time) } self.events.poll_all(); diff --git a/src_testbed/harness/plugin.rs b/src_testbed/harness/plugin.rs index d5cf158..a03fa38 100644 --- a/src_testbed/harness/plugin.rs +++ b/src_testbed/harness/plugin.rs @@ -1,10 +1,16 @@ use crate::harness::HarnessState; -use crate::PhysicsState; use crate::physics::PhysicsEvents; +use crate::PhysicsState; pub trait HarnessPlugin { //FIXME: is run_callbacks needed? - fn run_callbacks(&mut self, physics: &mut PhysicsState, events: &PhysicsEvents, harness_state: &HarnessState, t: f32); + fn run_callbacks( + &mut self, + physics: &mut PhysicsState, + events: &PhysicsEvents, + harness_state: &HarnessState, + t: f32, + ); fn step(&mut self, physics: &mut PhysicsState); fn profiling_string(&self) -> String; -}
\ No newline at end of file +} diff --git a/src_testbed/lib.rs b/src_testbed/lib.rs index daf364b..5358e7c 100644 --- a/src_testbed/lib.rs +++ b/src_testbed/lib.rs @@ -22,8 +22,8 @@ extern crate bitflags; extern crate log; pub use crate::engine::GraphicsManager; -pub use crate::physics::PhysicsState; pub use crate::harness::plugin::HarnessPlugin; +pub use crate::physics::PhysicsState; pub use crate::plugin::TestbedPlugin; pub use crate::testbed::Testbed; diff --git a/src_testbed/plugin.rs b/src_testbed/plugin.rs index 811e33c..872cdf5 100644 --- a/src_testbed/plugin.rs +++ b/src_testbed/plugin.rs @@ -10,4 +10,3 @@ pub trait TestbedPlugin { fn draw(&mut self); fn profiling_string(&self) -> String; } - |
