diff --git a/examples2d/joint_motor_position2.rs b/examples2d/joint_motor_position2.rs index 56866ac3c..c8374ff7a 100644 --- a/examples2d/joint_motor_position2.rs +++ b/examples2d/joint_motor_position2.rs @@ -11,15 +11,10 @@ pub fn init_world(testbed: &mut Testbed) { let multibody_joints = MultibodyJointSet::new(); /* - * The ground + * Fixed ground to attach one end of the joints. */ - let ground_size = 5.0; - let ground_height = 0.1; - - let rigid_body = RigidBodyBuilder::fixed().translation(vector![0.0, -ground_height]); + let rigid_body = RigidBodyBuilder::fixed(); let ground_handle = bodies.insert(rigid_body); - let collider = ColliderBuilder::cuboid(ground_size, ground_height); - colliders.insert_with_parent(collider, ground_handle, &mut bodies); /* * A rectangle on a motor with target position. @@ -28,7 +23,6 @@ pub fn init_world(testbed: &mut Testbed) { let x_pos = -6.0 + 1.5 * num as f32; let rigid_body = RigidBodyBuilder::dynamic() .translation(vector![x_pos, 2.0]) - .rotation(std::f32::consts::PI) .can_sleep(false); let handle = bodies.insert(rigid_body); let collider = ColliderBuilder::cuboid(0.1, 0.5); @@ -38,7 +32,7 @@ pub fn init_world(testbed: &mut Testbed) { .local_anchor1(point![x_pos, 1.5]) .local_anchor2(point![0.0, -0.5]) .motor_position( - std::f32::consts::PI - std::f32::consts::PI / 4.0 * num as f32, + -std::f32::consts::PI + std::f32::consts::PI / 4.0 * num as f32, 1000.0, 150.0, ); @@ -48,11 +42,11 @@ pub fn init_world(testbed: &mut Testbed) { /* * A rectangle on a motor with limits. */ - for num in 2..3 { + for num in 0..8 { let x_pos = -6.0 + 1.5 * num as f32; let rigid_body = RigidBodyBuilder::dynamic() - .translation(vector![x_pos, 5.0]) - .angvel(4.0) + .translation(vector![x_pos, 4.5]) + .rotation(std::f32::consts::PI) .can_sleep(false); let handle = bodies.insert(rigid_body); let collider = ColliderBuilder::cuboid(0.1, 0.5); @@ -65,7 +59,7 @@ pub fn init_world(testbed: &mut Testbed) { .motor_max_force(100.0) .limits([ -std::f32::consts::PI, - std::f32::consts::PI / 4.0 * num as f32, + -std::f32::consts::PI + std::f32::consts::PI / 4.0 * num as f32, ]); impulse_joints.insert(ground_handle, handle, joint, true); } diff --git a/examples3d/joint_motor_position3.rs b/examples3d/joint_motor_position3.rs index d149d82ce..0a15e634e 100644 --- a/examples3d/joint_motor_position3.rs +++ b/examples3d/joint_motor_position3.rs @@ -11,15 +11,10 @@ pub fn init_world(testbed: &mut Testbed) { let multibody_joints = MultibodyJointSet::new(); /* - * The ground + * Fixed ground to attach one end of the joints. */ - let ground_size = 5.0; - let ground_height = 0.1; - - let rigid_body = RigidBodyBuilder::fixed().translation(vector![0.0, -ground_height, 0.0]); + let rigid_body = RigidBodyBuilder::fixed(); let ground_handle = bodies.insert(rigid_body); - let collider = ColliderBuilder::cuboid(ground_size, ground_height, ground_size); - colliders.insert_with_parent(collider, ground_handle, &mut bodies); /* * A rectangle on a motor with target position. @@ -37,7 +32,7 @@ pub fn init_world(testbed: &mut Testbed) { .local_anchor1(point![x_pos, 1.5, 0.0]) .local_anchor2(point![0.0, -0.5, 0.0]) .motor_position( - -(std::f32::consts::PI - std::f32::consts::PI / 4.0 * num as f32), + -std::f32::consts::PI + std::f32::consts::PI / 4.0 * num as f32, 1000.0, 150.0, ); @@ -47,10 +42,10 @@ pub fn init_world(testbed: &mut Testbed) { /* * A rectangle on a motor with limits. */ - for num in 0..9 { + for num in 0..8 { let x_pos = -6.0 + 1.5 * num as f32; let rigid_body = RigidBodyBuilder::dynamic() - .translation(vector![x_pos, 5.0, 0.0]) + .translation(vector![x_pos, 4.5, 0.0]) .rotation(vector![0.0, 0.0, std::f32::consts::PI]) .can_sleep(false); let handle = bodies.insert(rigid_body); @@ -64,7 +59,7 @@ pub fn init_world(testbed: &mut Testbed) { .motor_max_force(100.0) .limits([ -std::f32::consts::PI, - std::f32::consts::PI / 4.0 * num as f32, + -std::f32::consts::PI + std::f32::consts::PI / 4.0 * num as f32, ]); impulse_joints.insert(ground_handle, handle, joint, true); }