From 34e79e9afc21ff0202d8a0338d0e8e038402a159 Mon Sep 17 00:00:00 2001
From: rezural <rezural@protonmail.com>
Date: Sat, 2 Jan 2021 16:45:55 +1100
Subject: unify callbacks with & without graphics & window

---
 examples3d/sensor3.rs | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'examples3d/sensor3.rs')

diff --git a/examples3d/sensor3.rs b/examples3d/sensor3.rs
index db01265..37a8f5a 100644
--- a/examples3d/sensor3.rs
+++ b/examples3d/sensor3.rs
@@ -73,28 +73,30 @@ 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
-        .harness_mut()
-        .add_callback(move |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),
-                    Proximity::Disjoint => Point3::new(0.5, 0.5, 1.0),
-                };
-
-                let parent_handle1 = physics.colliders.get(prox.collider1).unwrap().parent();
-                let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent();
-
-                if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
-                    // TODO: need a way to access graphics & window
-                    // graphics.set_body_color(parent_handle1, color);
-                }
-                if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
-                    // TODO: need a way to access graphics & window
-                    // graphics.set_body_color(parent_handle2, color);
+    testbed.add_callback(move |_, graphics, physics, events, _| {
+        let graphics = &graphics;
+        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),
+                Proximity::Disjoint => Point3::new(0.5, 0.5, 1.0),
+            };
+
+            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);
+                    }
                 }
+                None => {}
             }
-        });
+        }
+    });
 
     /*
      * Set up the testbed.
-- 
cgit