Merge branch 'master' into infinite_fall_memory

1 files changed, 10 insertions, 6 deletions

diff --git a/src/dynamics/joint/joint_set.rs b/src/dynamics/joint/joint_set.rs
index 51d7432..2b1895f 100644
--- a/src/dynamics/joint/joint_set.rs
+++ b/src/dynamics/joint/joint_set.rs
@@ -66,17 +66,21 @@ impl JointSet {
     }
 
     /// Iterates through all the joint on this set.
-    pub fn iter(&self) -> impl Iterator<Item = &Joint> {
-        self.joint_graph.graph.edges.iter().map(|e| &e.weight)
+    pub fn iter(&self) -> impl Iterator<Item = (JointHandle, &Joint)> {
+        self.joint_graph
+            .graph
+            .edges
+            .iter()
+            .map(|e| (e.weight.handle, &e.weight))
     }
 
     /// Iterates mutably through all the joint on this set.
-    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut Joint> {
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = (JointHandle, &mut Joint)> {
         self.joint_graph
             .graph
             .edges
             .iter_mut()
-            .map(|e| &mut e.weight)
+            .map(|e| (e.weight.handle, &mut e.weight))
     }
 
     // /// The set of joints as an array.
@@ -202,8 +206,8 @@ impl JointSet {
                 }
 
                 // Wake up the attached bodies.
-                bodies.wake_up(h1);
-                bodies.wake_up(h2);
+                bodies.wake_up(h1, true);
+                bodies.wake_up(h2, true);
             }
 
             if let Some(other) = self.joint_graph.remove_node(deleted_id) {