From 94c67a0c31e9da373c3aca3560dc9accc3308a7a Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Mon, 28 Dec 2020 18:12:33 +0100
Subject: Support compound shapes.

---
 src_testbed/harness/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src_testbed/harness/mod.rs')

diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs
index fa6c4c6..c95a722 100644
--- a/src_testbed/harness/mod.rs
+++ b/src_testbed/harness/mod.rs
@@ -43,7 +43,7 @@ impl Harness {
         let event_handler = ChannelEventCollector::new(proximity_channel.0, contact_channel.0);
         let events = PhysicsEvents {
             contact_events: contact_channel.1,
-            proximity_events: proximity_channel.1,
+            intersection_events: proximity_channel.1,
         };
         let physics = PhysicsState::new();
         let state = HarnessState {
-- 
cgit 


From 99c2184e134b40cca9cb22fe93a95a64295ae048 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Fri, 22 Jan 2021 16:33:31 +0100
Subject: Fix regressions introduced by the merge with master.

---
 src_testbed/harness/mod.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src_testbed/harness/mod.rs')

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
     }
-- 
cgit 


From b779eb261e7c3e816c8b586f1f496dcd17dbf700 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Fri, 22 Jan 2021 16:43:16 +0100
Subject: Fix compilation in 2D.

---
 src_testbed/harness/mod.rs | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src_testbed/harness/mod.rs')

diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs
index 1006e08..c80669f 100644
--- a/src_testbed/harness/mod.rs
+++ b/src_testbed/harness/mod.rs
@@ -70,12 +70,6 @@ impl Harness {
         #[cfg(feature = "parallel")]
         let num_threads = num_cpus::get_physical();
 
-        #[cfg(feature = "parallel")]
-        let thread_pool = rapier::rayon::ThreadPoolBuilder::new()
-            .num_threads(num_threads)
-            .build()
-            .unwrap();
-
         let contact_channel = crossbeam::channel::unbounded();
         let proximity_channel = crossbeam::channel::unbounded();
         let event_handler = ChannelEventCollector::new(proximity_channel.0, contact_channel.0);
-- 
cgit 


From 00caa7ce353c02cfc22f0cc27f6361e968157953 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Sat, 23 Jan 2021 12:58:45 +0100
Subject: Fix warnings and 2D compilation when parallelism is ON but SIMD is
 OFF.

---
 src_testbed/harness/mod.rs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src_testbed/harness/mod.rs')

diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs
index c80669f..afdc23a 100644
--- a/src_testbed/harness/mod.rs
+++ b/src_testbed/harness/mod.rs
@@ -67,9 +67,6 @@ type Callbacks = Vec<
 #[allow(dead_code)]
 impl Harness {
     pub fn new_empty() -> Self {
-        #[cfg(feature = "parallel")]
-        let num_threads = num_cpus::get_physical();
-
         let contact_channel = crossbeam::channel::unbounded();
         let proximity_channel = crossbeam::channel::unbounded();
         let event_handler = ChannelEventCollector::new(proximity_channel.0, contact_channel.0);
-- 
cgit