aboutsummaryrefslogtreecommitdiff
path: root/src/geometry/contact_generator
diff options
context:
space:
mode:
authorCrozet Sébastien <developer@crozet.re>2020-10-20 14:16:01 +0200
committerCrozet Sébastien <developer@crozet.re>2020-10-20 14:16:01 +0200
commitd513c22d33ab44b0048355bcfd1db4173b3f7ece (patch)
tree274f768c6798d9564483c86a423f131be4750360 /src/geometry/contact_generator
parent865ce8a8e5301b23ca474adaaffe8b43e725803e (diff)
downloadrapier-d513c22d33ab44b0048355bcfd1db4173b3f7ece.tar.gz
rapier-d513c22d33ab44b0048355bcfd1db4173b3f7ece.tar.bz2
rapier-d513c22d33ab44b0048355bcfd1db4173b3f7ece.zip
Add cone support.
Diffstat (limited to 'src/geometry/contact_generator')
-rw-r--r--src/geometry/contact_generator/contact_dispatcher.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/geometry/contact_generator/contact_dispatcher.rs b/src/geometry/contact_generator/contact_dispatcher.rs
index 01bbc46..70ac84c 100644
--- a/src/geometry/contact_generator/contact_dispatcher.rs
+++ b/src/geometry/contact_generator/contact_dispatcher.rs
@@ -76,7 +76,9 @@ impl ContactDispatcher for DefaultContactDispatcher {
| (ShapeType::Capsule, ShapeType::Ball)
| (ShapeType::Ball, ShapeType::Capsule)
| (ShapeType::Cylinder, ShapeType::Ball)
- | (ShapeType::Ball, ShapeType::Cylinder) => (
+ | (ShapeType::Ball, ShapeType::Cylinder)
+ | (ShapeType::Cone, ShapeType::Ball)
+ | (ShapeType::Ball, ShapeType::Cone) => (
PrimitiveContactGenerator {
generate_contacts: super::generate_contacts_ball_convex,
..PrimitiveContactGenerator::default()
@@ -99,7 +101,10 @@ impl ContactDispatcher for DefaultContactDispatcher {
None,
)
}
- (ShapeType::Cylinder, _) | (_, ShapeType::Cylinder) => (
+ (ShapeType::Cylinder, _)
+ | (_, ShapeType::Cylinder)
+ | (ShapeType::Cone, _)
+ | (_, ShapeType::Cone) => (
PrimitiveContactGenerator {
generate_contacts: super::generate_contacts_pfm_pfm,
..PrimitiveContactGenerator::default()