Merge branch 'master' into infinite_fall_memory

Fix merge conflict resulting from "axii" spelling correction

1 files changed, 29 insertions, 4 deletions

diff --git a/src/geometry/mod.rs b/src/geometry/mod.rs
index 562f962..c8ad28e 100644
--- a/src/geometry/mod.rs
+++ b/src/geometry/mod.rs
@@ -2,10 +2,10 @@
 
 pub use self::broad_phase_multi_sap::BroadPhase;
 pub use self::capsule::Capsule;
-pub use self::collider::{Collider, ColliderBuilder, Shape};
+pub use self::collider::{Collider, ColliderBuilder, ColliderShape};
 pub use self::collider_set::{ColliderHandle, ColliderSet};
 pub use self::contact::{
-    Contact, ContactKinematics, ContactManifold, ContactPair, KinematicsCategory,
+    Contact, ContactKinematics, ContactManifold, ContactPair, KinematicsCategory, SolverFlags,
 };
 pub use self::contact_generator::{ContactDispatcher, DefaultContactDispatcher};
 #[cfg(feature = "dim2")]
@@ -19,9 +19,14 @@ pub use self::narrow_phase::NarrowPhase;
 pub use self::polygon::Polygon;
 pub use self::proximity::ProximityPair;
 pub use self::proximity_detector::{DefaultProximityDispatcher, ProximityDispatcher};
+#[cfg(feature = "dim3")]
+pub use self::round_cylinder::RoundCylinder;
 pub use self::trimesh::Trimesh;
+pub use self::user_callbacks::{ContactPairFilter, PairFilterContext, ProximityPairFilter};
 pub use ncollide::query::Proximity;
 
+/// A segment shape.
+pub type Segment = ncollide::shape::Segment<f32>;
 /// A cuboid shape.
 pub type Cuboid = ncollide::shape::Cuboid<f32>;
 /// A triangle shape.
@@ -30,6 +35,12 @@ pub type Triangle = ncollide::shape::Triangle<f32>;
 pub type Ball = ncollide::shape::Ball<f32>;
 /// A heightfield shape.
 pub type HeightField = ncollide::shape::HeightField<f32>;
+/// A cylindrical shape.
+#[cfg(feature = "dim3")]
+pub type Cylinder = ncollide::shape::Cylinder<f32>;
+/// A cone shape.
+#[cfg(feature = "dim3")]
+pub type Cone = ncollide::shape::Cone<f32>;
 /// An axis-aligned bounding box.
 pub type AABB = ncollide::bounding_volume::AABB<f32>;
 /// Event triggered when two non-sensor colliders start or stop being in contact.
@@ -40,6 +51,8 @@ pub type ProximityEvent = ncollide::pipeline::ProximityEvent<ColliderHandle>;
 pub type Ray = ncollide::query::Ray<f32>;
 /// The intersection between a ray and a  collider.
 pub type RayIntersection = ncollide::query::RayIntersection<f32>;
+/// The the projection of a point on a collider.
+pub type PointProjection = ncollide::query::PointProjection<f32>;
 
 #[cfg(feature = "simd-is-enabled")]
 pub(crate) use self::ball::WBall;
@@ -47,18 +60,22 @@ 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;
+pub(crate) use self::contact_generator::clip_segments;
 #[cfg(feature = "dim2")]
-pub(crate) use self::contact_generator::{clip_segments, clip_segments_with_normal};
+pub(crate) use self::contact_generator::clip_segments_with_normal;
 pub(crate) use self::narrow_phase::ContactManifoldIndex;
 #[cfg(feature = "dim3")]
+pub(crate) use self::polygonal_feature_map::PolygonalFeatureMap;
+#[cfg(feature = "dim3")]
 pub(crate) use self::polyhedron_feature3d::PolyhedronFace;
 pub(crate) use self::waabb::{WRay, WAABB};
 pub(crate) use self::wquadtree::WQuadtree;
 //pub(crate) use self::z_order::z_cmp_floats;
+pub use self::interaction_groups::InteractionGroups;
+pub use self::shape::{Shape, ShapeType};
 
 mod ball;
 mod broad_phase_multi_sap;
-mod capsule;
 mod collider;
 mod collider_set;
 mod contact;
@@ -81,3 +98,11 @@ mod trimesh;
 mod waabb;
 mod wquadtree;
 //mod z_order;
+mod capsule;
+mod interaction_groups;
+#[cfg(feature = "dim3")]
+mod polygonal_feature_map;
+#[cfg(feature = "dim3")]
+mod round_cylinder;
+mod shape;
+mod user_callbacks;