From c32da78f2a6014c491aa3e975fb83ddb7c80610e Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Mon, 26 Apr 2021 17:59:25 +0200
Subject: Split rigid-bodies and colliders into multiple components

---
 src/geometry/mod.rs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

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

diff --git a/src/geometry/mod.rs b/src/geometry/mod.rs
index 1c83232..9835bee 100644
--- a/src/geometry/mod.rs
+++ b/src/geometry/mod.rs
@@ -1,8 +1,7 @@
 //! Structures related to geometry: colliders, shapes, etc.
 
 pub use self::broad_phase_multi_sap::BroadPhase;
-pub use self::collider::{Collider, ColliderBuilder};
-pub use self::collider_set::{ColliderHandle, ColliderSet};
+pub use self::collider_components::*;
 pub use self::contact_pair::{ContactData, ContactManifoldData};
 pub use self::contact_pair::{ContactPair, SolverContact, SolverFlags};
 pub use self::interaction_graph::{
@@ -11,6 +10,11 @@ pub use self::interaction_graph::{
 pub use self::interaction_groups::InteractionGroups;
 pub use self::narrow_phase::NarrowPhase;
 
+#[cfg(feature = "default-sets")]
+pub use self::collider::{Collider, ColliderBuilder};
+#[cfg(feature = "default-sets")]
+pub use self::collider_set::ColliderSet;
+
 pub use parry::query::TrackedContact;
 
 /// A contact between two colliders.
@@ -85,7 +89,6 @@ impl IntersectionEvent {
 }
 
 pub(crate) use self::broad_phase_multi_sap::{BroadPhasePairEvent, ColliderPair, SAPProxyIndex};
-pub(crate) use self::collider_set::RemovedCollider;
 pub(crate) use self::narrow_phase::ContactManifoldIndex;
 pub(crate) use parry::partitioning::SimdQuadTree;
 pub use parry::shape::*;
@@ -102,9 +105,13 @@ pub(crate) fn default_query_dispatcher() -> std::sync::Arc<dyn parry::query::Que
 }
 
 mod broad_phase_multi_sap;
-mod collider;
-mod collider_set;
+mod collider_components;
 mod contact_pair;
 mod interaction_graph;
 mod interaction_groups;
 mod narrow_phase;
+
+#[cfg(feature = "default-sets")]
+mod collider;
+#[cfg(feature = "default-sets")]
+mod collider_set;
-- 
cgit 


From 3cab54b880fbe762cd0909c51b8b8e18c45c4745 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Tue, 27 Apr 2021 14:37:39 +0200
Subject: Fix some warnings.

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

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

diff --git a/src/geometry/mod.rs b/src/geometry/mod.rs
index 9835bee..a4b17f3 100644
--- a/src/geometry/mod.rs
+++ b/src/geometry/mod.rs
@@ -90,7 +90,7 @@ impl IntersectionEvent {
 
 pub(crate) use self::broad_phase_multi_sap::{BroadPhasePairEvent, ColliderPair, SAPProxyIndex};
 pub(crate) use self::narrow_phase::ContactManifoldIndex;
-pub(crate) use parry::partitioning::SimdQuadTree;
+pub(crate) use parry::partitioning::QBVH;
 pub use parry::shape::*;
 
 #[cfg(feature = "serde-serialize")]
-- 
cgit