Merge pull request #189 from dimforge/bevy_renderer

Testbed: replace Kiss3d by Bevy

1 files changed, 5 insertions, 10 deletions

diff --git a/examples2d/add_remove2.rs b/examples2d/add_remove2.rs
index 826d5c9..9f9f65a 100644
--- a/examples2d/add_remove2.rs
+++ b/examples2d/add_remove2.rs
@@ -10,7 +10,7 @@ pub fn init_world(testbed: &mut Testbed) {
     let rad = 0.5;
 
     // Callback that will be executed on the main loop to handle proximities.
-    testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
+    testbed.add_callback(move |mut graphics, physics, _, _| {
         let rigid_body = RigidBodyBuilder::new_dynamic()
             .translation(0.0, 10.0)
             .build();
@@ -20,8 +20,8 @@ pub fn init_world(testbed: &mut Testbed) {
             .colliders
             .insert(collider, handle, &mut physics.bodies);
 
-        if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
-            graphics.add(*window, handle, &physics.bodies, &physics.colliders);
+        if let Some(graphics) = &mut graphics {
+            graphics.add_body(handle, &physics.bodies, &physics.colliders);
         }
 
         let to_remove: Vec<_> = physics
@@ -38,8 +38,8 @@ pub fn init_world(testbed: &mut Testbed) {
                 &mut physics.joints,
             );
 
-            if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
-                graphics.remove_body_nodes(*window, handle);
+            if let Some(graphics) = &mut graphics {
+                graphics.remove_body(handle);
             }
         }
     });
@@ -50,8 +50,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(0.0, 0.0), 20.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Add-remove", init_world)]);
-    testbed.run()
-}