diff options
| author | Sébastien Crozet <developer@crozet.re> | 2022-07-02 13:26:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-02 13:26:49 +0200 |
| commit | cd0be8c076c69b88bb1848de72228225eeccb52d (patch) | |
| tree | 9a95aa611454c170c7f711db87f33fcd68f8bc2b /src/pipeline/event_handler.rs | |
| parent | 1ba37b8f635bd79db2e48b07c038723f9e8c172f (diff) | |
| parent | 32e2ff6c96a77c0be549ed809dcd62aeab58340d (diff) | |
| download | rapier-cd0be8c076c69b88bb1848de72228225eeccb52d.tar.gz rapier-cd0be8c076c69b88bb1848de72228225eeccb52d.tar.bz2 rapier-cd0be8c076c69b88bb1848de72228225eeccb52d.zip | |
Merge pull request #354 from dimforge/force-event-typo
Name the contact force events ContactForceEvent instead of CollisionForceEvent
Diffstat (limited to 'src/pipeline/event_handler.rs')
| -rw-r--r-- | src/pipeline/event_handler.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pipeline/event_handler.rs b/src/pipeline/event_handler.rs index 55ede93..e491fdf 100644 --- a/src/pipeline/event_handler.rs +++ b/src/pipeline/event_handler.rs @@ -1,5 +1,5 @@ use crate::dynamics::RigidBodySet; -use crate::geometry::{ColliderSet, CollisionEvent, CollisionForceEvent, ContactPair}; +use crate::geometry::{ColliderSet, CollisionEvent, ContactForceEvent, ContactPair}; use crate::math::Real; use crossbeam::channel::Sender; @@ -89,14 +89,14 @@ impl EventHandler for () { /// A collision event handler that collects events into a crossbeam channel. pub struct ChannelEventCollector { collision_event_sender: Sender<CollisionEvent>, - contact_force_event_sender: Sender<CollisionForceEvent>, + contact_force_event_sender: Sender<ContactForceEvent>, } impl ChannelEventCollector { /// Initialize a new collision event handler from crossbeam channel senders. pub fn new( collision_event_sender: Sender<CollisionEvent>, - contact_force_event_sender: Sender<CollisionForceEvent>, + contact_force_event_sender: Sender<ContactForceEvent>, ) -> Self { Self { collision_event_sender, @@ -124,11 +124,11 @@ impl EventHandler for ChannelEventCollector { contact_pair: &ContactPair, total_force_magnitude: Real, ) { - let mut result = CollisionForceEvent { + let mut result = ContactForceEvent { collider1: contact_pair.collider1, collider2: contact_pair.collider2, total_force_magnitude, - ..CollisionForceEvent::default() + ..ContactForceEvent::default() }; for m in &contact_pair.manifolds { |
