Merge branch 'master' into infinite_fall_memory

1 files changed, 9 insertions, 6 deletions

diff --git a/src/geometry/mod.rs b/src/geometry/mod.rs
index 4f72778..562f962 100644
--- a/src/geometry/mod.rs
+++ b/src/geometry/mod.rs
@@ -36,11 +36,15 @@ pub type AABB = ncollide::bounding_volume::AABB<f32>;
 pub type ContactEvent = ncollide::pipeline::ContactEvent<ColliderHandle>;
 /// Event triggered when a sensor collider starts or stop being in proximity with another collider (sensor or not).
 pub type ProximityEvent = ncollide::pipeline::ProximityEvent<ColliderHandle>;
+/// A ray that can be cast against colliders.
+pub type Ray = ncollide::query::Ray<f32>;
+/// The intersection between a ray and a  collider.
+pub type RayIntersection = ncollide::query::RayIntersection<f32>;
 
 #[cfg(feature = "simd-is-enabled")]
 pub(crate) use self::ball::WBall;
-pub(crate) use self::broad_phase::{ColliderPair, WAABBHierarchy, WAABBHierarchyIntersections};
-pub(crate) use self::broad_phase_multi_sap::BroadPhasePairEvent;
+pub(crate) use self::broad_phase_multi_sap::{BroadPhasePairEvent, ColliderPair};
+pub(crate) use self::collider_set::RemovedCollider;
 #[cfg(feature = "simd-is-enabled")]
 pub(crate) use self::contact::WContact;
 #[cfg(feature = "dim2")]
@@ -48,12 +52,11 @@ pub(crate) use self::contact_generator::{clip_segments, clip_segments_with_norma
 pub(crate) use self::narrow_phase::ContactManifoldIndex;
 #[cfg(feature = "dim3")]
 pub(crate) use self::polyhedron_feature3d::PolyhedronFace;
-#[cfg(feature = "simd-is-enabled")]
-pub(crate) use self::waabb::WAABB;
+pub(crate) use self::waabb::{WRay, WAABB};
+pub(crate) use self::wquadtree::WQuadtree;
 //pub(crate) use self::z_order::z_cmp_floats;
 
 mod ball;
-mod broad_phase;
 mod broad_phase_multi_sap;
 mod capsule;
 mod collider;
@@ -75,6 +78,6 @@ mod proximity_detector;
 pub(crate) mod sat;
 pub(crate) mod triangle;
 mod trimesh;
-#[cfg(feature = "simd-is-enabled")]
 mod waabb;
+mod wquadtree;
 //mod z_order;