diff options
| -rw-r--r-- | src/geometry/mod.rs | 2 | ||||
| -rw-r--r-- | src/pipeline/event_handler.rs | 10 | ||||
| -rw-r--r-- | src_testbed/physics/mod.rs | 4 |
3 files changed, 8 insertions, 8 deletions
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 { diff --git a/src_testbed/physics/mod.rs b/src_testbed/physics/mod.rs index ebcc326..60214da 100644 --- a/src_testbed/physics/mod.rs +++ b/src_testbed/physics/mod.rs @@ -3,7 +3,7 @@ use rapier::dynamics::{ CCDSolver, ImpulseJointSet, IntegrationParameters, IslandManager, MultibodyJointSet, RigidBodySet, }; -use rapier::geometry::{BroadPhase, ColliderSet, CollisionEvent, CollisionForceEvent, NarrowPhase}; +use rapier::geometry::{BroadPhase, ColliderSet, CollisionEvent, ContactForceEvent, NarrowPhase}; use rapier::math::{Real, Vector}; use rapier::pipeline::{PhysicsHooks, PhysicsPipeline, QueryPipeline}; @@ -108,7 +108,7 @@ impl PhysicsState { pub struct PhysicsEvents { pub collision_events: Receiver<CollisionEvent>, - pub contact_force_events: Receiver<CollisionForceEvent>, + pub contact_force_events: Receiver<ContactForceEvent>, } impl PhysicsEvents { |