Merge pull request #118 from EmbarkStudios/collider-handles-in-filter

Add ColliderHandle:s to PairFilterContext

src/geometry/narrow_phase.rs

@@ -424,6 +424,8 @@ impl NarrowPhase {
                 let context = PairFilterContext {
                     rigid_body1: rb1,
                     rigid_body2: rb2,
+                    collider_handle1: handle1,
+                    collider_handle2: handle2,
                     collider1: co1,
                     collider2: co2,
                 };
@@ -492,6 +494,8 @@ impl NarrowPhase {
                 let context = PairFilterContext {
                     rigid_body1: rb1,
                     rigid_body2: rb2,
+                    collider_handle1: pair.pair.collider1,
+                    collider_handle2: pair.pair.collider2,
                     collider1: co1,
                     collider2: co2,
                 };

src/geometry/pair_filter.rs

@@ -1,5 +1,5 @@
 use crate::dynamics::RigidBody;
-use crate::geometry::{Collider, SolverFlags};
+use crate::geometry::{Collider, ColliderHandle, SolverFlags};
 
 /// Context given to custom collision filters to filter-out collisions.
 pub struct PairFilterContext<'a> {
@@ -8,6 +8,10 @@ pub struct PairFilterContext<'a> {
     /// The first collider involved in the potential collision.
     pub rigid_body2: &'a RigidBody,
     /// The first collider involved in the potential collision.
+    pub collider_handle1: ColliderHandle,
+    /// The first collider involved in the potential collision.
+    pub collider_handle2: ColliderHandle,
+    /// The first collider involved in the potential collision.
     pub collider1: &'a Collider,
     /// The first collider involved in the potential collision.
     pub collider2: &'a Collider,