From 93aa7b6e1e8cbfd73542ed10ad5c26ae0a8b9848 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Mon, 5 Oct 2020 19:04:18 +0200
Subject: Use the publish-subscribe mechanism to handle collider removals
 across pipelines.

---
 src/geometry/collider_set.rs | 45 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

(limited to 'src/geometry/collider_set.rs')

diff --git a/src/geometry/collider_set.rs b/src/geometry/collider_set.rs
index 22bba1b..3a259ae 100644
--- a/src/geometry/collider_set.rs
+++ b/src/geometry/collider_set.rs
@@ -1,14 +1,25 @@
 use crate::data::arena::Arena;
+use crate::data::pubsub::PubSub;
 use crate::dynamics::{RigidBodyHandle, RigidBodySet};
-use crate::geometry::Collider;
+use crate::geometry::{Collider, ColliderGraphIndex};
 use std::ops::{Index, IndexMut};
 
 /// The unique identifier of a collider added to a collider set.
 pub type ColliderHandle = crate::data::arena::Index;
 
+#[derive(Copy, Clone, Debug)]
+#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))]
+pub(crate) struct RemovedCollider {
+    pub handle: ColliderHandle,
+    pub(crate) contact_graph_index: ColliderGraphIndex,
+    pub(crate) proximity_graph_index: ColliderGraphIndex,
+    pub(crate) proxy_index: usize,
+}
+
 #[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))]
 /// A set of colliders that can be handled by a physics `World`.
 pub struct ColliderSet {
+    pub(crate) removed_colliders: PubSub<RemovedCollider>,
     pub(crate) colliders: Arena<Collider>,
 }
 
@@ -16,6 +27,7 @@ impl ColliderSet {
     /// Create a new empty set of colliders.
     pub fn new() -> Self {
         ColliderSet {
+            removed_colliders: PubSub::new(),
             colliders: Arena::new(),
         }
     }
@@ -60,8 +72,35 @@ impl ColliderSet {
         handle
     }
 
-    pub(crate) fn remove_internal(&mut self, handle: ColliderHandle) -> Option<Collider> {
-        self.colliders.remove(handle)
+    /// Remove a collider from this set and update its parent accordingly.
+    pub fn remove(
+        &mut self,
+        handle: ColliderHandle,
+        bodies: &mut RigidBodySet,
+    ) -> Option<Collider> {
+        let collider = self.colliders.remove(handle)?;
+
+        /*
+         * Delete the collider from its parent body.
+         */
+        if let Some(mut parent) = bodies.get_mut_internal(collider.parent) {
+            parent.remove_collider_internal(handle, &collider);
+            bodies.wake_up(collider.parent, true);
+        }
+
+        /*
+         * Publish removal.
+         */
+        let message = RemovedCollider {
+            handle,
+            contact_graph_index: collider.contact_graph_index,
+            proximity_graph_index: collider.proximity_graph_index,
+            proxy_index: collider.proxy_index,
+        };
+
+        self.removed_colliders.publish(message);
+
+        Some(collider)
     }
 
     /// Gets the collider with the given handle without a known generation.
-- 
cgit 


From 8e432b298bd71df7d1b776b77c15713d9bea280e Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Tue, 6 Oct 2020 10:46:59 +0200
Subject: Make the WQuadTree more generic and use it as the trimesh
 acceleration structure.

---
 src/geometry/collider_set.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/geometry/collider_set.rs')

diff --git a/src/geometry/collider_set.rs b/src/geometry/collider_set.rs
index 3a259ae..dbdd2a4 100644
--- a/src/geometry/collider_set.rs
+++ b/src/geometry/collider_set.rs
@@ -38,7 +38,7 @@ impl ColliderSet {
     }
 
     /// Iterate through all the colliders on this set.
-    pub fn iter(&self) -> impl Iterator<Item = (ColliderHandle, &Collider)> {
+    pub fn iter(&self) -> impl ExactSizeIterator<Item = (ColliderHandle, &Collider)> {
         self.colliders.iter()
     }
 
-- 
cgit 


From 682ff61f94931ef205a9f81e7d00417ac88537c1 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Tue, 6 Oct 2020 15:23:48 +0200
Subject: Don't let the PubSub internal offsets overflow + fix some warnings.

---
 src/geometry/collider_set.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/geometry/collider_set.rs')

diff --git a/src/geometry/collider_set.rs b/src/geometry/collider_set.rs
index dbdd2a4..5ac9658 100644
--- a/src/geometry/collider_set.rs
+++ b/src/geometry/collider_set.rs
@@ -83,7 +83,7 @@ impl ColliderSet {
         /*
          * Delete the collider from its parent body.
          */
-        if let Some(mut parent) = bodies.get_mut_internal(collider.parent) {
+        if let Some(parent) = bodies.get_mut_internal(collider.parent) {
             parent.remove_collider_internal(handle, &collider);
             bodies.wake_up(collider.parent, true);
         }
-- 
cgit