diff options
Diffstat (limited to 'src_testbed')
| -rw-r--r-- | src_testbed/harness/mod.rs | 4 | ||||
| -rw-r--r-- | src_testbed/plugin.rs | 9 | ||||
| -rw-r--r-- | src_testbed/testbed.rs | 2 | ||||
| -rw-r--r-- | src_testbed/ui.rs | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs index 916823e..45e52dc 100644 --- a/src_testbed/harness/mod.rs +++ b/src_testbed/harness/mod.rs @@ -19,10 +19,10 @@ pub struct RunState { impl RunState { pub fn new() -> Self { #[cfg(feature = "parallel")] - let num_threads = num_cpus::get_physical(); + let num_threads = num_cpus::get_physical(); #[cfg(feature = "parallel")] - let thread_pool = rapier::rayon::ThreadPoolBuilder::new() + let thread_pool = rapier::rayon::ThreadPoolBuilder::new() .num_threads(num_threads) .build() .unwrap(); diff --git a/src_testbed/plugin.rs b/src_testbed/plugin.rs index a807dde..877e7f6 100644 --- a/src_testbed/plugin.rs +++ b/src_testbed/plugin.rs @@ -1,12 +1,17 @@ +use crate::harness::RunState; use crate::physics::PhysicsState; use kiss3d::window::Window; use na::Point3; -use crate::harness::RunState; 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, run_state: &RunState); + 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; diff --git a/src_testbed/testbed.rs b/src_testbed/testbed.rs index 949afe7..f02380c 100644 --- a/src_testbed/testbed.rs +++ b/src_testbed/testbed.rs @@ -1025,7 +1025,7 @@ impl State for Testbed { window, &mut self.harness.physics.integration_parameters, &mut self.state, - &mut self.harness.state + &mut self.harness.state, ); } diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs index f72ca73..1b9084c 100644 --- a/src_testbed/ui.rs +++ b/src_testbed/ui.rs @@ -2,8 +2,8 @@ use kiss3d::conrod::{self, Borderable, Colorable, Labelable, Positionable, Sizea use kiss3d::window::Window; use rapier::dynamics::IntegrationParameters; -use crate::testbed::{RunMode, TestbedActionFlags, TestbedState, TestbedStateFlags}; use crate::harness::RunState; +use crate::testbed::{RunMode, TestbedActionFlags, TestbedState, TestbedStateFlags}; const SIDEBAR_W: f64 = 200.0; const ELEMENT_W: f64 = SIDEBAR_W - 20.0; |
