Merge pull request #41 from dimforge/cylinder

Add cylinder and cone support + use a trait-object for shapes.

1 files changed, 37 insertions, 39 deletions

diff --git a/src_testbed/box2d_backend.rs b/src_testbed/box2d_backend.rs
index c25ff1f..769b12d 100644
--- a/src_testbed/box2d_backend.rs
+++ b/src_testbed/box2d_backend.rs
@@ -5,7 +5,7 @@ use rapier::counters::Counters;
 use rapier::dynamics::{
     IntegrationParameters, JointParams, JointSet, RigidBodyHandle, RigidBodySet,
 };
-use rapier::geometry::{Collider, ColliderSet, Shape};
+use rapier::geometry::{Collider, ColliderSet};
 use std::f32;
 
 use wrapped2d::b2;
@@ -167,44 +167,42 @@ impl Box2dWorld {
         fixture_def.is_sensor = collider.is_sensor();
         fixture_def.filter = b2::Filter::new();
 
-        match collider.shape() {
-            Shape::Ball(b) => {
-                let mut b2_shape = b2::CircleShape::new();
-                b2_shape.set_radius(b.radius);
-                b2_shape.set_position(center);
-                body.create_fixture(&b2_shape, &mut fixture_def);
-            }
-            Shape::Cuboid(c) => {
-                let b2_shape = b2::PolygonShape::new_box(c.half_extents.x, c.half_extents.y);
-                body.create_fixture(&b2_shape, &mut fixture_def);
-            }
-            Shape::Polygon(poly) => {
-                let points: Vec<_> = poly
-                    .vertices()
-                    .iter()
-                    .map(|p| collider.position_wrt_parent() * p)
-                    .map(|p| na_vec_to_b2_vec(p.coords))
-                    .collect();
-                let b2_shape = b2::PolygonShape::new_with(&points);
-                body.create_fixture(&b2_shape, &mut fixture_def);
-            }
-            Shape::HeightField(heightfield) => {
-                let mut segments = heightfield.segments();
-                let seg1 = segments.next().unwrap();
-                let mut vertices = vec![
-                    na_vec_to_b2_vec(seg1.a.coords),
-                    na_vec_to_b2_vec(seg1.b.coords),
-                ];
-
-                // TODO: this will not handle holes properly.
-                segments.for_each(|seg| {
-                    vertices.push(na_vec_to_b2_vec(seg.b.coords));
-                });
-
-                let b2_shape = b2::ChainShape::new_chain(&vertices);
-                body.create_fixture(&b2_shape, &mut fixture_def);
-            }
-            _ => eprintln!("Creating a shape unknown to the Box2d backend."),
+        let shape = collider.shape();
+
+        if let Some(b) = shape.as_ball() {
+            let mut b2_shape = b2::CircleShape::new();
+            b2_shape.set_radius(b.radius);
+            b2_shape.set_position(center);
+            body.create_fixture(&b2_shape, &mut fixture_def);
+        } else if let Some(c) = shape.as_cuboid() {
+            let b2_shape = b2::PolygonShape::new_box(c.half_extents.x, c.half_extents.y);
+            body.create_fixture(&b2_shape, &mut fixture_def);
+        // } else if let Some(polygon) = shape.as_polygon() {
+        //     let points: Vec<_> = poly
+        //         .vertices()
+        //         .iter()
+        //         .map(|p| collider.position_wrt_parent() * p)
+        //         .map(|p| na_vec_to_b2_vec(p.coords))
+        //         .collect();
+        //     let b2_shape = b2::PolygonShape::new_with(&points);
+        //     body.create_fixture(&b2_shape, &mut fixture_def);
+        } else if let Some(heightfield) = shape.as_heightfield() {
+            let mut segments = heightfield.segments();
+            let seg1 = segments.next().unwrap();
+            let mut vertices = vec![
+                na_vec_to_b2_vec(seg1.a.coords),
+                na_vec_to_b2_vec(seg1.b.coords),
+            ];
+
+            // TODO: this will not handle holes properly.
+            segments.for_each(|seg| {
+                vertices.push(na_vec_to_b2_vec(seg.b.coords));
+            });
+
+            let b2_shape = b2::ChainShape::new_chain(&vertices);
+            body.create_fixture(&b2_shape, &mut fixture_def);
+        } else {
+            eprintln!("Creating a shape unknown to the Box2d backend.");
         }
     }