enable graphics and windows related code in examples

4 files changed, 23 insertions, 38 deletions

diff --git a/examples3d/debug_add_remove_collider3.rs b/examples3d/debug_add_remove_collider3.rs
index 8a3d672..f353162 100644
--- a/examples3d/debug_add_remove_collider3.rs
+++ b/examples3d/debug_add_remove_collider3.rs
@@ -34,7 +34,7 @@ pub fn init_world(testbed: &mut Testbed) {
     let collider = ColliderBuilder::ball(ball_rad).density(100.0).build();
     colliders.insert(collider, ball_handle, &mut bodies);
 
-    testbed.add_callback(move |window, graphics, physics, _, _| {
+    testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
         // Remove then re-add the ground collider.
         let coll = physics
             .colliders
@@ -44,13 +44,8 @@ pub fn init_world(testbed: &mut Testbed) {
             .colliders
             .insert(coll, ground_handle, &mut physics.bodies);
 
-        // TODO: need a way to access graphics & window
-        if graphics.is_some() {
-            graphics.unwrap().add_collider(
-                window.unwrap(),
-                ground_collider_handle,
-                &physics.colliders,
-            );
+        if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
+            graphics.add_collider(window, ground_collider_handle, &physics.colliders);
         }
     });
 
diff --git a/examples3d/debug_dynamic_collider_add3.rs b/examples3d/debug_dynamic_collider_add3.rs
index cefe030..bd7205e 100644
--- a/examples3d/debug_dynamic_collider_add3.rs
+++ b/examples3d/debug_dynamic_collider_add3.rs
@@ -45,7 +45,7 @@ pub fn init_world(testbed: &mut Testbed) {
     let mut extra_colliders = Vec::new();
     let snapped_frame = 51;
 
-    testbed.add_callback(move |window, graphics, physics, _, _| {
+    testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
         step += 1;
 
         // Add a bigger ball collider
@@ -57,13 +57,10 @@ pub fn init_world(testbed: &mut Testbed) {
                 .colliders
                 .insert(collider, ball_handle, &mut physics.bodies);
 
-        if graphics.is_some() {
-            graphics.unwrap().add_collider(
-                window.unwrap(),
-                new_ball_collider_handle,
-                &physics.colliders,
-            );
+        if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
+            graphics.add_collider(window, new_ball_collider_handle, &physics.colliders);
         }
+
         extra_colliders.push(new_ball_collider_handle);
 
         // Snap the ball velocity or restore it.
@@ -103,10 +100,9 @@ pub fn init_world(testbed: &mut Testbed) {
                 .colliders
                 .insert(coll, ground_handle, &mut physics.bodies);
 
-        //FIXME: This causes an error
-        // if graphics.is_some() {
-        //     graphics.unwrap().add_collider(window.unwrap(), new_ground_collider_handle, &physics.colliders);
-        // }
+        if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
+            graphics.add_collider(window, new_ground_collider_handle, &physics.colliders);
+        }
 
         extra_colliders.push(new_ground_collider_handle);
     });
diff --git a/examples3d/fountain3.rs b/examples3d/fountain3.rs
index e42f71a..5acc2e8 100644
--- a/examples3d/fountain3.rs
+++ b/examples3d/fountain3.rs
@@ -26,7 +26,7 @@ pub fn init_world(testbed: &mut Testbed) {
     let mut k = 0;
 
     // Callback that will be executed on the main loop to handle proximities.
-    testbed.add_callback(move |window, graphics, physics, _, _| {
+    testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
         k += 1;
         let rigid_body = RigidBodyBuilder::new_dynamic()
             .translation(0.0, 10.0, 0.0)
@@ -42,10 +42,8 @@ pub fn init_world(testbed: &mut Testbed) {
             .colliders
             .insert(collider, handle, &mut physics.bodies);
 
-        if graphics.is_some() {
-            graphics
-                .unwrap()
-                .add(window.unwrap(), handle, &physics.bodies, &physics.colliders);
+        if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
+            graphics.add(window, handle, &physics.bodies, &physics.colliders);
         }
 
         if physics.bodies.len() > MAX_NUMBER_OF_BODIES {
@@ -73,9 +71,9 @@ pub fn init_world(testbed: &mut Testbed) {
                     .narrow_phase
                     .maintain(&mut physics.colliders, &mut physics.bodies);
 
-                // if graphics.is_some() {
-                //     graphics.unwrap().remove_body_nodes(window.unwrap(), *handle);
-                // }
+                if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
+                    graphics.remove_body_nodes(window, *handle);
+                }
             }
         }
     });
diff --git a/examples3d/sensor3.rs b/examples3d/sensor3.rs
index 37a8f5a..4160248 100644
--- a/examples3d/sensor3.rs
+++ b/examples3d/sensor3.rs
@@ -73,8 +73,7 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_body_color(sensor_handle, Point3::new(0.5, 1.0, 1.0));
 
     // Callback that will be executed on the main loop to handle proximities.
-    testbed.add_callback(move |_, graphics, physics, events, _| {
-        let graphics = &graphics;
+    testbed.add_callback(move |_, mut graphics, physics, events, _| {
         while let Ok(prox) = events.proximity_events.try_recv() {
             let color = match prox.new_status {
                 Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0),
@@ -84,16 +83,13 @@ pub fn init_world(testbed: &mut Testbed) {
             let parent_handle1 = physics.colliders.get(prox.collider1).unwrap().parent();
             let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent();
 
-            match graphics {
-                Some(graphics) => {
-                    if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
-                        // graphics.set_body_color(parent_handle1, color);
-                    }
-                    if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
-                        // graphics.set_body_color(parent_handle2, color);
-                    }
+            if let Some(graphics) = &mut graphics {
+                if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
+                    graphics.set_body_color(parent_handle1, color);
+                }
+                if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
+                    graphics.set_body_color(parent_handle2, color);
                 }
-                None => {}
             }
         }
     });