Allow avoidance of exclusive World's ownership from Testbed

examples2d/body_status2.rs

@@ -181,6 +181,7 @@ fn main() {
      */
     let mut testbed = Testbed::new(world);
     testbed.add_callback(move |world, _, time| {
+        let mut world = world.get_mut();
         let platform = world.rigid_body_mut(platform_handle).unwrap();
         let platform_x = platform.position().translation.vector.x;
 

examples2d/sensor2.rs

@@ -88,6 +88,7 @@ fn main() {
 
     // Callback that will be executed on the main loop to handle proximities.
     testbed.add_callback(move |world, graphics, _| {
+        let world = world.get();
         for prox in world.proximity_events() {
             let color = match prox.new_status {
                 Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0),
@@ -98,10 +99,10 @@ fn main() {
             let body2 = world.collider(prox.collider2).unwrap().data().body();
 
             if !body1.is_ground() && body1 != sensor_body {
-                graphics.set_body_color(world, body1, color);
+                graphics.set_body_color(&world, body1, color);
             }
             if !body2.is_ground() && body2 != sensor_body {
-                graphics.set_body_color(world, body2, color);
+                graphics.set_body_color(&world, body2, color);
             }
         }
     });

examples3d/body_status3.rs

@@ -169,7 +169,8 @@ fn main() {
      * Setup a callback to control the platform.
      */
     let mut testbed = Testbed::new(world);
-    testbed.add_callback(move |world, _, time| {
+    testbed.add_callback(move |world_owner, _, time| {
+        let mut world = world_owner.get_mut();
         let platform = world.rigid_body_mut(platform_handle).unwrap();
         let platform_z = platform.position().translation.vector.z;
 

examples3d/joints3.rs

@@ -315,6 +315,8 @@ fn main() {
      */
     let mut testbed = Testbed::new(world);
     testbed.add_callback(move |world, _, _| {
+        let mut world = world.get_mut();
+
         /*
          * Activate the helical joint motor if it is to low.
          */
@@ -334,6 +336,8 @@ fn main() {
     });
 
     testbed.add_callback(move |world, _, _| {
+        let mut world = world.get_mut();
+
         /*
          * Activate the pin-slot joint linear motor if it is to low.
          */

examples3d/sensor3.rs

@@ -91,7 +91,9 @@ fn main() {
     testbed.set_body_color(&world, sensor_body, Point3::new(0.5, 1.0, 1.0));
 
     // Callback that will be executed on the main loop to handle proximities.
-    testbed.add_callback(move |world, graphics, _| {
+    testbed.add_callback(move |world_owner, graphics, _| {
+        let world = world_owner.get();
+
         for prox in world.proximity_events() {
             let color = match prox.new_status {
                 Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0),
@@ -102,10 +104,10 @@ fn main() {
             let body2 = world.collider(prox.collider2).unwrap().data().body();
 
             if !body1.is_ground() && body1 != sensor_body {
-                graphics.set_body_color(world, body1, color);
+                graphics.set_body_color(&world, body1, color);
             }
             if !body2.is_ground() && body2 != sensor_body {
-                graphics.set_body_color(world, body2, color);
+                graphics.set_body_color(&world, body2, color);
             }
         }
     });

nphysics_testbed2d/src/lib.rs

@@ -8,7 +8,9 @@ extern crate time;
 
 pub use engine::GraphicsManager;
 pub use testbed::Testbed;
+pub use world_owner::WorldOwner;
 
 mod engine;
 pub mod objects;
 mod testbed;
+mod world_owner;