diff options
| author | Crozet Sébastien <developer@crozet.re> | 2020-10-20 15:57:54 +0200 |
|---|---|---|
| committer | Crozet Sébastien <developer@crozet.re> | 2020-10-20 15:57:54 +0200 |
| commit | 64958470950cd9832a669b1bd5d70a2aeb6a85ef (patch) | |
| tree | ba7325141de583ed93726c6f188ef52a1fc45bd2 /src/geometry/contact_generator/contact_dispatcher.rs | |
| parent | d513c22d33ab44b0048355bcfd1db4173b3f7ece (diff) | |
| download | rapier-64958470950cd9832a669b1bd5d70a2aeb6a85ef.tar.gz rapier-64958470950cd9832a669b1bd5d70a2aeb6a85ef.tar.bz2 rapier-64958470950cd9832a669b1bd5d70a2aeb6a85ef.zip | |
Add rounded cylinder.
Diffstat (limited to 'src/geometry/contact_generator/contact_dispatcher.rs')
| -rw-r--r-- | src/geometry/contact_generator/contact_dispatcher.rs | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/geometry/contact_generator/contact_dispatcher.rs b/src/geometry/contact_generator/contact_dispatcher.rs index 70ac84c..14b7f79 100644 --- a/src/geometry/contact_generator/contact_dispatcher.rs +++ b/src/geometry/contact_generator/contact_dispatcher.rs @@ -69,16 +69,7 @@ impl ContactDispatcher for DefaultContactDispatcher { }, None, ), - (ShapeType::Cuboid, ShapeType::Ball) - | (ShapeType::Ball, ShapeType::Cuboid) - | (ShapeType::Triangle, ShapeType::Ball) - | (ShapeType::Ball, ShapeType::Triangle) - | (ShapeType::Capsule, ShapeType::Ball) - | (ShapeType::Ball, ShapeType::Capsule) - | (ShapeType::Cylinder, ShapeType::Ball) - | (ShapeType::Ball, ShapeType::Cylinder) - | (ShapeType::Cone, ShapeType::Ball) - | (ShapeType::Ball, ShapeType::Cone) => ( + (_, ShapeType::Ball) | (ShapeType::Ball, _) => ( PrimitiveContactGenerator { generate_contacts: super::generate_contacts_ball_convex, ..PrimitiveContactGenerator::default() @@ -104,7 +95,9 @@ impl ContactDispatcher for DefaultContactDispatcher { (ShapeType::Cylinder, _) | (_, ShapeType::Cylinder) | (ShapeType::Cone, _) - | (_, ShapeType::Cone) => ( + | (_, ShapeType::Cone) + | (ShapeType::RoundedCylinder, _) + | (_, ShapeType::RoundedCylinder) => ( PrimitiveContactGenerator { generate_contacts: super::generate_contacts_pfm_pfm, ..PrimitiveContactGenerator::default() |