From 947c4813c9666fd8215743de298fe17780fa3ef2 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 19 Oct 2020 16:51:40 +0200 Subject: Complete the pfm/pfm contact generator. --- examples3d/trimesh3.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'examples3d/trimesh3.rs') diff --git a/examples3d/trimesh3.rs b/examples3d/trimesh3.rs index d022a1f..40aede2 100644 --- a/examples3d/trimesh3.rs +++ b/examples3d/trimesh3.rs @@ -64,13 +64,13 @@ pub fn init_world(testbed: &mut Testbed) { let rigid_body = RigidBodyBuilder::new_dynamic().translation(x, y, z).build(); let handle = bodies.insert(rigid_body); - if j % 2 == 0 { - let collider = ColliderBuilder::cuboid(rad, rad, rad).build(); - colliders.insert(collider, handle, &mut bodies); - } else { - let collider = ColliderBuilder::ball(rad).build(); - colliders.insert(collider, handle, &mut bodies); - } + let collider = match j % 3 { + 0 => ColliderBuilder::cuboid(rad, rad, rad).build(), + 1 => ColliderBuilder::ball(rad).build(), + _ => ColliderBuilder::cylinder(rad, rad).build(), + }; + + colliders.insert(collider, handle, &mut bodies); } } } -- cgit From d513c22d33ab44b0048355bcfd1db4173b3f7ece Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Tue, 20 Oct 2020 14:16:01 +0200 Subject: Add cone support. --- examples3d/trimesh3.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'examples3d/trimesh3.rs') diff --git a/examples3d/trimesh3.rs b/examples3d/trimesh3.rs index 40aede2..2d6c0bb 100644 --- a/examples3d/trimesh3.rs +++ b/examples3d/trimesh3.rs @@ -64,10 +64,11 @@ 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 % 3 { + let collider = match j % 4 { 0 => ColliderBuilder::cuboid(rad, rad, rad).build(), 1 => ColliderBuilder::ball(rad).build(), - _ => ColliderBuilder::cylinder(rad, rad).build(), + 2 => ColliderBuilder::cylinder(rad, rad).build(), + _ => ColliderBuilder::cone(rad, rad).build(), }; colliders.insert(collider, handle, &mut bodies); -- cgit From 64958470950cd9832a669b1bd5d70a2aeb6a85ef Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Tue, 20 Oct 2020 15:57:54 +0200 Subject: Add rounded cylinder. --- examples3d/trimesh3.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'examples3d/trimesh3.rs') diff --git a/examples3d/trimesh3.rs b/examples3d/trimesh3.rs index 2d6c0bb..8fee784 100644 --- a/examples3d/trimesh3.rs +++ b/examples3d/trimesh3.rs @@ -67,7 +67,9 @@ pub fn init_world(testbed: &mut Testbed) { let collider = match j % 4 { 0 => ColliderBuilder::cuboid(rad, rad, rad).build(), 1 => ColliderBuilder::ball(rad).build(), - 2 => ColliderBuilder::cylinder(rad, rad).build(), + // Rounded cylinders are much more efficient that cylinder, even if the + // rounding margin is small. + 2 => ColliderBuilder::rounded_cylinder(rad, rad, rad / 10.0).build(), _ => ColliderBuilder::cone(rad, rad).build(), }; -- cgit From f7a6f433d62ea427f6e2233365a6f534ca7e1c63 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Tue, 20 Oct 2020 18:14:20 +0200 Subject: Rename rounded -> round. --- examples3d/trimesh3.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples3d/trimesh3.rs') diff --git a/examples3d/trimesh3.rs b/examples3d/trimesh3.rs index 8fee784..5ada899 100644 --- a/examples3d/trimesh3.rs +++ b/examples3d/trimesh3.rs @@ -69,7 +69,7 @@ pub fn init_world(testbed: &mut Testbed) { 1 => ColliderBuilder::ball(rad).build(), // Rounded cylinders are much more efficient that cylinder, even if the // rounding margin is small. - 2 => ColliderBuilder::rounded_cylinder(rad, rad, rad / 10.0).build(), + 2 => ColliderBuilder::round_cylinder(rad, rad, rad / 10.0).build(), _ => ColliderBuilder::cone(rad, rad).build(), }; -- cgit From 2b628f9580a826722346983ef42672d4e8dd8053 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 26 Oct 2020 15:58:30 +0100 Subject: Redefine capsules as a segment with a radius, allowing us to reuse the pfm_pfm_contact generator for it. --- examples3d/trimesh3.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'examples3d/trimesh3.rs') 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); -- cgit