unify callbacks with & without graphics & window

6 files changed, 74 insertions, 54 deletions

diff --git a/examples3d/debug_add_remove_collider3.rs b/examples3d/debug_add_remove_collider3.rs
index 437a27d..8a3d672 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.harness_mut().add_callback(move |physics, _, _| {
+    testbed.add_callback(move |window, graphics, physics, _, _| {
         // Remove then re-add the ground collider.
         let coll = physics
             .colliders
@@ -45,7 +45,13 @@ pub fn init_world(testbed: &mut Testbed) {
             .insert(coll, ground_handle, &mut physics.bodies);
 
         // TODO: need a way to access graphics & window
-        // graphics.add_collider(window, ground_collider_handle, &physics.colliders);
+        if graphics.is_some() {
+            graphics.unwrap().add_collider(
+                window.unwrap(),
+                ground_collider_handle,
+                &physics.colliders,
+            );
+        }
     });
 
     /*
diff --git a/examples3d/debug_dynamic_collider_add3.rs b/examples3d/debug_dynamic_collider_add3.rs
index 92ae209..cefe030 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.harness_mut().add_callback(move |physics, _, _| {
+    testbed.add_callback(move |window, graphics, physics, _, _| {
         step += 1;
 
         // Add a bigger ball collider
@@ -56,8 +56,14 @@ pub fn init_world(testbed: &mut Testbed) {
             physics
                 .colliders
                 .insert(collider, ball_handle, &mut physics.bodies);
-        // TODO: need a way to access graphics & window
-        // graphics.add_collider(window, new_ball_collider_handle, &physics.colliders);
+
+        if graphics.is_some() {
+            graphics.unwrap().add_collider(
+                window.unwrap(),
+                new_ball_collider_handle,
+                &physics.colliders,
+            );
+        }
         extra_colliders.push(new_ball_collider_handle);
 
         // Snap the ball velocity or restore it.
@@ -97,8 +103,11 @@ pub fn init_world(testbed: &mut Testbed) {
                 .colliders
                 .insert(coll, ground_handle, &mut physics.bodies);
 
-        // TODO: need a way to access graphics & window
-        // graphics.add_collider(window, new_ground_collider_handle, &physics.colliders);
+        //FIXME: This causes an error
+        // if graphics.is_some() {
+        //     graphics.unwrap().add_collider(window.unwrap(), new_ground_collider_handle, &physics.colliders);
+        // }
+
         extra_colliders.push(new_ground_collider_handle);
     });
 
diff --git a/examples3d/debug_rollback3.rs b/examples3d/debug_rollback3.rs
index aa0b0ff..27b27cf 100644
--- a/examples3d/debug_rollback3.rs
+++ b/examples3d/debug_rollback3.rs
@@ -44,7 +44,7 @@ pub fn init_world(testbed: &mut Testbed) {
     let mut step = 0;
     let snapped_frame = 51;
 
-    testbed.harness_mut().add_callback(move |physics, _, _| {
+    testbed.add_callback(move |_, _, physics, _, _| {
         step += 1;
 
         // Snap the ball velocity or restore it.
diff --git a/examples3d/fountain3.rs b/examples3d/fountain3.rs
index 0909a0c..e42f71a 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.harness_mut().add_callback(move |physics, _, _| {
+    testbed.add_callback(move |window, graphics, physics, _, _| {
         k += 1;
         let rigid_body = RigidBodyBuilder::new_dynamic()
             .translation(0.0, 10.0, 0.0)
@@ -41,8 +41,12 @@ pub fn init_world(testbed: &mut Testbed) {
         physics
             .colliders
             .insert(collider, handle, &mut physics.bodies);
-        // TODO: need a way to access graphics & window
-        // graphics.add(window, handle, &physics.bodies, &physics.colliders);
+
+        if graphics.is_some() {
+            graphics
+                .unwrap()
+                .add(window.unwrap(), handle, &physics.bodies, &physics.colliders);
+        }
 
         if physics.bodies.len() > MAX_NUMBER_OF_BODIES {
             let mut to_remove: Vec<_> = physics
@@ -69,8 +73,9 @@ pub fn init_world(testbed: &mut Testbed) {
                     .narrow_phase
                     .maintain(&mut physics.colliders, &mut physics.bodies);
 
-                // TODO: need a way to access graphics & window
-                // graphics.remove_body_nodes(window, *handle);
+                // if graphics.is_some() {
+                //     graphics.unwrap().remove_body_nodes(window.unwrap(), *handle);
+                // }
             }
         }
     });
diff --git a/examples3d/platform3.rs b/examples3d/platform3.rs
index 944adae..7b5c986 100644
--- a/examples3d/platform3.rs
+++ b/examples3d/platform3.rs
@@ -65,31 +65,29 @@ pub fn init_world(testbed: &mut Testbed) {
      * Setup a callback to control the platform.
      */
     let mut count = 0;
-    testbed
-        .harness_mut()
-        .add_callback(move |physics, _, run_state| {
-            count += 1;
-            if count % 100 > 50 {
-                return;
-            }
-
-            if let Some(platform) = physics.bodies.get_mut(platform_handle) {
-                let mut next_pos = *platform.position();
+    testbed.add_callback(move |_, _, physics, _, run_state| {
+        count += 1;
+        if count % 100 > 50 {
+            return;
+        }
 
-                let dt = 0.016;
-                next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt;
-                next_pos.translation.vector.z += run_state.time.sin() * 5.0 * dt;
+        if let Some(platform) = physics.bodies.get_mut(platform_handle) {
+            let mut next_pos = *platform.position();
 
-                if next_pos.translation.vector.z >= rad * 10.0 {
-                    next_pos.translation.vector.z -= dt;
-                }
-                if next_pos.translation.vector.z <= -rad * 10.0 {
-                    next_pos.translation.vector.z += dt;
-                }
+            let dt = 0.016;
+            next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt;
+            next_pos.translation.vector.z += run_state.time.sin() * 5.0 * dt;
 
-                platform.set_next_kinematic_position(next_pos);
+            if next_pos.translation.vector.z >= rad * 10.0 {
+                next_pos.translation.vector.z -= dt;
             }
-        });
+            if next_pos.translation.vector.z <= -rad * 10.0 {
+                next_pos.translation.vector.z += dt;
+            }
+
+            platform.set_next_kinematic_position(next_pos);
+        }
+    });
 
     /*
      * Run the simulation.
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.