aboutsummaryrefslogtreecommitdiff
path: root/src_testbed/harness/mod.rs
diff options
context:
space:
mode:
authorCrozet Sébastien <developer@crozet.re>2021-01-22 16:33:31 +0100
committerCrozet Sébastien <developer@crozet.re>2021-01-22 16:33:55 +0100
commit99c2184e134b40cca9cb22fe93a95a64295ae048 (patch)
tree06dfa0193e1c988d91097dc843eb63f591d105c8 /src_testbed/harness/mod.rs
parentaa838279a69cc287291d9079f1b82114f1339d7a (diff)
downloadrapier-99c2184e134b40cca9cb22fe93a95a64295ae048.tar.gz
rapier-99c2184e134b40cca9cb22fe93a95a64295ae048.tar.bz2
rapier-99c2184e134b40cca9cb22fe93a95a64295ae048.zip
Fix regressions introduced by the merge with master.
Diffstat (limited to 'src_testbed/harness/mod.rs')
-rw-r--r--src_testbed/harness/mod.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs
index 413ef52..1006e08 100644
--- a/src_testbed/harness/mod.rs
+++ b/src_testbed/harness/mod.rs
@@ -14,7 +14,6 @@ pub mod plugin;
pub struct RunState {
#[cfg(feature = "parallel")]
pub thread_pool: rapier::rayon::ThreadPool,
- #[cfg(feature = "parallel")]
pub num_threads: usize,
pub timestep_id: usize,
pub time: f32,
@@ -24,6 +23,8 @@ impl RunState {
pub fn new() -> Self {
#[cfg(feature = "parallel")]
let num_threads = num_cpus::get_physical();
+ #[cfg(not(feature = "parallel"))]
+ let num_threads = 1;
#[cfg(feature = "parallel")]
let thread_pool = rapier::rayon::ThreadPoolBuilder::new()
@@ -34,7 +35,6 @@ impl RunState {
Self {
#[cfg(feature = "parallel")]
thread_pool: thread_pool,
- #[cfg(feature = "parallel")]
num_threads,
timestep_id: 0,
time: 0.0,
@@ -111,6 +111,10 @@ impl Harness {
&mut self.physics.integration_parameters
}
+ pub fn clear_callbacks(&mut self) {
+ self.callbacks.clear();
+ }
+
pub fn physics_state_mut(&mut self) -> &mut PhysicsState {
&mut self.physics
}