From 1bef66fea941307a7305ddaebdb0abe3d0cb281f Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Tue, 25 May 2021 11:00:13 +0200 Subject: Add prelude + use vectors for setting linvel/translation in builders --- benchmarks2d/joint_fixed2.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'benchmarks2d/joint_fixed2.rs') diff --git a/benchmarks2d/joint_fixed2.rs b/benchmarks2d/joint_fixed2.rs index e42ad99..baaa250 100644 --- a/benchmarks2d/joint_fixed2.rs +++ b/benchmarks2d/joint_fixed2.rs @@ -1,6 +1,4 @@ -use na::{Isometry2, Point2}; -use rapier2d::dynamics::{FixedJoint, JointSet, RigidBodyBuilder, RigidBodySet, RigidBodyType}; -use rapier2d::geometry::{ColliderBuilder, ColliderSet}; +use rapier2d::prelude::*; use rapier_testbed2d::Testbed; pub fn init_world(testbed: &mut Testbed) { @@ -39,18 +37,18 @@ pub fn init_world(testbed: &mut Testbed) { }; let rigid_body = RigidBodyBuilder::new(status) - .translation(x + fk * shift, y - fi * shift) + .translation(vector![x + fk * shift, y - fi * shift]) .build(); let child_handle = bodies.insert(rigid_body); let collider = ColliderBuilder::ball(rad).build(); - colliders.insert(collider, child_handle, &mut bodies); + colliders.insert_with_parent(collider, child_handle, &mut bodies); // Vertical joint. if i > 0 { let parent_handle = *body_handles.last().unwrap(); let joint = FixedJoint::new( - Isometry2::identity(), - Isometry2::translation(0.0, shift), + Isometry::identity(), + Isometry::translation(0.0, shift), ); joints.insert(&mut bodies, parent_handle, child_handle, joint); } @@ -60,8 +58,8 @@ pub fn init_world(testbed: &mut Testbed) { let parent_index = body_handles.len() - num; let parent_handle = body_handles[parent_index]; let joint = FixedJoint::new( - Isometry2::identity(), - Isometry2::translation(-shift, 0.0), + Isometry::identity(), + Isometry::translation(-shift, 0.0), ); joints.insert(&mut bodies, parent_handle, child_handle, joint); } @@ -76,5 +74,5 @@ pub fn init_world(testbed: &mut Testbed) { * Set up the testbed. */ testbed.set_world(bodies, colliders, joints); - testbed.look_at(Point2::new(50.0, 50.0), 5.0); + testbed.look_at(point![50.0, 50.0], 5.0); } -- cgit