Merge pull request #64 from dimforge/explicit_wake_up

Add more explicit parameters to wake-up a rigid-body

2 files changed, 9 insertions, 2 deletions

diff --git a/src/geometry/collider_set.rs b/src/geometry/collider_set.rs
index fd94675..60b9225 100644
--- a/src/geometry/collider_set.rs
+++ b/src/geometry/collider_set.rs
@@ -78,10 +78,14 @@ impl ColliderSet {
     }
 
     /// Remove a collider from this set and update its parent accordingly.
+    ///
+    /// If `wake_up` is `true`, the rigid-body the removed collider is attached to
+    /// will be woken up.
     pub fn remove(
         &mut self,
         handle: ColliderHandle,
         bodies: &mut RigidBodySet,
+        wake_up: bool,
     ) -> Option<Collider> {
         let collider = self.colliders.remove(handle)?;
 
@@ -90,7 +94,10 @@ impl ColliderSet {
          */
         if let Some(parent) = bodies.get_mut_internal(collider.parent) {
             parent.remove_collider_internal(handle, &collider);
-            bodies.wake_up(collider.parent, true);
+
+            if wake_up {
+                bodies.wake_up(collider.parent, true);
+            }
         }
 
         /*
diff --git a/src/geometry/shape.rs b/src/geometry/shape.rs
index 5c96f68..66840a0 100644
--- a/src/geometry/shape.rs
+++ b/src/geometry/shape.rs
@@ -18,7 +18,7 @@ use {
 /// Enum representing the type of a shape.
 pub enum ShapeType {
     /// A ball shape.
-    Ball = 1,
+    Ball = 0,
     /// A convex polygon shape.
     Polygon,
     /// A cuboid shape.