Fix 2D benchmarks compilation.

10 files changed, 2 insertions, 47 deletions

diff --git a/benchmarks2d/all_benchmarks2.rs b/benchmarks2d/all_benchmarks2.rs
index e5f2ff1..72d67ed 100644
--- a/benchmarks2d/all_benchmarks2.rs
+++ b/benchmarks2d/all_benchmarks2.rs
@@ -7,7 +7,7 @@ use wasm_bindgen::prelude::*;
 
 use inflector::Inflector;
 
-use rapier_testbed2d::Testbed;
+use rapier_testbed2d::{Testbed, TestbedApp};
 use std::cmp::Ordering;
 
 mod balls2;
@@ -78,7 +78,7 @@ pub fn main() {
         .iter()
         .position(|builder| builder.0.to_camel_case().as_str() == demo.as_str())
         .unwrap_or(0);
-    let testbed = Testbed::from_builders(i, builders);
+    let testbed = TestbedApp::from_builders(i, builders);
 
     testbed.run()
 }
diff --git a/benchmarks2d/balls2.rs b/benchmarks2d/balls2.rs
index 9a28195..8fa9775 100644
--- a/benchmarks2d/balls2.rs
+++ b/benchmarks2d/balls2.rs
@@ -61,8 +61,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(0.0, 2.5), 5.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Balls", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/boxes2.rs b/benchmarks2d/boxes2.rs
index 4fb9bf3..e524386 100644
--- a/benchmarks2d/boxes2.rs
+++ b/benchmarks2d/boxes2.rs
@@ -66,8 +66,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(0.0, 50.0), 10.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Balls", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/capsules2.rs b/benchmarks2d/capsules2.rs
index 6369ef6..89ddfde 100644
--- a/benchmarks2d/capsules2.rs
+++ b/benchmarks2d/capsules2.rs
@@ -68,8 +68,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(0.0, 50.0), 10.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Balls", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/convex_polygons2.rs b/benchmarks2d/convex_polygons2.rs
index f5a6da9..99f5a14 100644
--- a/benchmarks2d/convex_polygons2.rs
+++ b/benchmarks2d/convex_polygons2.rs
@@ -79,8 +79,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(0.0, 50.0), 10.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Balls", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/heightfield2.rs b/benchmarks2d/heightfield2.rs
index 95fed6c..1a30849 100644
--- a/benchmarks2d/heightfield2.rs
+++ b/benchmarks2d/heightfield2.rs
@@ -65,8 +65,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(0.0, 50.0), 10.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Heightfield", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/joint_ball2.rs b/benchmarks2d/joint_ball2.rs
index 35423e7..1ad2d39 100644
--- a/benchmarks2d/joint_ball2.rs
+++ b/benchmarks2d/joint_ball2.rs
@@ -65,8 +65,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(numk as f32 * rad, numi as f32 * -rad), 5.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Joints", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/joint_fixed2.rs b/benchmarks2d/joint_fixed2.rs
index 861912c..e42ad99 100644
--- a/benchmarks2d/joint_fixed2.rs
+++ b/benchmarks2d/joint_fixed2.rs
@@ -78,8 +78,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(50.0, 50.0), 5.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Joints", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/joint_prismatic2.rs b/benchmarks2d/joint_prismatic2.rs
index 91ef48e..e393542 100644
--- a/benchmarks2d/joint_prismatic2.rs
+++ b/benchmarks2d/joint_prismatic2.rs
@@ -62,8 +62,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(80.0, 80.0), 15.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Joints", init_world)]);
-    testbed.run()
-}
diff --git a/benchmarks2d/pyramid2.rs b/benchmarks2d/pyramid2.rs
index e6a715b..c3eb6ad 100644
--- a/benchmarks2d/pyramid2.rs
+++ b/benchmarks2d/pyramid2.rs
@@ -53,8 +53,3 @@ pub fn init_world(testbed: &mut Testbed) {
     testbed.set_world(bodies, colliders, joints);
     testbed.look_at(Point2::new(0.0, 2.5), 5.0);
 }
-
-fn main() {
-    let testbed = Testbed::from_builders(0, vec![("Balls", init_world)]);
-    testbed.run()
-}