Replace Kiss3d by Bevy for the testbed renderer.

16 files changed, 5 insertions, 80 deletions

diff --git a/benchmarks3d/all_benchmarks3.rs b/benchmarks3d/all_benchmarks3.rs
index 38d71cd..d62c72c 100644
--- a/benchmarks3d/all_benchmarks3.rs
+++ b/benchmarks3d/all_benchmarks3.rs
@@ -7,7 +7,7 @@ use wasm_bindgen::prelude::*;
 
 use inflector::Inflector;
 
-use rapier_testbed3d::Testbed;
+use rapier_testbed3d::{Testbed, TestbedApp};
 use std::cmp::Ordering;
 
 mod balls3;
@@ -80,12 +80,12 @@ pub fn main() {
                 .iter()
                 .position(|builder| builder.0.to_camel_case().as_str() == demo.as_str())
             {
-                Testbed::from_builders(0, vec![builders[i]]).run()
+                TestbedApp::from_builders(0, vec![builders[i]]).run()
             } else {
                 eprintln!("Invalid example to run provided: '{}'", demo);
             }
         }
-        Command::RunAll => Testbed::from_builders(0, builders).run(),
+        Command::RunAll => TestbedApp::from_builders(0, builders).run(),
         Command::List => {
             for builder in &builders {
                 println!("{}", builder.0.to_camel_case())
diff --git a/benchmarks3d/balls3.rs b/benchmarks3d/balls3.rs
index 1f0f1df..492aeac 100644
--- a/benchmarks3d/balls3.rs
+++ b/benchmarks3d/balls3.rs
@@ -51,8 +51,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Balls", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/boxes3.rs b/benchmarks3d/boxes3.rs
index 0eb31f5..86213af 100644
--- a/benchmarks3d/boxes3.rs
+++ b/benchmarks3d/boxes3.rs
@@ -61,8 +61,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/capsules3.rs b/benchmarks3d/capsules3.rs
index 0e8ad94..edd6d57 100644
--- a/benchmarks3d/capsules3.rs
+++ b/benchmarks3d/capsules3.rs
@@ -62,8 +62,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/ccd3.rs b/benchmarks3d/ccd3.rs
index f1831e7..a496648 100644
--- a/benchmarks3d/ccd3.rs
+++ b/benchmarks3d/ccd3.rs
@@ -78,8 +78,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/compound3.rs b/benchmarks3d/compound3.rs
index a8a9939..3f82ca0 100644
--- a/benchmarks3d/compound3.rs
+++ b/benchmarks3d/compound3.rs
@@ -69,8 +69,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/convex_polyhedron3.rs b/benchmarks3d/convex_polyhedron3.rs
index 30d77ac..0e14782 100644
--- a/benchmarks3d/convex_polyhedron3.rs
+++ b/benchmarks3d/convex_polyhedron3.rs
@@ -76,8 +76,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/heightfield3.rs b/benchmarks3d/heightfield3.rs
index fc64856..062e7c5 100644
--- a/benchmarks3d/heightfield3.rs
+++ b/benchmarks3d/heightfield3.rs
@@ -75,8 +75,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/joint_ball3.rs b/benchmarks3d/joint_ball3.rs
index 12b62a9..e7b3e3d 100644
--- a/benchmarks3d/joint_ball3.rs
+++ b/benchmarks3d/joint_ball3.rs
@@ -63,8 +63,3 @@ pub fn init_world(testbed: &mut Testbed) {
         Point3::new(54.0, -38.0, 29.0),
     );
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Joints", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/joint_fixed3.rs b/benchmarks3d/joint_fixed3.rs
index 9839e38..0475258 100644
--- a/benchmarks3d/joint_fixed3.rs
+++ b/benchmarks3d/joint_fixed3.rs
@@ -85,8 +85,3 @@ pub fn init_world(testbed: &mut Testbed) {
         Point3::new(46.0, 12.0, 23.0),
     );
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Joints", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/joint_prismatic3.rs b/benchmarks3d/joint_prismatic3.rs
index 3267ada..afc18fb 100644
--- a/benchmarks3d/joint_prismatic3.rs
+++ b/benchmarks3d/joint_prismatic3.rs
@@ -74,8 +74,3 @@ pub fn init_world(testbed: &mut Testbed) {
         Point3::new(101.0, 4.0, -3.0),
     );
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Joints", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/joint_revolute3.rs b/benchmarks3d/joint_revolute3.rs
index 040fc3e..0c647a6 100644
--- a/benchmarks3d/joint_revolute3.rs
+++ b/benchmarks3d/joint_revolute3.rs
@@ -82,8 +82,3 @@ pub fn init_world(testbed: &mut Testbed) {
         Point3::new(134.0, 83.0, -116.0),
     );
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Joints", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/keva3.rs b/benchmarks3d/keva3.rs
index 6862f25..9e6807a 100644
--- a/benchmarks3d/keva3.rs
+++ b/benchmarks3d/keva3.rs
@@ -51,7 +51,7 @@ pub fn build_block(
                 let collider = ColliderBuilder::cuboid(dim.x, dim.y, dim.z).build();
                 colliders.insert(collider, handle, bodies);
 
-                testbed.set_body_color(handle, color0);
+                testbed.set_initial_body_color(handle, color0);
                 std::mem::swap(&mut color0, &mut color1);
             }
         }
@@ -73,7 +73,7 @@ pub fn build_block(
             let handle = bodies.insert(rigid_body);
             let collider = ColliderBuilder::cuboid(dim.x, dim.y, dim.z).build();
             colliders.insert(collider, handle, bodies);
-            testbed.set_body_color(handle, color0);
+            testbed.set_initial_body_color(handle, color0);
             std::mem::swap(&mut color0, &mut color1);
         }
     }
@@ -137,8 +137,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/pyramid3.rs b/benchmarks3d/pyramid3.rs
index 5b6f34e..3b31eac 100644
--- a/benchmarks3d/pyramid3.rs
+++ b/benchmarks3d/pyramid3.rs
@@ -76,8 +76,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/stacks3.rs b/benchmarks3d/stacks3.rs
index 435dcb5..31dff0a 100644
--- a/benchmarks3d/stacks3.rs
+++ b/benchmarks3d/stacks3.rs
@@ -184,8 +184,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks3d/trimesh3.rs b/benchmarks3d/trimesh3.rs
index e0701f1..0501d6f 100644
--- a/benchmarks3d/trimesh3.rs
+++ b/benchmarks3d/trimesh3.rs
@@ -80,8 +80,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point3::new(100.0, 100.0, 100.0), Point3::origin());
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Boxes", init_world)]);
-    testbed.run()
-}