Merge pull request #196 from dimforge/api_changes

More API changes

2 files changed, 81 insertions, 42 deletions

diff --git a/src/dynamics/ccd/ccd_solver.rs b/src/dynamics/ccd/ccd_solver.rs
index b348283..7e95f08 100644
--- a/src/dynamics/ccd/ccd_solver.rs
+++ b/src/dynamics/ccd/ccd_solver.rs
@@ -10,6 +10,7 @@ use crate::geometry::{
 use crate::math::Real;
 use crate::parry::utils::SortedPair;
 use crate::pipeline::{EventHandler, QueryPipeline, QueryPipelineMode};
+use crate::prelude::{ActiveEvents, ColliderFlags};
 use parry::query::{DefaultQueryDispatcher, QueryDispatcher};
 use parry::utils::hashmap::HashMap;
 use std::collections::BinaryHeap;
@@ -66,7 +67,7 @@ impl CCDSolver {
                         &RigidBodyCcd,
                         &RigidBodyMassProps,
                     ) = bodies.index_bundle(handle.0);
-                    let local_com = &mprops.mass_properties.local_com;
+                    let local_com = &mprops.local_mprops.local_com;
 
                     let min_toi = (ccd.ccd_thickness
                         * 0.15
@@ -139,7 +140,8 @@ impl CCDSolver {
         Colliders: ComponentSetOption<ColliderParent>
             + ComponentSet<ColliderPosition>
             + ComponentSet<ColliderShape>
-            + ComponentSet<ColliderType>,
+            + ComponentSet<ColliderType>
+            + ComponentSet<ColliderFlags>,
     {
         // Update the query pipeline.
         self.query_pipeline.update_with_mode(
@@ -200,16 +202,21 @@ impl CCDSolver {
                             {
                                 let co_parent1: Option<&ColliderParent> = colliders.get(ch1.0);
                                 let co_parent2: Option<&ColliderParent> = colliders.get(ch2.0);
-                                let c1: (_, _, _) = colliders.index_bundle(ch1.0);
-                                let c2: (_, _, _) = colliders.index_bundle(ch2.0);
+                                let c1: (_, _, _, &ColliderFlags) = colliders.index_bundle(ch1.0);
+                                let c2: (_, _, _, &ColliderFlags) = colliders.index_bundle(ch2.0);
                                 let co_type1: &ColliderType = colliders.index(ch1.0);
                                 let co_type2: &ColliderType = colliders.index(ch1.0);
 
                                 let bh1 = co_parent1.map(|p| p.handle);
                                 let bh2 = co_parent2.map(|p| p.handle);
 
-                                if bh1 == bh2 || (co_type1.is_sensor() || co_type2.is_sensor()) {
-                                    // Ignore self-intersection and sensors.
+                                // Ignore self-intersection and sensors and apply collision groups filter.
+                                if bh1 == bh2                                                 // Ignore self-intersection.
+                                    || (co_type1.is_sensor() || co_type2.is_sensor())         // Ignore sensors.
+                                    || !c1.3.collision_groups.test(c2.3.collision_groups) // Apply collision groups.
+                                    || !c1.3.solver_groups.test(c2.3.solver_groups)
+                                // Apply solver groups.
+                                {
                                     return true;
                                 }
 
@@ -225,8 +232,8 @@ impl CCDSolver {
                                     self.query_pipeline.query_dispatcher(),
                                     *ch1,
                                     *ch2,
-                                    (c1.0, c1.1, c1.2, co_parent1),
-                                    (c2.0, c2.1, c2.2, co_parent2),
+                                    (c1.0, c1.1, c1.2, c1.3, co_parent1),
+                                    (c2.0, c2.1, c2.2, c2.3, co_parent2),
                                     Some((rb_pos1, rb_vels1, rb_mprops1, rb_ccd1)),
                                     b2,
                                     None,
@@ -272,7 +279,9 @@ impl CCDSolver {
         Colliders: ComponentSetOption<ColliderParent>
             + ComponentSet<ColliderPosition>
             + ComponentSet<ColliderShape>
-            + ComponentSet<ColliderType>,
+            + ComponentSet<ColliderType>
+            + ComponentSet<ColliderFlags>
+            + ComponentSet<ColliderFlags>,
     {
         let mut frozen = HashMap::<_, Real>::default();
         let mut all_toi = BinaryHeap::new();
@@ -334,14 +343,15 @@ impl CCDSolver {
                             {
                                 let co_parent1: Option<&ColliderParent> = colliders.get(ch1.0);
                                 let co_parent2: Option<&ColliderParent> = colliders.get(ch2.0);
-                                let c1: (_, _, _) = colliders.index_bundle(ch1.0);
-                                let c2: (_, _, _) = colliders.index_bundle(ch2.0);
+                                let c1: (_, _, _, &ColliderFlags) = colliders.index_bundle(ch1.0);
+                                let c2: (_, _, _, &ColliderFlags) = colliders.index_bundle(ch2.0);
 
                                 let bh1 = co_parent1.map(|p| p.handle);
                                 let bh2 = co_parent2.map(|p| p.handle);
 
-                                if bh1 == bh2 {
-                                    // Ignore self-intersection.
+                                // Ignore self-intersections and apply groups filter.
+                                if bh1 == bh2 || !c1.3.collision_groups.test(c2.3.collision_groups)
+                                {
                                     return true;
                                 }
 
@@ -358,8 +368,8 @@ impl CCDSolver {
                                     self.query_pipeline.query_dispatcher(),
                                     *ch1,
                                     *ch2,
-                                    (c1.0, c1.1, c1.2, co_parent1),
-                                    (c2.0, c2.1, c2.2, co_parent2),
+                                    (c1.0, c1.1, c1.2, c1.3, co_parent1),
+                                    (c2.0, c2.1, c2.2, c2.3, co_parent2),
                                     b1,
                                     b2,
                                     None,
@@ -398,7 +408,7 @@ impl CCDSolver {
 
         // NOTE: all static bodies (and kinematic bodies?) should be considered as "frozen", this
         // may avoid some resweeps.
-        let mut intersections_to_check = vec![];
+        let mut pseudo_intersections_to_check = vec![];
 
         while let Some(toi) = all_toi.pop() {
             assert!(toi.toi <= dt);
@@ -420,7 +430,7 @@ impl CCDSolver {
                 continue;
             }
 
-            if toi.is_intersection_test {
+            if toi.is_pseudo_intersection_test {
                 // NOTE: this test is redundant with the previous `if !should_freeze && ...`
                 //       but let's keep it to avoid tricky regressions if we end up swapping both
                 //       `if` for some reasons in the future.
@@ -428,7 +438,7 @@ impl CCDSolver {
                     // This is only an intersection so we don't have to freeze and there is no
                     // need to resweep. However we will need to see if we have to generate
                     // intersection events, so push the TOI for further testing.
-                    intersections_to_check.push(toi);
+                    pseudo_intersections_to_check.push(toi);
                 }
                 continue;
             }
@@ -460,14 +470,14 @@ impl CCDSolver {
                     .colliders_with_aabb_intersecting_aabb(&aabb, |ch2| {
                         let co_parent1: Option<&ColliderParent> = colliders.get(ch1.0);
                         let co_parent2: Option<&ColliderParent> = colliders.get(ch2.0);
-                        let c1: (_, _, _) = colliders.index_bundle(ch1.0);
-                        let c2: (_, _, _) = colliders.index_bundle(ch2.0);
+                        let c1: (_, _, _, &ColliderFlags) = colliders.index_bundle(ch1.0);
+                        let c2: (_, _, _, &ColliderFlags) = colliders.index_bundle(ch2.0);
 
                         let bh1 = co_parent1.map(|p| p.handle);
                         let bh2 = co_parent2.map(|p| p.handle);
 
-                        if bh1 == bh2 {
-                            // Ignore self-intersection.
+                        // Ignore self-intersection and apply groups filter.
+                        if bh1 == bh2 || !c1.3.collision_groups.test(c2.3.collision_groups) {
                             return true;
                         }
 
@@ -496,8 +506,8 @@ impl CCDSolver {
                             self.query_pipeline.query_dispatcher(),
                             *ch1,
                             *ch2,
-                            (c1.0, c1.1, c1.2, co_parent1),
-                            (c2.0, c2.1, c2.2, co_parent2),
+                            (c1.0, c1.1, c1.2, c1.3, co_parent1),
+                            (c2.0, c2.1, c2.2, c2.3, co_parent2),
                             b1,
                             b2,
                             frozen1.copied(),
@@ -514,7 +524,7 @@ impl CCDSolver {
             }
         }
 
-        for toi in intersections_to_check {
+        for toi in pseudo_intersections_to_check {
             // See if the intersection is still active once the bodies
             // reach their final positions.
             // - If the intersection is still active, don't report it yet. It will be
@@ -522,10 +532,29 @@ impl CCDSolver {
             // - If the intersection isn't active anymore, and it wasn't intersecting
             //   before, then we need to generate one interaction-start and one interaction-stop
             //   events because it will never be detected by the narrow-phase because of tunneling.
-            let (co_pos1, co_shape1): (&ColliderPosition, &ColliderShape) =
-                colliders.index_bundle(toi.c1.0);
-            let (co_pos2, co_shape2): (&ColliderPosition, &ColliderShape) =
-                colliders.index_bundle(toi.c2.0);
+            let (co_type1, co_pos1, co_shape1, co_flags1): (
+                &ColliderType,
+                &ColliderPosition,
+                &ColliderShape,
+                &ColliderFlags,
+            ) = colliders.index_bundle(toi.c1.0);
+            let (co_type2, co_pos2, co_shape2, co_flags2): (
+                &ColliderType,
+                &ColliderPosition,
+                &ColliderShape,
+                &ColliderFlags,
+            ) = colliders.index_bundle(toi.c2.0);
+
+            if !co_type1.is_sensor() && !co_type2.is_sensor() {
+                // TODO: this happens if we found a TOI between two non-sensor
+                //       colliders with mismatching solver_flags. It is not clear
+                //       what we should do in this case: we could report a
+                //       contact started/contact stopped event for example. But in
+                //       that case, what contact pair should be pass to these events?
+                // For now we just ignore this special case. Let's wait for an actual
+                // use-case to come up before we determine what we want to do here.
+                continue;
+            }
 
             let co_next_pos1 = if let Some(b1) = toi.b1 {
                 let co_parent1: &ColliderParent = colliders.get(toi.c1.0).unwrap();
@@ -535,7 +564,7 @@ impl CCDSolver {
                     &RigidBodyMassProps,
                 ) = bodies.index_bundle(b1.0);
 
-                let local_com1 = &rb_mprops1.mass_properties.local_com;
+                let local_com1 = &rb_mprops1.local_mprops.local_com;
                 let frozen1 = frozen.get(&b1);
                 let pos1 = frozen1
                     .map(|t| rb_vels1.integrate(*t, &rb_pos1.position, local_com1))
@@ -553,7 +582,7 @@ impl CCDSolver {
                     &RigidBodyMassProps,
                 ) = bodies.index_bundle(b2.0);
 
-                let local_com2 = &rb_mprops2.mass_properties.local_com;
+                let local_com2 = &rb_mprops2.local_mprops.local_com;
                 let frozen2 = frozen.get(&b2);
                 let pos2 = frozen2
                     .map(|t| rb_vels2.integrate(*t, &rb_pos2.position, local_com2))
@@ -575,7 +604,11 @@ impl CCDSolver {
                 .intersection_test(&next_coll_pos12, co_shape1.as_ref(), co_shape2.as_ref())
                 .unwrap_or(false);
 
-            if !intersect_before && !intersect_after {
+            if !intersect_before
+                && !intersect_after
+                && (co_flags1.active_events | co_flags2.active_events)
+                    .contains(ActiveEvents::INTERSECTION_EVENTS)
+            {
                 // Emit one intersection-started and one intersection-stopped event.
                 events.handle_intersection_event(IntersectionEvent::new(toi.c1, toi.c2, true));
                 events.handle_intersection_event(IntersectionEvent::new(toi.c1, toi.c2, false));
diff --git a/src/dynamics/ccd/toi_entry.rs b/src/dynamics/ccd/toi_entry.rs
index 4637940..f937979 100644
--- a/src/dynamics/ccd/toi_entry.rs
+++ b/src/dynamics/ccd/toi_entry.rs
@@ -2,7 +2,7 @@ use crate::dynamics::{
     RigidBodyCcd, RigidBodyHandle, RigidBodyMassProps, RigidBodyPosition, RigidBodyVelocity,
 };
 use crate::geometry::{
-    ColliderHandle, ColliderParent, ColliderPosition, ColliderShape, ColliderType,
+    ColliderFlags, ColliderHandle, ColliderParent, ColliderPosition, ColliderShape, ColliderType,
 };
 use crate::math::Real;
 use parry::query::{NonlinearRigidMotion, QueryDispatcher};
@@ -14,7 +14,9 @@ pub struct TOIEntry {
     pub b1: Option<RigidBodyHandle>,
     pub c2: ColliderHandle,
     pub b2: Option<RigidBodyHandle>,
-    pub is_intersection_test: bool,
+    // We call this "pseudo" intersection because this also
+    // includes colliders pairs with mismatching solver_groups.
+    pub is_pseudo_intersection_test: bool,
     pub timestamp: usize,
 }
 
@@ -25,7 +27,7 @@ impl TOIEntry {
         b1: Option<RigidBodyHandle>,
         c2: ColliderHandle,
         b2: Option<RigidBodyHandle>,
-        is_intersection_test: bool,
+        is_pseudo_intersection_test: bool,
         timestamp: usize,
     ) -> Self {
         Self {
@@ -34,7 +36,7 @@ impl TOIEntry {
             b1,
             c2,
             b2,
-            is_intersection_test,
+            is_pseudo_intersection_test,
             timestamp,
         }
     }
@@ -47,12 +49,14 @@ impl TOIEntry {
             &ColliderType,
             &ColliderShape,
             &ColliderPosition,
+            &ColliderFlags,
             Option<&ColliderParent>,
         ),
         c2: (
             &ColliderType,
             &ColliderShape,
             &ColliderPosition,
+            &ColliderFlags,
             Option<&ColliderParent>,
         ),
         b1: Option<(
@@ -78,8 +82,8 @@ impl TOIEntry {
             return None;
         }
 
-        let (co_type1, co_shape1, co_pos1, co_parent1) = c1;
-        let (co_type2, co_shape2, co_pos2, co_parent2) = c2;
+        let (co_type1, co_shape1, co_pos1, co_flags1, co_parent1) = c1;
+        let (co_type2, co_shape2, co_pos2, co_flags2, co_parent2) = c2;
 
         let linvel1 =
             frozen1.is_none() as u32 as Real * b1.map(|b| b.1.linvel).unwrap_or(na::zero());
@@ -104,7 +108,9 @@ impl TOIEntry {
         // keep it since more conservatism is good at this stage.
         let thickness = (co_shape1.0.ccd_thickness() + co_shape2.0.ccd_thickness())
             + smallest_contact_dist.max(0.0);
-        let is_intersection_test = co_type1.is_sensor() || co_type2.is_sensor();
+        let is_pseudo_intersection_test = co_type1.is_sensor()
+            || co_type2.is_sensor()
+            || !co_flags1.solver_groups.test(co_flags2.solver_groups);
 
         if (end_time - start_time) * vel12 < thickness {
             return None;
@@ -135,7 +141,7 @@ impl TOIEntry {
         // If the TOI search involves two non-sensor colliders then
         // we don't want to stop the TOI search at the first penetration
         // because the colliders may be in a separating trajectory.
-        let stop_at_penetration = is_intersection_test;
+        let stop_at_penetration = is_pseudo_intersection_test;
 
         let res_toi = query_dispatcher
             .nonlinear_time_of_impact(
@@ -157,7 +163,7 @@ impl TOIEntry {
             co_parent1.map(|p| p.handle),
             ch2,
             co_parent2.map(|p| p.handle),
-            is_intersection_test,
+            is_pseudo_intersection_test,
             0,
         ))
     }
@@ -173,7 +179,7 @@ impl TOIEntry {
         if ccd.ccd_active {
             NonlinearRigidMotion::new(
                 poss.position,
-                mprops.mass_properties.local_com,
+                mprops.local_mprops.local_com,
                 vels.linvel,
                 vels.angvel,
             )