diff options
| author | Crozet Sébastien <developer@crozet.re> | 2020-10-27 09:25:58 +0100 |
|---|---|---|
| committer | Crozet Sébastien <developer@crozet.re> | 2020-10-27 09:25:58 +0100 |
| commit | ffbc3c02c7d328d5c48a3efb84d35f5911f1880b (patch) | |
| tree | 16ccb1aedc30d5c09d59e6ee5c7faa987e67b202 /src/geometry | |
| parent | 8c872dc0af9ece127a87b4adb112b0e1ed6ab249 (diff) | |
| download | rapier-ffbc3c02c7d328d5c48a3efb84d35f5911f1880b.tar.gz rapier-ffbc3c02c7d328d5c48a3efb84d35f5911f1880b.tar.bz2 rapier-ffbc3c02c7d328d5c48a3efb84d35f5911f1880b.zip | |
Fix 2D compilation.
Diffstat (limited to 'src/geometry')
| -rw-r--r-- | src/geometry/mod.rs | 2 | ||||
| -rw-r--r-- | src/geometry/round_cylinder.rs | 1 | ||||
| -rw-r--r-- | src/geometry/sat.rs | 2 | ||||
| -rw-r--r-- | src/geometry/shape.rs | 6 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/geometry/mod.rs b/src/geometry/mod.rs index 2d8fc76..abb9844 100644 --- a/src/geometry/mod.rs +++ b/src/geometry/mod.rs @@ -19,6 +19,7 @@ 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 ncollide::query::Proximity; @@ -98,5 +99,6 @@ mod wquadtree; mod capsule; #[cfg(feature = "dim3")] mod polygonal_feature_map; +#[cfg(feature = "dim3")] mod round_cylinder; mod shape; diff --git a/src/geometry/round_cylinder.rs b/src/geometry/round_cylinder.rs index 4e2afa7..ce8b43b 100644 --- a/src/geometry/round_cylinder.rs +++ b/src/geometry/round_cylinder.rs @@ -1,4 +1,3 @@ -#[cfg(feature = "dim3")] use crate::geometry::Cylinder; use crate::math::{Isometry, Point, Vector}; use na::Unit; diff --git a/src/geometry/sat.rs b/src/geometry/sat.rs index 44446af..3cd66b4 100644 --- a/src/geometry/sat.rs +++ b/src/geometry/sat.rs @@ -298,7 +298,7 @@ pub fn triangle_cuboid_find_local_separating_normal_oneway( #[cfg(feature = "dim2")] pub fn segment_cuboid_find_local_separating_normal_oneway( - segment1: &Segment<f32>, + segment1: &Segment, shape2: &Cuboid, pos12: &Isometry<f32>, ) -> (f32, Vector<f32>) { diff --git a/src/geometry/shape.rs b/src/geometry/shape.rs index 982e484..ec43bf7 100644 --- a/src/geometry/shape.rs +++ b/src/geometry/shape.rs @@ -1,7 +1,5 @@ use crate::dynamics::MassProperties; -use crate::geometry::{ - Ball, Capsule, Cuboid, HeightField, RoundCylinder, Segment, Triangle, Trimesh, -}; +use crate::geometry::{Ball, Capsule, Cuboid, HeightField, Segment, Triangle, Trimesh}; use crate::math::Isometry; use downcast_rs::{impl_downcast, DowncastSync}; #[cfg(feature = "serde-serialize")] @@ -12,7 +10,7 @@ use num::Zero; use num_derive::FromPrimitive; #[cfg(feature = "dim3")] use { - crate::geometry::{Cone, Cylinder, PolygonalFeatureMap}, + crate::geometry::{Cone, Cylinder, PolygonalFeatureMap, RoundCylinder}, ncollide::bounding_volume::BoundingVolume, }; |