diff options
| author | Crozet Sébastien <developer@crozet.re> | 2021-03-13 18:00:58 +0100 |
|---|---|---|
| committer | Crozet Sébastien <developer@crozet.re> | 2021-03-13 18:00:58 +0100 |
| commit | 3a1502be74901f3df96a05a7d479f15bd4f8b507 (patch) | |
| tree | bfa1ceb9664ddb853e94e9b1983388e4a2195faf /src/geometry/collider.rs | |
| parent | a967ace7d426eea11b4132328574cc3a48790ea5 (diff) | |
| download | rapier-3a1502be74901f3df96a05a7d479f15bd4f8b507.tar.gz rapier-3a1502be74901f3df96a05a7d479f15bd4f8b507.tar.bz2 rapier-3a1502be74901f3df96a05a7d479f15bd4f8b507.zip | |
First complete implementation of the hierarchical SAP.
Diffstat (limited to 'src/geometry/collider.rs')
| -rw-r--r-- | src/geometry/collider.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/geometry/collider.rs b/src/geometry/collider.rs index 593c53c..236fd5a 100644 --- a/src/geometry/collider.rs +++ b/src/geometry/collider.rs @@ -1,5 +1,5 @@ use crate::dynamics::{CoefficientCombineRule, MassProperties, RigidBodyHandle}; -use crate::geometry::{InteractionGroups, SharedShape, SolverFlags}; +use crate::geometry::{InteractionGroups, SAPProxyIndex, SharedShape, SolverFlags}; use crate::math::{AngVector, Isometry, Point, Real, Rotation, Vector, DIM}; use crate::parry::transformation::vhacd::VHACDParameters; use parry::bounding_volume::AABB; @@ -69,7 +69,7 @@ pub struct Collider { pub restitution: Real, pub(crate) collision_groups: InteractionGroups, pub(crate) solver_groups: InteractionGroups, - pub(crate) proxy_index: usize, + pub(crate) proxy_index: SAPProxyIndex, /// User-defined data associated to this rigid-body. pub user_data: u128, } @@ -77,7 +77,7 @@ pub struct Collider { impl Collider { pub(crate) fn reset_internal_references(&mut self) { self.parent = RigidBodyHandle::invalid(); - self.proxy_index = crate::INVALID_USIZE; + self.proxy_index = crate::INVALID_U32; } /// The rigid body this collider is attached to. @@ -597,7 +597,7 @@ impl ColliderBuilder { parent: RigidBodyHandle::invalid(), position: Isometry::identity(), predicted_position: Isometry::identity(), - proxy_index: crate::INVALID_USIZE, + proxy_index: crate::INVALID_U32, collision_groups: self.collision_groups, solver_groups: self.solver_groups, user_data: self.user_data, |
