aboutsummaryrefslogtreecommitdiff
path: root/examples3d
diff options
context:
space:
mode:
authorCrozet Sébastien <developer@crozet.re>2020-10-26 15:58:30 +0100
committerCrozet Sébastien <developer@crozet.re>2020-10-26 15:58:30 +0100
commit2b628f9580a826722346983ef42672d4e8dd8053 (patch)
tree9e72cc1645140eda69696eedb3c245fb667eb540 /examples3d
parent3da333f11c93898808eb9233c0cf333743bbf906 (diff)
downloadrapier-2b628f9580a826722346983ef42672d4e8dd8053.tar.gz
rapier-2b628f9580a826722346983ef42672d4e8dd8053.tar.bz2
rapier-2b628f9580a826722346983ef42672d4e8dd8053.zip
Redefine capsules as a segment with a radius, allowing us to reuse the pfm_pfm_contact generator for it.
Diffstat (limited to 'examples3d')
-rw-r--r--examples3d/heightfield3.rs5
-rw-r--r--examples3d/primitives3.rs5
-rw-r--r--examples3d/trimesh3.rs5
3 files changed, 9 insertions, 6 deletions
diff --git a/examples3d/heightfield3.rs b/examples3d/heightfield3.rs
index 1213020..6af93c7 100644
--- a/examples3d/heightfield3.rs
+++ b/examples3d/heightfield3.rs
@@ -54,13 +54,14 @@ pub fn init_world(testbed: &mut Testbed) {
let rigid_body = RigidBodyBuilder::new_dynamic().translation(x, y, z).build();
let handle = bodies.insert(rigid_body);
- let collider = match j % 4 {
+ let collider = match j % 5 {
0 => ColliderBuilder::cuboid(rad, rad, rad).build(),
1 => ColliderBuilder::ball(rad).build(),
// Rounded cylinders are much more efficient that cylinder, even if the
// rounding margin is small.
2 => ColliderBuilder::round_cylinder(rad, rad, rad / 10.0).build(),
- _ => ColliderBuilder::cone(rad, rad).build(),
+ 3 => ColliderBuilder::cone(rad, rad).build(),
+ _ => ColliderBuilder::capsule_y(rad, rad).build(),
};
colliders.insert(collider, handle, &mut bodies);
diff --git a/examples3d/primitives3.rs b/examples3d/primitives3.rs
index 96636a4..6a98077 100644
--- a/examples3d/primitives3.rs
+++ b/examples3d/primitives3.rs
@@ -50,13 +50,14 @@ pub fn init_world(testbed: &mut Testbed) {
let rigid_body = RigidBodyBuilder::new_dynamic().translation(x, y, z).build();
let handle = bodies.insert(rigid_body);
- let collider = match j % 4 {
+ let collider = match j % 5 {
0 => ColliderBuilder::cuboid(rad, rad, rad).build(),
1 => ColliderBuilder::ball(rad).build(),
// Rounded cylinders are much more efficient that cylinder, even if the
// rounding margin is small.
2 => ColliderBuilder::round_cylinder(rad, rad, rad / 10.0).build(),
- _ => ColliderBuilder::cone(rad, rad).build(),
+ 3 => ColliderBuilder::cone(rad, rad).build(),
+ _ => ColliderBuilder::capsule_y(rad, rad).build(),
};
colliders.insert(collider, handle, &mut bodies);
diff --git a/examples3d/trimesh3.rs b/examples3d/trimesh3.rs
index 5ada899..2a96bda 100644
--- a/examples3d/trimesh3.rs
+++ b/examples3d/trimesh3.rs
@@ -64,13 +64,14 @@ pub fn init_world(testbed: &mut Testbed) {
let rigid_body = RigidBodyBuilder::new_dynamic().translation(x, y, z).build();
let handle = bodies.insert(rigid_body);
- let collider = match j % 4 {
+ let collider = match j % 5 {
0 => ColliderBuilder::cuboid(rad, rad, rad).build(),
1 => ColliderBuilder::ball(rad).build(),
// Rounded cylinders are much more efficient that cylinder, even if the
// rounding margin is small.
2 => ColliderBuilder::round_cylinder(rad, rad, rad / 10.0).build(),
- _ => ColliderBuilder::cone(rad, rad).build(),
+ 3 => ColliderBuilder::cone(rad, rad).build(),
+ _ => ColliderBuilder::capsule_y(rad, rad).build(),
};
colliders.insert(collider, handle, &mut bodies);