From 32e2ff6c96a77c0be549ed809dcd62aeab58340d Mon Sep 17 00:00:00 2001
From: Sébastien Crozet <developer@crozet.re>
Date: Fri, 1 Jul 2022 17:45:11 +0200
Subject: Name the contact force events ContactForceEvent instead of
 CollisionForceEvent

---
 src/geometry/mod.rs           |  2 +-
 src/pipeline/event_handler.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/geometry/mod.rs b/src/geometry/mod.rs
index 48d71f8..df9a785 100644
--- a/src/geometry/mod.rs
+++ b/src/geometry/mod.rs
@@ -121,7 +121,7 @@ impl CollisionEvent {
 #[derive(Copy, Clone, PartialEq, Debug, Default)]
 /// Event occurring when the sum of the magnitudes of the contact forces
 /// between two colliders exceed a threshold.
-pub struct CollisionForceEvent {
+pub struct ContactForceEvent {
     /// The first collider involved in the contact.
     pub collider1: ColliderHandle,
     /// The second collider involved in the contact.
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 {
-- 
cgit