diff options
| -rw-r--r-- | .vscode/tasks.json | 11 | ||||
| -rw-r--r-- | examples2d/sensor2.rs | 2 | ||||
| -rw-r--r-- | src/geometry/broad_phase_multi_sap/broad_phase.rs | 1 | ||||
| -rw-r--r-- | src/pipeline/collision_pipeline.rs | 8 | ||||
| -rw-r--r-- | src/pipeline/physics_pipeline.rs | 5 |
5 files changed, 21 insertions, 6 deletions
diff --git a/.vscode/tasks.json b/.vscode/tasks.json index ce32955..bd57b38 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -258,7 +258,16 @@ "--pause" ], "group": "build" - } + }, + { + "label": "🛠tests", + "type": "shell", + "command": "cargo", + "args": [ + "test" + ], + "group": "build" + }, ] ] }
\ No newline at end of file diff --git a/examples2d/sensor2.rs b/examples2d/sensor2.rs index 6415f5d..67e3504 100644 --- a/examples2d/sensor2.rs +++ b/examples2d/sensor2.rs @@ -61,7 +61,7 @@ pub fn init_world(testbed: &mut Testbed) { let sensor_collider = ColliderBuilder::ball(rad * 5.0) .density(0.0) .sensor(true) - .active_events(ActiveEvents::INTERSECTION_EVENTS); + .active_events(ActiveEvents::COLLISION_EVENTS); colliders.insert_with_parent(sensor_collider, sensor_handle, &mut bodies); testbed.set_initial_body_color(sensor_handle, [0.5, 1.0, 1.0]); diff --git a/src/geometry/broad_phase_multi_sap/broad_phase.rs b/src/geometry/broad_phase_multi_sap/broad_phase.rs index 0149adf..4f32ec3 100644 --- a/src/geometry/broad_phase_multi_sap/broad_phase.rs +++ b/src/geometry/broad_phase_multi_sap/broad_phase.rs @@ -648,6 +648,7 @@ mod test { &mut colliders, &mut impulse_joints, &mut multibody_joints, + true, ); broad_phase.update(0.0, &mut colliders, &[], &[coh], &mut events); diff --git a/src/pipeline/collision_pipeline.rs b/src/pipeline/collision_pipeline.rs index 0106ba6..2d77646 100644 --- a/src/pipeline/collision_pipeline.rs +++ b/src/pipeline/collision_pipeline.rs @@ -225,7 +225,7 @@ mod tests { let collider_a = ColliderBuilder::cuboid(1.0, 1.0, 1.0) .active_collision_types(ActiveCollisionTypes::all()) .sensor(true) - .active_events(ActiveEvents::CONTACT_EVENTS | ActiveEvents::INTERSECTION_EVENTS) + .active_events(ActiveEvents::COLLISION_EVENTS) .build(); let a_handle = collider_set.insert(collider_a); @@ -233,7 +233,7 @@ mod tests { let collider_b = ColliderBuilder::cuboid(1.0, 1.0, 1.0) .active_collision_types(ActiveCollisionTypes::all()) .sensor(true) - .active_events(ActiveEvents::CONTACT_EVENTS | ActiveEvents::INTERSECTION_EVENTS) + .active_events(ActiveEvents::COLLISION_EVENTS) .build(); let _ = collider_set.insert(collider_b); @@ -276,7 +276,7 @@ mod tests { let collider_a = ColliderBuilder::cuboid(1.0, 1.0) .active_collision_types(ActiveCollisionTypes::all()) .sensor(true) - .active_events(ActiveEvents::CONTACT_EVENTS | ActiveEvents::INTERSECTION_EVENTS) + .active_events(ActiveEvents::COLLISION_EVENTS) .build(); let a_handle = collider_set.insert(collider_a); @@ -284,7 +284,7 @@ mod tests { let collider_b = ColliderBuilder::cuboid(1.0, 1.0) .active_collision_types(ActiveCollisionTypes::all()) .sensor(true) - .active_events(ActiveEvents::CONTACT_EVENTS | ActiveEvents::INTERSECTION_EVENTS) + .active_events(ActiveEvents::COLLISION_EVENTS) .build(); let _ = collider_set.insert(collider_b); diff --git a/src/pipeline/physics_pipeline.rs b/src/pipeline/physics_pipeline.rs index 3f74b48..6156854 100644 --- a/src/pipeline/physics_pipeline.rs +++ b/src/pipeline/physics_pipeline.rs @@ -759,6 +759,7 @@ mod test { &mut colliders, &mut impulse_joints, &mut multibody_joints, + true, ); } @@ -798,6 +799,7 @@ mod test { &mut colliders, &mut impulse_joints, &mut multibody_joints, + true, ); bodies.remove( h3, @@ -805,6 +807,7 @@ mod test { &mut colliders, &mut impulse_joints, &mut multibody_joints, + true, ); bodies.remove( h2, @@ -812,6 +815,7 @@ mod test { &mut colliders, &mut impulse_joints, &mut multibody_joints, + true, ); let ser_bodies = bincode::serialize(&bodies).unwrap(); @@ -857,6 +861,7 @@ mod test { &mut colliders, &mut impulse_joints, &mut multibody_joints, + true, ); for _ in 0..10 { |