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 --- examples3d/debug_trimesh3.rs | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'examples3d/debug_trimesh3.rs') diff --git a/examples3d/debug_trimesh3.rs b/examples3d/debug_trimesh3.rs index 5a8ed4b..d21d0d3 100644 --- a/examples3d/debug_trimesh3.rs +++ b/examples3d/debug_trimesh3.rs @@ -1,6 +1,4 @@ -use na::Point3; -use rapier3d::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet}; -use rapier3d::geometry::{ColliderBuilder, ColliderSet}; +use rapier3d::prelude::*; use rapier_testbed3d::Testbed; pub fn init_world(testbed: &mut Testbed) { @@ -14,14 +12,14 @@ pub fn init_world(testbed: &mut Testbed) { // Triangle ground. let width = 0.5; let vtx = vec![ - Point3::new(-width, 0.0, -width), - Point3::new(width, 0.0, -width), - Point3::new(width, 0.0, width), - Point3::new(-width, 0.0, width), - Point3::new(-width, -width, -width), - Point3::new(width, -width, -width), - Point3::new(width, -width, width), - Point3::new(-width, -width, width), + point![-width, 0.0, -width], + point![width, 0.0, -width], + point![width, 0.0, width], + point![-width, 0.0, width], + point![-width, -width, -width], + point![width, -width, -width], + point![width, -width, width], + point![-width, -width, width], ]; let idx = vec![ [0, 2, 1], @@ -40,25 +38,25 @@ pub fn init_world(testbed: &mut Testbed) { // Dynamic box rigid body. let rigid_body = RigidBodyBuilder::new_dynamic() - .translation(0.0, 35.0, 0.0) + .translation(vector![0.0, 35.0, 0.0]) // .rotation(Vector3::new(0.8, 0.2, 0.1)) .can_sleep(false) .build(); let handle = bodies.insert(rigid_body); let collider = ColliderBuilder::cuboid(1.0, 2.0, 1.0).build(); - colliders.insert(collider, handle, &mut bodies); + colliders.insert_with_parent(collider, handle, &mut bodies); let rigid_body = RigidBodyBuilder::new_static() - .translation(0.0, 0.0, 0.0) + .translation(vector![0.0, 0.0, 0.0]) .build(); let handle = bodies.insert(rigid_body); let collider = ColliderBuilder::trimesh(vtx, idx).build(); - colliders.insert(collider, handle, &mut bodies); - testbed.set_initial_body_color(handle, Point3::new(0.3, 0.3, 0.3)); + colliders.insert_with_parent(collider, handle, &mut bodies); + testbed.set_initial_body_color(handle, [0.3, 0.3, 0.3]); /* * Set up the testbed. */ testbed.set_world(bodies, colliders, joints); - testbed.look_at(Point3::new(10.0, 10.0, 10.0), Point3::origin()); + testbed.look_at(point![10.0, 10.0, 10.0], Point::origin()); } -- cgit