From 063c638ec5906747e3ca85ee0c5f112c7775f797 Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sat, 19 Mar 2022 17:52:56 +0100 Subject: Combine contact events and intersection events into a single event type and flags --- src/dynamics/ccd/ccd_solver.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/dynamics') diff --git a/src/dynamics/ccd/ccd_solver.rs b/src/dynamics/ccd/ccd_solver.rs index d15b28c..a4b1419 100644 --- a/src/dynamics/ccd/ccd_solver.rs +++ b/src/dynamics/ccd/ccd_solver.rs @@ -5,7 +5,7 @@ use crate::dynamics::{ RigidBodyCcd, RigidBodyHandle, RigidBodyMassProps, RigidBodyPosition, RigidBodyVelocity, }; use crate::geometry::{ - ColliderParent, ColliderPosition, ColliderShape, ColliderType, IntersectionEvent, NarrowPhase, + ColliderParent, ColliderPosition, ColliderShape, ColliderType, CollisionEvent, NarrowPhase, }; use crate::math::Real; use crate::parry::utils::SortedPair; @@ -613,11 +613,11 @@ impl CCDSolver { if !intersect_before && !intersect_after && (co_flags1.active_events | co_flags2.active_events) - .contains(ActiveEvents::INTERSECTION_EVENTS) + .contains(ActiveEvents::COLLISION_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)); + events.handle_intersection_event(CollisionEvent::Started(toi.c1, toi.c2)); + events.handle_intersection_event(CollisionEvent::Stopped(toi.c1, toi.c2)); } } -- cgit