diff options
| author | Crozet Sébastien <developer@crozet.re> | 2020-10-06 15:23:48 +0200 |
|---|---|---|
| committer | Crozet Sébastien <developer@crozet.re> | 2020-10-06 15:23:48 +0200 |
| commit | 682ff61f94931ef205a9f81e7d00417ac88537c1 (patch) | |
| tree | 405e0f7df3858de7387467f963088fce3244ba32 /src/geometry/narrow_phase.rs | |
| parent | 7c92848383b9f76bde010f00683a44453b2b456a (diff) | |
| download | rapier-682ff61f94931ef205a9f81e7d00417ac88537c1.tar.gz rapier-682ff61f94931ef205a9f81e7d00417ac88537c1.tar.bz2 rapier-682ff61f94931ef205a9f81e7d00417ac88537c1.zip | |
Don't let the PubSub internal offsets overflow + fix some warnings.
Diffstat (limited to 'src/geometry/narrow_phase.rs')
| -rw-r--r-- | src/geometry/narrow_phase.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/geometry/narrow_phase.rs b/src/geometry/narrow_phase.rs index 60c5e1a..ebe0a79 100644 --- a/src/geometry/narrow_phase.rs +++ b/src/geometry/narrow_phase.rs @@ -14,13 +14,13 @@ use crate::geometry::proximity_detector::{ // proximity_detector::ProximityDetectionContextSimd, WBall, //}; use crate::geometry::{ - BroadPhasePairEvent, Collider, ColliderGraphIndex, ColliderHandle, ContactEvent, - ProximityEvent, ProximityPair, RemovedCollider, + BroadPhasePairEvent, ColliderGraphIndex, ColliderHandle, ContactEvent, ProximityEvent, + ProximityPair, RemovedCollider, }; use crate::geometry::{ColliderSet, ContactManifold, ContactPair, InteractionGraph}; //#[cfg(feature = "simd-is-enabled")] //use crate::math::{SimdFloat, SIMD_WIDTH}; -use crate::data::pubsub::PubSubCursor; +use crate::data::pubsub::Subscription; use crate::ncollide::query::Proximity; use crate::pipeline::EventHandler; use std::collections::HashMap; @@ -31,7 +31,7 @@ use std::collections::HashMap; pub struct NarrowPhase { contact_graph: InteractionGraph<ContactPair>, proximity_graph: InteractionGraph<ProximityPair>, - removed_colliders: Option<PubSubCursor<RemovedCollider>>, + removed_colliders: Option<Subscription<RemovedCollider>>, // ball_ball: Vec<usize>, // Workspace: Vec<*mut ContactPair>, // shape_shape: Vec<usize>, // Workspace: Vec<*mut ContactPair>, // ball_ball_prox: Vec<usize>, // Workspace: Vec<*mut ProximityPair>, |