From e231bacec608fa5efd24f7a876572927dbd6c9c4 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Thu, 17 Dec 2020 10:24:36 +0100 Subject: Move all the contact manifold computations out of Rapier. --- Cargo.toml | 4 +- build/rapier2d/Cargo.toml | 6 +- build/rapier3d/Cargo.toml | 11 +- build/rapier_testbed2d/Cargo.toml | 2 +- build/rapier_testbed3d/Cargo.toml | 2 +- src/data/arena.rs | 2 +- src/data/hashmap.rs | 137 --------- src/data/maybe_serializable_data.rs | 17 -- src/data/mod.rs | 4 +- src/dynamics/mod.rs | 2 +- .../fixed_velocity_constraint_wide.rs | 2 +- .../prismatic_velocity_constraint.rs | 2 +- .../prismatic_velocity_constraint_wide.rs | 2 +- src/geometry/broad_phase_multi_sap.rs | 8 +- src/geometry/collider.rs | 8 +- src/geometry/contact.rs | 308 --------------------- .../ball_ball_contact_generator.rs | 103 ------- .../ball_convex_contact_generator.rs | 70 ----- .../ball_polygon_contact_generator.rs | 1 - .../capsule_capsule_contact_generator.rs | 202 -------------- .../contact_generator/contact_dispatcher.rs | 141 ---------- .../contact_generator/contact_generator.rs | 228 --------------- .../contact_generator_workspace.rs | 104 ------- .../cuboid_capsule_contact_generator.rs | 190 ------------- .../cuboid_cuboid_contact_generator.rs | 156 ----------- .../cuboid_polygon_contact_generator.rs | 1 - .../cuboid_triangle_contact_generator.rs | 171 ------------ .../heightfield_shape_contact_generator.rs | 190 ------------- src/geometry/contact_generator/mod.rs | 51 ---- .../contact_generator/pfm_pfm_contact_generator.rs | 146 ---------- .../polygon_polygon_contact_generator.rs | 156 ----------- .../serializable_workspace_tag.rs | 9 - .../trimesh_shape_contact_generator.rs | 221 --------------- .../voxels_shape_contact_generator.rs | 0 src/geometry/contact_pair.rs | 292 +++++++++++++++++++ src/geometry/mod.rs | 53 ++-- src/geometry/narrow_phase.rs | 58 ++-- src/geometry/polygon.rs | 2 +- src/geometry/proximity.rs | 43 --- .../ball_convex_proximity_detector.rs | 2 +- .../cuboid_cuboid_proximity_detector.rs | 4 +- .../cuboid_triangle_proximity_detector.rs | 2 +- .../trimesh_shape_proximity_detector.rs | 4 +- src/geometry/proximity_pair.rs | 43 +++ src/geometry/triangle.rs | 7 - src/geometry/z_order.rs | 70 ----- src/lib.rs | 8 +- src/utils.rs | 15 +- src_testbed/lib.rs | 4 +- src_testbed/objects/heightfield.rs | 2 +- src_testbed/objects/polyline.rs | 2 +- 51 files changed, 430 insertions(+), 2838 deletions(-) delete mode 100644 src/data/hashmap.rs delete mode 100644 src/data/maybe_serializable_data.rs delete mode 100644 src/geometry/contact.rs delete mode 100644 src/geometry/contact_generator/ball_ball_contact_generator.rs delete mode 100644 src/geometry/contact_generator/ball_convex_contact_generator.rs delete mode 100644 src/geometry/contact_generator/ball_polygon_contact_generator.rs delete mode 100644 src/geometry/contact_generator/capsule_capsule_contact_generator.rs delete mode 100644 src/geometry/contact_generator/contact_dispatcher.rs delete mode 100644 src/geometry/contact_generator/contact_generator.rs delete mode 100644 src/geometry/contact_generator/contact_generator_workspace.rs delete mode 100644 src/geometry/contact_generator/cuboid_capsule_contact_generator.rs delete mode 100644 src/geometry/contact_generator/cuboid_cuboid_contact_generator.rs delete mode 100644 src/geometry/contact_generator/cuboid_polygon_contact_generator.rs delete mode 100644 src/geometry/contact_generator/cuboid_triangle_contact_generator.rs delete mode 100644 src/geometry/contact_generator/heightfield_shape_contact_generator.rs delete mode 100644 src/geometry/contact_generator/mod.rs delete mode 100644 src/geometry/contact_generator/pfm_pfm_contact_generator.rs delete mode 100644 src/geometry/contact_generator/polygon_polygon_contact_generator.rs delete mode 100644 src/geometry/contact_generator/serializable_workspace_tag.rs delete mode 100644 src/geometry/contact_generator/trimesh_shape_contact_generator.rs delete mode 100644 src/geometry/contact_generator/voxels_shape_contact_generator.rs create mode 100644 src/geometry/contact_pair.rs delete mode 100644 src/geometry/proximity.rs create mode 100644 src/geometry/proximity_pair.rs delete mode 100644 src/geometry/triangle.rs delete mode 100644 src/geometry/z_order.rs diff --git a/Cargo.toml b/Cargo.toml index 55e9b43..eaafe91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,8 @@ members = [ "build/rapier2d", "build/rapier_testbed2d", "examples2d", "benchmark #nphysics2d = { path = "../nphysics/build/nphysics2d" } #nphysics3d = { path = "../nphysics/build/nphysics3d" } #kiss3d = { path = "../kiss3d" } -buckler2d = { path = "../buckler/build/buckler2d" } -buckler3d = { path = "../buckler/build/buckler3d" } +eagl2d = { path = "../eagl/build/eagl2d" } +eagl3d = { path = "../eagl/build/eagl3d" } [profile.release] #debug = true diff --git a/build/rapier2d/Cargo.toml b/build/rapier2d/Cargo.toml index 987fa2f..c20833c 100644 --- a/build/rapier2d/Cargo.toml +++ b/build/rapier2d/Cargo.toml @@ -21,8 +21,8 @@ simd-nightly = [ "simba/packed_simd", "simd-is-enabled" ] # enabled with the "simd-stable" or "simd-nightly" feature. simd-is-enabled = [ ] wasm-bindgen = [ "instant/wasm-bindgen" ] -serde-serialize = [ "erased-serde", "nalgebra/serde-serialize", "buckler2d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde", "arrayvec/serde" ] -enhanced-determinism = [ "simba/libm_force", "indexmap" ] +serde-serialize = [ "erased-serde", "nalgebra/serde-serialize", "eagl2d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde", "arrayvec/serde" ] +enhanced-determinism = [ "simba/libm_force", "eagl2d/enhanced-determinism", "indexmap" ] [lib] name = "rapier2d" @@ -35,7 +35,7 @@ vec_map = "0.8" instant = { version = "0.1", features = [ "now" ]} num-traits = "0.2" nalgebra = "0.23" -buckler2d = "0.1" +eagl2d = "0.1" simba = "0.3" approx = "0.4" rayon = { version = "1", optional = true } diff --git a/build/rapier3d/Cargo.toml b/build/rapier3d/Cargo.toml index 7d5673b..a9abef8 100644 --- a/build/rapier3d/Cargo.toml +++ b/build/rapier3d/Cargo.toml @@ -15,14 +15,14 @@ edition = "2018" default = [ "dim3" ] dim3 = [ ] parallel = [ "rayon" ] -simd-stable = [ "buckler3d/simd-stable", "simba/wide", "simd-is-enabled" ] -simd-nightly = [ "buckler3d/simd-nightly", "simba/packed_simd", "simd-is-enabled" ] +simd-stable = [ "eagl3d/simd-stable", "simba/wide", "simd-is-enabled" ] +simd-nightly = [ "eagl3d/simd-nightly", "simba/packed_simd", "simd-is-enabled" ] # Do not enable this feature directly. It is automatically # enabled with the "simd-stable" or "simd-nightly" feature. simd-is-enabled = [ ] wasm-bindgen = [ "instant/wasm-bindgen" ] -serde-serialize = [ "erased-serde", "nalgebra/serde-serialize", "buckler3d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde" ] -enhanced-determinism = [ "simba/libm_force", "indexmap" ] +serde-serialize = [ "erased-serde", "nalgebra/serde-serialize", "eagl3d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde" ] +enhanced-determinism = [ "simba/libm_force", "eagl3d/enhanced-determinism" ] [lib] name = "rapier3d" @@ -35,7 +35,7 @@ vec_map = "0.8" instant = { version = "0.1", features = [ "now" ]} num-traits = "0.2" nalgebra = "0.23" -buckler3d = "0.1" +eagl3d = "0.1" simba = "0.3" approx = "0.4" rayon = { version = "1", optional = true } @@ -46,7 +46,6 @@ bit-vec = "0.6" rustc-hash = "1" serde = { version = "1", features = [ "derive" ], optional = true } erased-serde = { version = "0.3", optional = true } -indexmap = { version = "1", features = [ "serde-1" ], optional = true } downcast-rs = "1.2" num-derive = "0.3" bitflags = "1" diff --git a/build/rapier_testbed2d/Cargo.toml b/build/rapier_testbed2d/Cargo.toml index 72ead41..23be92e 100644 --- a/build/rapier_testbed2d/Cargo.toml +++ b/build/rapier_testbed2d/Cargo.toml @@ -31,7 +31,7 @@ instant = { version = "0.1", features = [ "web-sys", "now" ]} bitflags = "1" num_cpus = { version = "1", optional = true } wrapped2d = { version = "0.4", optional = true } -buckler2d = "0.1" +eagl2d = "0.1" ncollide2d = "0.26" nphysics2d = { version = "0.18", optional = true } crossbeam = "0.8" diff --git a/build/rapier_testbed3d/Cargo.toml b/build/rapier_testbed3d/Cargo.toml index d4ad764..2820a7c 100644 --- a/build/rapier_testbed3d/Cargo.toml +++ b/build/rapier_testbed3d/Cargo.toml @@ -30,7 +30,7 @@ instant = { version = "0.1", features = [ "web-sys", "now" ]} bitflags = "1" glam = { version = "0.10", optional = true } num_cpus = { version = "1", optional = true } -buckler3d = "0.1" +eagl3d = "0.1" ncollide3d = "0.26" nphysics3d = { version = "0.18", optional = true } physx = { version = "0.8", optional = true } diff --git a/src/data/arena.rs b/src/data/arena.rs index a3af45c..3a24cd1 100644 --- a/src/data/arena.rs +++ b/src/data/arena.rs @@ -3,7 +3,7 @@ //! See https://github.com/fitzgen/generational-arena/blob/master/src/lib.rs. //! This has been modified to have a fully deterministic deserialization (including for the order of //! Index attribution after a deserialization of the arena. -use buckler::partitioning::IndexedData; +use eagl::partitioning::IndexedData; use std::cmp; use std::iter::{self, Extend, FromIterator, FusedIterator}; use std::mem; diff --git a/src/data/hashmap.rs b/src/data/hashmap.rs deleted file mode 100644 index d2ea980..0000000 --- a/src/data/hashmap.rs +++ /dev/null @@ -1,137 +0,0 @@ -//! A hash-map that behaves deterministically when the -//! `enhanced-determinism` feature is enabled. - -#[cfg(all(feature = "enhanced-determinism", feature = "serde-serialize"))] -use indexmap::IndexMap as StdHashMap; -#[cfg(all(not(feature = "enhanced-determinism"), feature = "serde-serialize"))] -use std::collections::HashMap as StdHashMap; - -/// Serializes only the capacity of a hash-map instead of its actual content. -#[cfg(feature = "serde-serialize")] -pub fn serialize_hashmap_capacity( - map: &StdHashMap, - s: S, -) -> Result { - s.serialize_u64(map.capacity() as u64) -} - -/// Creates a new hash-map with its capacity deserialized from `d`. -#[cfg(feature = "serde-serialize")] -pub fn deserialize_hashmap_capacity< - 'de, - D: serde::Deserializer<'de>, - K, - V, - H: std::hash::BuildHasher + Default, ->( - d: D, -) -> Result, D::Error> { - struct CapacityVisitor; - impl<'de> serde::de::Visitor<'de> for CapacityVisitor { - type Value = u64; - - fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(formatter, "an integer between 0 and 2^64") - } - - fn visit_u64(self, val: u64) -> Result { - Ok(val) - } - } - - let capacity = d.deserialize_u64(CapacityVisitor)? as usize; - Ok(StdHashMap::with_capacity_and_hasher( - capacity, - Default::default(), - )) -} - -/* - * FxHasher taken from rustc_hash, except that it does not depend on the pointer size. - */ -#[cfg(feature = "enhanced-determinism")] -pub type FxHashMap32 = indexmap::IndexMap>; -#[cfg(feature = "enhanced-determinism")] -pub use {self::FxHashMap32 as HashMap, indexmap::map::Entry}; -#[cfg(not(feature = "enhanced-determinism"))] -pub use {rustc_hash::FxHashMap as HashMap, std::collections::hash_map::Entry}; - -const K: u32 = 0x9e3779b9; - -// Same as FxHasher, but with the guarantee that the internal hash is -// an u32 instead of something that depends on the platform. -pub struct FxHasher32 { - hash: u32, -} - -impl Default for FxHasher32 { - #[inline] - fn default() -> FxHasher32 { - FxHasher32 { hash: 0 } - } -} - -impl FxHasher32 { - #[inline] - fn add_to_hash(&mut self, i: u32) { - use std::ops::BitXor; - self.hash = self.hash.rotate_left(5).bitxor(i).wrapping_mul(K); - } -} - -impl std::hash::Hasher for FxHasher32 { - #[inline] - fn write(&mut self, mut bytes: &[u8]) { - use std::convert::TryInto; - let read_u32 = |bytes: &[u8]| u32::from_ne_bytes(bytes[..4].try_into().unwrap()); - let mut hash = FxHasher32 { hash: self.hash }; - assert!(std::mem::size_of::() <= 8); - while bytes.len() >= std::mem::size_of::() { - hash.add_to_hash(read_u32(bytes) as u32); - bytes = &bytes[std::mem::size_of::()..]; - } - if (std::mem::size_of::() > 4) && (bytes.len() >= 4) { - hash.add_to_hash(u32::from_ne_bytes(bytes[..4].try_into().unwrap()) as u32); - bytes = &bytes[4..]; - } - if (std::mem::size_of::() > 2) && bytes.len() >= 2 { - hash.add_to_hash(u16::from_ne_bytes(bytes[..2].try_into().unwrap()) as u32); - bytes = &bytes[2..]; - } - if (std::mem::size_of::() > 1) && bytes.len() >= 1 { - hash.add_to_hash(bytes[0] as u32); - } - self.hash = hash.hash; - } - - #[inline] - fn write_u8(&mut self, i: u8) { - self.add_to_hash(i as u32); - } - - #[inline] - fn write_u16(&mut self, i: u16) { - self.add_to_hash(i as u32); - } - - #[inline] - fn write_u32(&mut self, i: u32) { - self.add_to_hash(i as u32); - } - - #[inline] - fn write_u64(&mut self, i: u64) { - self.add_to_hash(i as u32); - self.add_to_hash((i >> 32) as u32); - } - - #[inline] - fn write_usize(&mut self, i: usize) { - self.add_to_hash(i as u32); - } - - #[inline] - fn finish(&self) -> u64 { - self.hash as u64 - } -} diff --git a/src/data/maybe_serializable_data.rs b/src/data/maybe_serializable_data.rs deleted file mode 100644 index 8b14e1a..0000000 --- a/src/data/maybe_serializable_data.rs +++ /dev/null @@ -1,17 +0,0 @@ -use downcast_rs::{impl_downcast, DowncastSync}; -#[cfg(feature = "serde-serialize")] -use erased_serde::Serialize; - -/// Piece of data that may be serializable. -pub trait MaybeSerializableData: DowncastSync { - /// Convert this shape as a serializable entity. - #[cfg(feature = "serde-serialize")] - fn as_serialize(&self) -> Option<(u32, &dyn Serialize)> { - None - } - - /// Clones `self`. - fn clone_dyn(&self) -> Box; -} - -impl_downcast!(sync MaybeSerializableData); diff --git a/src/data/mod.rs b/src/data/mod.rs index 672bf94..eb0a229 100644 --- a/src/data/mod.rs +++ b/src/data/mod.rs @@ -1,11 +1,9 @@ //! Data structures modified with guaranteed deterministic behavior after deserialization. pub use self::coarena::Coarena; -pub use self::maybe_serializable_data::MaybeSerializableData; +pub use eagl::utils::MaybeSerializableData; pub mod arena; mod coarena; pub(crate) mod graph; -pub(crate) mod hashmap; -mod maybe_serializable_data; pub mod pubsub; diff --git a/src/dynamics/mod.rs b/src/dynamics/mod.rs index 28f149a..76e9de2 100644 --- a/src/dynamics/mod.rs +++ b/src/dynamics/mod.rs @@ -9,7 +9,7 @@ pub use self::joint::{ }; pub use self::rigid_body::{ActivationStatus, BodyStatus, RigidBody, RigidBodyBuilder}; pub use self::rigid_body_set::{BodyPair, RigidBodyHandle, RigidBodySet}; -pub use buckler::shape::MassProperties; +pub use eagl::shape::MassProperties; // #[cfg(not(feature = "parallel"))] pub(crate) use self::joint::JointGraphEdge; pub(crate) use self::rigid_body::RigidBodyChanges; diff --git a/src/dynamics/solver/joint_constraint/fixed_velocity_constraint_wide.rs b/src/dynamics/solver/joint_constraint/fixed_velocity_constraint_wide.rs index 79c69c6..ce42da8 100644 --- a/src/dynamics/solver/joint_constraint/fixed_velocity_constraint_wide.rs +++ b/src/dynamics/solver/joint_constraint/fixed_velocity_constraint_wide.rs @@ -13,7 +13,7 @@ use crate::utils::{WAngularInertia, WCross, WCrossMatrix}; use na::{Cholesky, Matrix6, Vector6, U3}; #[cfg(feature = "dim2")] use { - crate::utils::SdpMatrix3, + eagl::utils::SdpMatrix3, na::{Matrix3, Vector3}, }; diff --git a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs index 49cfc7a..a2c7c2c 100644 --- a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs +++ b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs @@ -8,7 +8,7 @@ use crate::utils::{WAngularInertia, WCross, WCrossMatrix}; use na::{Cholesky, Matrix3x2, Matrix5, Vector5, U2, U3}; #[cfg(feature = "dim2")] use { - crate::utils::SdpMatrix2, + eagl::utils::SdpMatrix2, na::{Matrix2, Vector2}, }; diff --git a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs index c05c08e..86e0c78 100644 --- a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs +++ b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs @@ -12,7 +12,7 @@ use crate::utils::{WAngularInertia, WCross, WCrossMatrix}; use na::{Cholesky, Matrix3x2, Matrix5, Vector5, U2, U3}; #[cfg(feature = "dim2")] use { - crate::utils::SdpMatrix2, + eagl::utils::SdpMatrix2, na::{Matrix2, Vector2}, }; diff --git a/src/geometry/broad_phase_multi_sap.rs b/src/geometry/broad_phase_multi_sap.rs index 56c05df..4242d77 100644 --- a/src/geometry/broad_phase_multi_sap.rs +++ b/src/geometry/broad_phase_multi_sap.rs @@ -1,10 +1,10 @@ -use crate::data::hashmap::HashMap; use crate::data::pubsub::Subscription; use crate::dynamics::RigidBodySet; use crate::geometry::{ColliderHandle, ColliderSet, RemovedCollider}; use crate::math::{Point, Vector, DIM}; use bit_vec::BitVec; -use buckler::bounding_volume::{BoundingVolume, AABB}; +use eagl::bounding_volume::{BoundingVolume, AABB}; +use eagl::utils::hashmap::HashMap; use std::cmp::Ordering; use std::ops::{Index, IndexMut}; @@ -477,8 +477,8 @@ pub struct BroadPhase { #[cfg_attr( feature = "serde-serialize", serde( - serialize_with = "crate::data::hashmap::serialize_hashmap_capacity", - deserialize_with = "crate::data::hashmap::deserialize_hashmap_capacity" + serialize_with = "eagl::utils::hashmap::serialize_hashmap_capacity", + deserialize_with = "eagl::utils::hashmap::deserialize_hashmap_capacity" ) )] reporting: HashMap<(u32, u32), bool>, // Workspace diff --git a/src/geometry/collider.rs b/src/geometry/collider.rs index 1275358..db418a3 100644 --- a/src/geometry/collider.rs +++ b/src/geometry/collider.rs @@ -1,13 +1,13 @@ -use crate::buckler::shape::HalfSpace; use crate::dynamics::{MassProperties, RigidBodyHandle, RigidBodySet}; +use crate::eagl::shape::HalfSpace; use crate::geometry::InteractionGroups; use crate::math::{AngVector, Isometry, Point, Rotation, Vector}; -use buckler::bounding_volume::AABB; -use buckler::shape::{ +use eagl::bounding_volume::AABB; +use eagl::shape::{ Ball, Capsule, Cuboid, HeightField, Segment, Shape, ShapeType, TriMesh, Triangle, }; #[cfg(feature = "dim3")] -use buckler::shape::{Cone, Cylinder, RoundCylinder}; +use eagl::shape::{Cone, Cylinder, RoundCylinder}; use na::Point3; use std::ops::Deref; use std::sync::Arc; diff --git a/src/geometry/contact.rs b/src/geometry/contact.rs deleted file mode 100644 index 14646d9..0000000 --- a/src/geometry/contact.rs +++ /dev/null @@ -1,308 +0,0 @@ -use crate::buckler::query::TrackedData; -use crate::data::MaybeSerializableData; -use crate::dynamics::{BodyPair, RigidBodyHandle, RigidBodySet}; -use crate::geometry::contact_generator::{ContactGeneratorWorkspace, ContactPhase}; -use crate::geometry::{Collider, ColliderPair, ColliderSet, Contact, ContactManifold}; -use crate::math::{Isometry, Point, Vector}; -#[cfg(feature = "simd-is-enabled")] -use { - crate::math::{SimdReal, SIMD_WIDTH}, - simba::simd::SimdValue, -}; - -bitflags::bitflags! { - #[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] - /// Flags affecting the behavior of the constraints solver for a given contact manifold. - pub struct SolverFlags: u32 { - /// The constraint solver will take this contact manifold into - /// account for force computation. - const COMPUTE_IMPULSES = 0b01; - } -} - -#[cfg(feature = "simd-is-enabled")] -pub(crate) struct WContact { - pub local_p1: Point, - pub local_p2: Point, - pub local_n1: Vector, - pub local_n2: Vector, - pub dist: SimdReal, - pub fid1: [u8; SIMD_WIDTH], - pub fid2: [u8; SIMD_WIDTH], -} - -#[cfg(feature = "simd-is-enabled")] -impl WContact { - pub fn extract(&self, i: usize) -> (Contact, Vector, Vector) { - let c = Contact { - local_p1: self.local_p1.extract(i), - local_p2: self.local_p2.extract(i), - dist: self.dist.extract(i), - fid1: self.fid1[i], - fid2: self.fid2[i], - data: ContactData::default(), - }; - - (c, self.local_n1.extract(i), self.local_n2.extract(i)) - } -} - -#[derive(Copy, Clone, Debug)] -#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] -/// A single contact between two collider. -pub struct ContactData { - /// The impulse, along the contact normal, applied by this contact to the first collider's rigid-body. - /// - /// The impulse applied to the second collider's rigid-body is given by `-impulse`. - pub impulse: f32, - /// The friction impulse along the vector orthonormal to the contact normal, applied to the first - /// collider's rigid-body. - #[cfg(feature = "dim2")] - pub tangent_impulse: f32, - /// The friction impulses along the basis orthonormal to the contact normal, applied to the first - /// collider's rigid-body. - #[cfg(feature = "dim3")] - pub tangent_impulse: [f32; 2], -} - -impl ContactData { - #[cfg(feature = "dim2")] - pub(crate) fn zero_tangent_impulse() -> f32 { - 0.0 - } - - #[cfg(feature = "dim3")] - pub(crate) fn zero_tangent_impulse() -> [f32; 2] { - [0.0, 0.0] - } -} - -impl Default for ContactData { - fn default() -> Self { - Self { - impulse: 0.0, - tangent_impulse: Self::zero_tangent_impulse(), - } - } -} - -#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] -#[derive(Clone)] -/// The description of all the contacts between a pair of colliders. -pub struct ContactPair { - /// The pair of colliders involved. - pub pair: ColliderPair, - /// The set of contact manifolds between the two colliders. - /// - /// All contact manifold contain themselves contact points between the colliders. - pub manifolds: Vec, - #[cfg_attr(feature = "serde-serialize", serde(skip))] - pub(crate) generator: Option, - pub(crate) generator_workspace: Option, -} - -impl ContactPair { - pub(crate) fn new( - pair: ColliderPair, - generator: ContactPhase, - generator_workspace: Option, - ) -> Self { - Self { - pair, - manifolds: Vec::new(), - generator: Some(generator), - generator_workspace, - } - } - - /// Does this contact pair have any active contact? - /// - /// An active contact is a contact that may result in a non-zero contact force. - pub fn has_any_active_contact(&self) -> bool { - for manifold in &self.manifolds { - if manifold.num_active_contacts != 0 { - return true; - } - } - - false - } - - pub(crate) fn single_manifold<'a, 'b>( - &'a mut self, - colliders: &'b ColliderSet, - flags: SolverFlags, - ) -> ( - &'b Collider, - &'b Collider, - &'a mut ContactManifold, - Option<&'a mut (dyn MaybeSerializableData)>, - ) { - let coll1 = &colliders[self.pair.collider1]; - let coll2 = &colliders[self.pair.collider2]; - - if self.manifolds.len() == 0 { - let manifold_data = ContactManifoldData::from_colliders(self.pair, coll1, coll2, flags); - self.manifolds - .push(ContactManifold::with_data((0, 0), manifold_data)); - } - - // We have to make sure the order of the returned collider - // match the order of the pair stored inside of the manifold. - // (This order can be modified by the contact determination algorithm). - let manifold = &mut self.manifolds[0]; - if manifold.data.pair.collider1 == self.pair.collider1 { - ( - coll1, - coll2, - manifold, - self.generator_workspace.as_mut().map(|w| &mut *w.0), - ) - } else { - ( - coll2, - coll1, - manifold, - self.generator_workspace.as_mut().map(|w| &mut *w.0), - ) - } - } -} - -#[derive(Clone, Debug)] -#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] -/// A contact manifold between two colliders. -/// -/// A contact manifold describes a set of contacts between two colliders. All the contact -/// part of the same contact manifold share the same contact normal and contact kinematics. -pub struct ContactManifoldData { - // The following are set by the narrow-phase. - /// The pair of colliders involved in this contact manifold. - pub pair: ColliderPair, - /// The pair of body involved in this contact manifold. - pub body_pair: BodyPair, - pub(crate) warmstart_multiplier: f32, - // The two following are set by the constraints solver. - pub(crate) constraint_index: usize, - pub(crate) position_constraint_index: usize, - // We put the following fields here to avoids reading the colliders inside of the - // contact preparation method. - /// The friction coefficient for of all the contacts on this contact manifold. - pub friction: f32, - /// The restitution coefficient for all the contacts on this contact manifold. - pub restitution: f32, - /// The relative position between the first collider and its parent at the time the - /// contact points were generated. - pub delta1: Isometry, - /// The relative position between the second collider and its parent at the time the - /// contact points were generated. - pub delta2: Isometry, - /// Flags used to control some aspects of the constraints solver for this contact manifold. - pub solver_flags: SolverFlags, -} - -impl Default for ContactManifoldData { - fn default() -> Self { - Self::new( - ColliderPair::new(ColliderSet::invalid_handle(), ColliderSet::invalid_handle()), - BodyPair::new( - RigidBodySet::invalid_handle(), - RigidBodySet::invalid_handle(), - ), - Isometry::identity(), - Isometry::identity(), - 0.0, - 0.0, - SolverFlags::empty(), - ) - } -} - -impl TrackedData for ContactManifoldData { - fn flip(&mut self) { - std::mem::swap(&mut self.pair.collider1, &mut self.pair.collider2); - std::mem::swap(&mut self.body_pair.body1, &mut self.body_pair.body2); - std::mem::swap(&mut self.delta1, &mut self.delta2); - } -} - -impl ContactManifoldData { - pub(crate) fn new( - pair: ColliderPair, - body_pair: BodyPair, - delta1: Isometry, - delta2: Isometry, - friction: f32, - restitution: f32, - solver_flags: SolverFlags, - ) -> ContactManifoldData { - Self { - pair, - body_pair, - warmstart_multiplier: Self::min_warmstart_multiplier(), - friction, - restitution, - delta1, - delta2, - constraint_index: 0, - position_constraint_index: 0, - solver_flags, - } - } - - pub(crate) fn from_colliders( - pair: ColliderPair, - coll1: &Collider, - coll2: &Collider, - flags: SolverFlags, - ) -> Self { - Self::with_subshape_indices(pair, coll1, coll2, flags) - } - - pub(crate) fn with_subshape_indices( - pair: ColliderPair, - coll1: &Collider, - coll2: &Collider, - solver_flags: SolverFlags, - ) -> Self { - Self::new( - pair, - BodyPair::new(coll1.parent, coll2.parent), - *coll1.position_wrt_parent(), - *coll2.position_wrt_parent(), - (coll1.friction + coll2.friction) * 0.5, - (coll1.restitution + coll2.restitution) * 0.5, - solver_flags, - ) - } - - pub(crate) fn min_warmstart_multiplier() -> f32 { - // Multiplier used to reduce the amount of warm-starting. - // This coefficient increases exponentially over time, until it reaches 1.0. - // This will reduce significant overshoot at the timesteps that - // follow a timestep involving high-velocity impacts. - 0.01 - } - - pub(crate) fn update_warmstart_multiplier(manifold: &mut ContactManifold) { - // In 2D, tall stacks will actually suffer from this - // because oscillation due to inaccuracies in 2D often - // cause contacts to break, which would result in - // a reset of the warmstart multiplier. - if cfg!(feature = "dim2") { - manifold.data.warmstart_multiplier = 1.0; - return; - } - - for pt in &manifold.points { - if pt.data.impulse != 0.0 { - manifold.data.warmstart_multiplier = - (manifold.data.warmstart_multiplier * 2.0).min(1.0); - return; - } - } - - // Reset the multiplier. - manifold.data.warmstart_multiplier = Self::min_warmstart_multiplier() - } -} diff --git a/src/geometry/contact_generator/ball_ball_contact_generator.rs b/src/geometry/contact_generator/ball_ball_contact_generator.rs deleted file mode 100644 index f2ca7af..0000000 --- a/src/geometry/contact_generator/ball_ball_contact_generator.rs +++ /dev/null @@ -1,103 +0,0 @@ -use crate::geometry::contact_generator::PrimitiveContactGenerationContext; -use crate::geometry::{Contact, ContactManifoldData, KinematicsCategory}; -use crate::math::{Point, Vector}; -#[cfg(feature = "simd-is-enabled")] -use { - crate::geometry::contact_generator::PrimitiveContactGenerationContextSimd, - crate::geometry::{WBall, WContact}, - crate::math::{Isometry, SimdReal, SIMD_WIDTH}, - simba::simd::SimdValue, -}; - -#[cfg(feature = "simd-is-enabled")] -fn generate_contacts_simd(ball1: &WBall, ball2: &WBall, pos21: &Isometry) -> WContact { - let dcenter = ball2.center - ball1.center; - let center_dist = dcenter.magnitude(); - let normal = dcenter / center_dist; - - WContact { - local_p1: ball1.center + normal * ball1.radius, - local_p2: pos21 * (ball2.center - normal * ball2.radius), - local_n1: normal, - local_n2: pos21 * -normal, - fid1: [0; SIMD_WIDTH], - fid2: [0; SIMD_WIDTH], - dist: center_dist - ball1.radius - ball2.radius, - } -} - -#[cfg(feature = "simd-is-enabled")] -pub fn generate_contacts_ball_ball_simd(ctxt: &mut PrimitiveContactGenerationContextSimd) { - let pos_ba = ctxt.positions2.inverse() * ctxt.positions1; - let radii_a = - SimdReal::from(array![|ii| ctxt.shapes1[ii].as_ball().unwrap().radius; SIMD_WIDTH]); - let radii_b = - SimdReal::from(array![|ii| ctxt.shapes2[ii].as_ball().unwrap().radius; SIMD_WIDTH]); - - let wball_a = WBall::new(Point::origin(), radii_a); - let wball_b = WBall::new(pos_ba.inverse_transform_point(&Point::origin()), radii_b); - let contacts = generate_contacts_simd(&wball_a, &wball_b, &pos_ba); - - for (i, manifold) in ctxt.manifolds.iter_mut().enumerate() { - // FIXME: compare the dist before extracting the contact. - let (contact, local_n1, local_n2) = contacts.extract(i); - if contact.dist <= ctxt.prediction_distance { - if manifold.points.len() != 0 { - manifold.points[0].copy_geometry_from(contact); - } else { - manifold.points.push(contact); - } - - manifold.local_n1 = local_n1; - manifold.local_n2 = local_n2; - manifold.kinematics.category = KinematicsCategory::PointPoint; - manifold.kinematics.radius1 = radii_a.extract(i); - manifold.kinematics.radius2 = radii_b.extract(i); - ContactManifoldData::update_warmstart_multiplier(manifold); - } else { - manifold.points.clear(); - } - - manifold.sort_contacts(ctxt.prediction_distance); - } -} - -pub fn generate_contacts_ball_ball(ctxt: &mut PrimitiveContactGenerationContext) { - let pos_ba = ctxt.position2.inverse() * ctxt.position1; - let radius_a = ctxt.shape1.as_ball().unwrap().radius; - let radius_b = ctxt.shape2.as_ball().unwrap().radius; - - let dcenter = pos_ba.inverse_transform_point(&Point::origin()).coords; - let center_dist = dcenter.magnitude(); - let dist = center_dist - radius_a - radius_b; - - if dist < ctxt.prediction_distance { - let local_n1 = if center_dist != 0.0 { - dcenter / center_dist - } else { - Vector::y() - }; - - let local_n2 = pos_ba.inverse_transform_vector(&-local_n1); - let local_p1 = local_n1 * radius_a; - let local_p2 = local_n2 * radius_b; - let contact = Contact::new(local_p1.into(), local_p2.into(), 0, 0, dist); - - if ctxt.manifold.points.len() != 0 { - ctxt.manifold.points[0].copy_geometry_from(contact); - } else { - ctxt.manifold.points.push(contact); - } - - ctxt.manifold.local_n1 = local_n1; - ctxt.manifold.local_n2 = local_n2; - ctxt.manifold.kinematics.category = KinematicsCategory::PointPoint; - ctxt.manifold.kinematics.radius1 = radius_a; - ctxt.manifold.kinematics.radius2 = radius_b; - ContactManifoldData::update_warmstart_multiplier(ctxt.manifold); - } else { - ctxt.manifold.points.clear(); - } - - ctxt.manifold.sort_contacts(ctxt.prediction_distance); -} diff --git a/src/geometry/contact_generator/ball_convex_contact_generator.rs b/src/geometry/contact_generator/ball_convex_contact_generator.rs deleted file mode 100644 index 88f1912..0000000 --- a/src/geometry/contact_generator/ball_convex_contact_generator.rs +++ /dev/null @@ -1,70 +0,0 @@ -use crate::geometry::contact_generator::PrimitiveContactGenerationContext; -use crate::geometry::{Ball, Contact, ContactManifoldData, KinematicsCategory}; -use crate::math::Isometry; -use buckler::query::PointQuery; -use na::Unit; - -pub fn generate_contacts_ball_convex(ctxt: &mut PrimitiveContactGenerationContext) { - if let Some(ball1) = ctxt.shape1.as_ball() { - ctxt.manifold.swap_identifiers(); - do_generate_contacts(ctxt.shape2, ball1, ctxt, true); - } else if let Some(ball2) = ctxt.shape2.as_ball() { - do_generate_contacts(ctxt.shape1, ball2, ctxt, false); - } - - ctxt.manifold.sort_contacts(ctxt.prediction_distance); -} - -fn do_generate_contacts( - point_query1: &P, - ball2: &Ball, - ctxt: &mut PrimitiveContactGenerationContext, - swapped: bool, -) { - let position1; - let position2; - - if swapped { - position1 = ctxt.position2; - position2 = ctxt.position1; - } else { - position1 = ctxt.position1; - position2 = ctxt.position2; - } - - let local_p2_1 = position1.inverse_transform_point(&position2.translation.vector.into()); - let proj = point_query1.project_local_point(&local_p2_1, cfg!(feature = "dim3")); - let dpos = local_p2_1 - proj.local_point; - - #[allow(unused_mut)] // Because `mut local_n1, mut dist` is needed in 2D but not in 3D. - if let Some((mut local_n1, mut dist)) = Unit::try_new_and_get(dpos, 0.0) { - #[cfg(feature = "dim2")] - if proj.is_inside { - local_n1 = -local_n1; - dist = -dist; - } - - if dist <= ball2.radius + ctxt.prediction_distance { - let local_n2 = position2.inverse_transform_vector(&(position1 * -*local_n1)); - let local_p2 = (local_n2 * ball2.radius).into(); - let contact_point = Contact::new(proj.local_point, local_p2, 0, 0, dist - ball2.radius); - - if ctxt.manifold.points.len() != 1 { - ctxt.manifold.points.clear(); - ctxt.manifold.points.push(contact_point); - } else { - // Copy only the geometry so we keep the warmstart impulses. - ctxt.manifold.points[0].copy_geometry_from(contact_point); - } - - ctxt.manifold.local_n1 = *local_n1; - ctxt.manifold.local_n2 = local_n2; - ctxt.manifold.kinematics.category = KinematicsCategory::PlanePoint; - ctxt.manifold.kinematics.radius1 = 0.0; - ctxt.manifold.kinematics.radius2 = ball2.radius; - ContactManifoldData::update_warmstart_multiplier(ctxt.manifold); - } else { - ctxt.manifold.points.clear(); - } - } -} diff --git a/src/geometry/contact_generator/ball_polygon_contact_generator.rs b/src/geometry/contact_generator/ball_polygon_contact_generator.rs deleted file mode 100644 index 8b13789..0000000 --- a/src/geometry/contact_generator/ball_polygon_contact_generator.rs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/geometry/contact_generator/capsule_capsule_contact_generator.rs b/src/geometry/contact_generator/capsule_capsule_contact_generator.rs deleted file mode 100644 index 9090b36..0000000 --- a/src/geometry/contact_generator/capsule_capsule_contact_generator.rs +++ /dev/null @@ -1,202 +0,0 @@ -use crate::geometry::contact_generator::PrimitiveContactGenerationContext; -use crate::geometry::{Capsule, Contact, ContactManifold, ContactManifoldData, KinematicsCategory}; -use crate::math::Isometry; -use crate::math::Vector; -use approx::AbsDiffEq; -#[cfg(feature = "dim2")] -use buckler::shape::SegmentPointLocation; -use na::Unit; - -pub fn generate_contacts_capsule_capsule(ctxt: &mut PrimitiveContactGenerationContext) { - if let (Some(capsule1), Some(capsule2)) = (ctxt.shape1.as_capsule(), ctxt.shape2.as_capsule()) { - generate_contacts( - ctxt.prediction_distance, - capsule1, - ctxt.position1, - capsule2, - ctxt.position2, - ctxt.manifold, - ); - } - - ContactManifoldData::update_warmstart_multiplier(ctxt.manifold); - ctxt.manifold.sort_contacts(ctxt.prediction_distance); -} - -#[cfg(feature = "dim2")] -pub fn generate_contacts<'a>( - prediction_distance: f32, - capsule1: &'a Capsule, - pos1: &'a Isometry, - capsule2: &'a Capsule, - pos2: &'a Isometry, - manifold: &mut ContactManifold, -) { - // FIXME: the contact kinematics is not correctly set here. - // We use the common "Point-Plane" kinematics with zero radius everytime. - // Instead we should select point/point ore point-plane (with non-zero - // radius for the point) depending on the features involved in the contact. - let pos12 = pos1.inverse() * pos2; - let pos21 = pos12.inverse(); - - let seg1 = capsule1.segment; - let seg2_1 = capsule2.segment.transformed(&pos12); - let (loc1, loc2) = buckler::query::details::closest_points_segment_segment_with_locations_nD( - (&seg1.a, &seg1.b), - (&seg2_1.a, &seg2_1.b), - ); - - // We do this clone to perform contact tracking and transfer impulses. - // FIXME: find a more efficient way of doing this. - let old_manifold_points = manifold.points.clone(); - manifold.points.clear(); - - let swapped = false; - - let fid1 = if let SegmentPointLocation::OnVertex(v1) = loc1 { - v1 as u8 * 2 - } else { - 1 - }; - let fid2 = if let SegmentPointLocation::OnVertex(v2) = loc2 { - v2 as u8 * 2 - } else { - 1 - }; - - let bcoords1 = loc1.barycentric_coordinates(); - let bcoords2 = loc2.barycentric_coordinates(); - let local_p1 = seg1.a * bcoords1[0] + seg1.b.coords * bcoords1[1]; - let local_p2 = seg2_1.a * bcoords2[0] + seg2_1.b.coords * bcoords2[1]; - - let local_n1 = - Unit::try_new(local_p2 - local_p1, f32::default_epsilon()).unwrap_or(Vector::y_axis()); - let dist = (local_p2 - local_p1).dot(&local_n1) - capsule1.radius - capsule2.radius; - - if dist <= prediction_distance { - let local_n2 = pos21 * -local_n1; - let contact = Contact::new(local_p1, pos21 * local_p2, fid1, fid2, dist); - manifold.points.push(contact); - - manifold.local_n1 = *local_n1; - manifold.local_n2 = *local_n2; - manifold.kinematics.category = KinematicsCategory::PlanePoint; - manifold.kinematics.radius1 = 0.0; - manifold.kinematics.radius2 = 0.0; - } else { - // No contact within tolerance. - return; - } - - if let (Some(dir1), Some(dir2)) = (seg1.direction(), seg2_1.direction()) { - if dir1.dot(&dir2).abs() >= crate::utils::COS_FRAC_PI_8 - && dir1.dot(&local_n1).abs() < crate::utils::SIN_FRAC_PI_8 - { - // Capsules axes are almost parallel and are almost perpendicular to the normal. - // Find a second contact point. - if let Some((clip_a, clip_b)) = - buckler::query::details::clip_segment_segment_with_normal( - (seg1.a, seg1.b), - (seg2_1.a, seg2_1.b), - *local_n1, - ) - { - let contact = - if (clip_a.0 - local_p1).norm_squared() > f32::default_epsilon() * 100.0 { - // Use clip_a as the second contact. - Contact::new( - clip_a.0, - pos21 * clip_a.1, - clip_a.2 as u8, - clip_a.3 as u8, - (clip_a.1 - clip_a.0).dot(&local_n1), - ) - } else { - // Use clip_b as the second contact. - Contact::new( - clip_b.0, - pos21 * clip_b.1, - clip_b.2 as u8, - clip_b.3 as u8, - (clip_b.1 - clip_b.0).dot(&local_n1), - ) - }; - - manifold.points.push(contact); - } - } - } - - if swapped { - for point in &mut manifold.points { - point.local_p1 += manifold.local_n1 * capsule2.radius; - point.local_p2 += manifold.local_n2 * capsule1.radius; - point.dist -= capsule1.radius + capsule2.radius; - } - } else { - for point in &mut manifold.points { - point.local_p1 += manifold.local_n1 * capsule1.radius; - point.local_p2 += manifold.local_n2 * capsule2.radius; - point.dist -= capsule1.radius + capsule2.radius; - } - } - - manifold.match_contacts(&old_manifold_points, swapped); -} - -#[cfg(feature = "dim3")] -pub fn generate_contacts<'a>( - prediction_distance: f32, - capsule1: &'a Capsule, - pos1: &'a Isometry, - capsule2: &'a Capsule, - pos2: &'a Isometry, - manifold: &mut ContactManifold, -) { - let pos12 = pos1.inverse() * pos2; - let pos21 = pos12.inverse(); - - let seg1 = capsule1.segment; - let seg2_1 = capsule2.segment.transformed(&pos12); - let (loc1, loc2) = - buckler::query::closest_points::closest_points_segment_segment_with_locations_nD( - (&seg1.a, &seg1.b), - (&seg2_1.a, &seg2_1.b), - ); - - { - let bcoords1 = loc1.barycentric_coordinates(); - let bcoords2 = loc2.barycentric_coordinates(); - let local_p1 = seg1.a * bcoords1[0] + seg1.b.coords * bcoords1[1]; - let local_p2 = seg2_1.a * bcoords2[0] + seg2_1.b.coords * bcoords2[1]; - - let local_n1 = - Unit::try_new(local_p2 - local_p1, f32::default_epsilon()).unwrap_or(Vector::y_axis()); - let dist = (local_p2 - local_p1).dot(&local_n1) - capsule1.radius - capsule2.radius; - - if dist <= prediction_distance { - let local_n2 = pos21 * -local_n1; - let contact = Contact::new( - local_p1 + *local_n1 * capsule1.radius, - pos21 * local_p2 + *local_n2 * capsule2.radius, - 0, - 0, - dist, - ); - - if manifold.points.len() != 0 { - manifold.points[0].copy_geometry_from(contact); - } else { - manifold.points.push(contact); - } - - manifold.local_n1 = *local_n1; - manifold.local_n2 = *local_n2; - manifold.kinematics.category = KinematicsCategory::PlanePoint; - manifold.kinematics.radius1 = 0.0; - manifold.kinematics.radius2 = 0.0; - } else { - manifold.points.clear(); - } - } -} diff --git a/src/geometry/contact_generator/contact_dispatcher.rs b/src/geometry/contact_generator/contact_dispatcher.rs deleted file mode 100644 index 9b247f3..0000000 --- a/src/geometry/contact_generator/contact_dispatcher.rs +++ /dev/null @@ -1,141 +0,0 @@ -#[cfg(feature = "dim3")] -use crate::geometry::contact_generator::PfmPfmContactManifoldGeneratorWorkspace; -use crate::geometry::contact_generator::{ - ContactGenerator, ContactGeneratorWorkspace, ContactPhase, - HeightFieldShapeContactGeneratorWorkspace, PrimitiveContactGenerator, - TriMeshShapeContactGeneratorWorkspace, -}; -use buckler::shape::ShapeType; - -/// Trait implemented by structures responsible for selecting a collision-detection algorithm -/// for a given pair of shapes. -pub trait ContactDispatcher { - /// Select the collision-detection algorithm for the given pair of primitive shapes. - fn dispatch_primitives( - &self, - shape1: ShapeType, - shape2: ShapeType, - ) -> (PrimitiveContactGenerator, Option); - /// Select the collision-detection algorithm for the given pair of non-primitive shapes. - fn dispatch( - &self, - shape1: ShapeType, - shape2: ShapeType, - ) -> (ContactPhase, Option); -} - -/// The default contact dispatcher used by Rapier. -pub struct DefaultContactDispatcher; - -impl ContactDispatcher for DefaultContactDispatcher { - fn dispatch_primitives( - &self, - shape1: ShapeType, - shape2: ShapeType, - ) -> (PrimitiveContactGenerator, Option) { - match (shape1, shape2) { - (ShapeType::Ball, ShapeType::Ball) => ( - PrimitiveContactGenerator { - generate_contacts: super::generate_contacts_ball_ball, - #[cfg(feature = "simd-is-enabled")] - generate_contacts_simd: super::generate_contacts_ball_ball_simd, - ..PrimitiveContactGenerator::default() - }, - None, - ), - (ShapeType::Cuboid, ShapeType::Cuboid) => ( - PrimitiveContactGenerator { - generate_contacts: super::generate_contacts_cuboid_cuboid, - ..PrimitiveContactGenerator::default() - }, - None, - ), - // (ShapeType::Polygon, ShapeType::Polygon) => ( - // PrimitiveContactGenerator { - // generate_contacts: super::generate_contacts_polygon_polygon, - // ..PrimitiveContactGenerator::default() - // }, - // None, - // ), - (ShapeType::Capsule, ShapeType::Capsule) => ( - PrimitiveContactGenerator { - generate_contacts: super::generate_contacts_capsule_capsule, - ..PrimitiveContactGenerator::default() - }, - None, - ), - (_, ShapeType::Ball) | (ShapeType::Ball, _) => ( - PrimitiveContactGenerator { - generate_contacts: super::generate_contacts_ball_convex, - ..PrimitiveContactGenerator::default() - }, - None, - ), - (ShapeType::Capsule, ShapeType::Cuboid) | (ShapeType::Cuboid, ShapeType::Capsule) => ( - PrimitiveContactGenerator { - generate_contacts: super::generate_contacts_cuboid_capsule, - ..PrimitiveContactGenerator::default() - }, - None, - ), - (ShapeType::Triangle, ShapeType::Cuboid) | (ShapeType::Cuboid, ShapeType::Triangle) => { - ( - PrimitiveContactGenerator { - generate_contacts: super::generate_contacts_cuboid_triangle, - ..PrimitiveContactGenerator::default() - }, - None, - ) - } - #[cfg(feature = "dim3")] - (ShapeType::Cylinder, _) - | (_, ShapeType::Cylinder) - | (ShapeType::Cone, _) - | (_, ShapeType::Cone) - | (ShapeType::RoundCylinder, _) - | (_, ShapeType::RoundCylinder) - | (ShapeType::Capsule, _) - | (_, ShapeType::Capsule) => ( - PrimitiveContactGenerator { - generate_contacts: super::generate_contacts_pfm_pfm, - ..PrimitiveContactGenerator::default() - }, - Some(ContactGeneratorWorkspace::from( - PfmPfmContactManifoldGeneratorWorkspace::default(), - )), - ), - _ => (PrimitiveContactGenerator::default(), None), - } - } - - fn dispatch( - &self, - shape1: ShapeType, - shape2: ShapeType, - ) -> (ContactPhase, Option) { - match (shape1, shape2) { - (ShapeType::TriMesh, _) | (_, ShapeType::TriMesh) => ( - ContactPhase::NearPhase(ContactGenerator { - generate_contacts: super::generate_contacts_trimesh_shape, - ..ContactGenerator::default() - }), - Some(ContactGeneratorWorkspace::from( - TriMeshShapeContactGeneratorWorkspace::new(), - )), - ), - (ShapeType::HeightField, _) | (_, ShapeType::HeightField) => ( - ContactPhase::NearPhase(ContactGenerator { - generate_contacts: super::generate_contacts_heightfield_shape, - ..ContactGenerator::default() - }), - Some(ContactGeneratorWorkspace::from( - HeightFieldShapeContactGeneratorWorkspace::new(), - )), - ), - _ => { - let (gen, workspace) = self.dispatch_primitives(shape1, shape2); - (ContactPhase::ExactPhase(gen), workspace) - } - } - } -} diff --git a/src/geometry/contact_generator/contact_generator.rs b/src/geometry/contact_generator/contact_generator.rs deleted file mode 100644 index 06ab265..0000000 --- a/src/geometry/contact_generator/contact_generator.rs +++ /dev/null @@ -1,228 +0,0 @@ -use crate::data::MaybeSerializableData; -use crate::geometry::{ - Collider, ColliderSet, ContactDispatcher, ContactEvent, ContactManifold, ContactPair, Shape, - ShapeType, SolverFlags, -}; -use crate::math::Isometry; -#[cfg(feature = "simd-is-enabled")] -use crate::math::{SimdReal, SIMD_WIDTH}; -use crate::pipeline::EventHandler; - -#[derive(Copy, Clone)] -pub enum ContactPhase { - NearPhase(ContactGenerator), - ExactPhase(PrimitiveContactGenerator), -} - -impl ContactPhase { - #[inline] - pub fn generate_contacts( - self, - mut context: ContactGenerationContext, - events: &dyn EventHandler, - ) { - let had_contacts_before = context.pair.has_any_active_contact(); - - match self { - Self::NearPhase(gen) => (gen.generate_contacts)(&mut context), - Self::ExactPhase(gen) => { - // Build the primitive context from the non-primitive context and dispatch. - let (collider1, collider2, manifold, workspace) = context - .pair - .single_manifold(context.colliders, context.solver_flags); - let mut context2 = PrimitiveContactGenerationContext { - prediction_distance: context.prediction_distance, - collider1, - collider2, - shape1: collider1.shape(), - shape2: collider2.shape(), - position1: collider1.position(), - position2: collider2.position(), - manifold, - workspace, - }; - - (gen.generate_contacts)(&mut context2) - } - } - - if had_contacts_before != context.pair.has_any_active_contact() { - if had_contacts_before { - events.handle_contact_event(ContactEvent::Stopped( - context.pair.pair.collider1, - context.pair.pair.collider2, - )); - } else { - events.handle_contact_event(ContactEvent::Started( - context.pair.pair.collider1, - context.pair.pair.collider2, - )) - } - } - } - - #[cfg(feature = "simd-is-enabled")] - #[inline] - pub fn generate_contacts_simd( - self, - mut context: ContactGenerationContextSimd, - events: &dyn EventHandler, - ) { - let mut had_contacts_before = [false; SIMD_WIDTH]; - - for (i, pair) in context.pairs.iter().enumerate() { - had_contacts_before[i] = pair.has_any_active_contact() - } - - match self { - Self::NearPhase(gen) => (gen.generate_contacts_simd)(&mut context), - Self::ExactPhase(gen) => { - // Build the primitive context from the non-primitive context and dispatch. - use arrayvec::ArrayVec; - let mut colliders_arr: ArrayVec<[(&Collider, &Collider); SIMD_WIDTH]> = - ArrayVec::new(); - let mut manifold_arr: ArrayVec<[&mut ContactManifold; SIMD_WIDTH]> = - ArrayVec::new(); - let mut workspace_arr: ArrayVec< - [Option<&mut (dyn MaybeSerializableData)>; SIMD_WIDTH], - > = ArrayVec::new(); - - for (pair, solver_flags) in - context.pairs.iter_mut().zip(context.solver_flags.iter()) - { - let (collider1, collider2, manifold, workspace) = - pair.single_manifold(context.colliders, *solver_flags); - colliders_arr.push((collider1, collider2)); - manifold_arr.push(manifold); - workspace_arr.push(workspace); - } - - let max_index = colliders_arr.len() - 1; - let colliders1 = array![|ii| colliders_arr[ii.min(max_index)].0; SIMD_WIDTH]; - let colliders2 = array![|ii| colliders_arr[ii.min(max_index)].1; SIMD_WIDTH]; - - let mut context2 = PrimitiveContactGenerationContextSimd { - prediction_distance: context.prediction_distance, - colliders1, - colliders2, - shapes1: array![|ii| colliders1[ii].shape(); SIMD_WIDTH], - shapes2: array![|ii| colliders2[ii].shape(); SIMD_WIDTH], - positions1: &Isometry::from( - array![|ii| *colliders1[ii].position(); SIMD_WIDTH], - ), - positions2: &Isometry::from( - array![|ii| *colliders2[ii].position(); SIMD_WIDTH], - ), - manifolds: manifold_arr.as_mut_slice(), - workspaces: workspace_arr.as_mut_slice(), - }; - - (gen.generate_contacts_simd)(&mut context2) - } - } - - for (i, pair) in context.pairs.iter().enumerate() { - if had_contacts_before[i] != pair.has_any_active_contact() { - if had_contacts_before[i] { - events.handle_contact_event(ContactEvent::Stopped( - pair.pair.collider1, - pair.pair.collider2, - )) - } else { - events.handle_contact_event(ContactEvent::Started( - pair.pair.collider1, - pair.pair.collider2, - )) - } - } - } - } -} - -pub struct PrimitiveContactGenerationContext<'a> { - pub prediction_distance: f32, - pub collider1: &'a Collider, - pub collider2: &'a Collider, - pub shape1: &'a dyn Shape, - pub shape2: &'a dyn Shape, - pub position1: &'a Isometry, - pub position2: &'a Isometry, - pub manifold: &'a mut ContactManifold, - pub workspace: Option<&'a mut (dyn MaybeSerializableData)>, -} - -#[cfg(feature = "simd-is-enabled")] -pub struct PrimitiveContactGenerationContextSimd<'a, 'b> { - pub prediction_distance: f32, - pub colliders1: [&'a Collider; SIMD_WIDTH], - pub colliders2: [&'a Collider; SIMD_WIDTH], - pub shapes1: [&'a dyn Shape; SIMD_WIDTH], - pub shapes2: [&'a dyn Shape; SIMD_WIDTH], - pub positions1: &'a Isometry, - pub positions2: &'a Isometry, - pub manifolds: &'a mut [&'b mut ContactManifold], - pub workspaces: &'a mut [Option<&'b mut (dyn MaybeSerializableData)>], -} - -#[derive(Copy, Clone)] -pub struct PrimitiveContactGenerator { - pub generate_contacts: fn(&mut PrimitiveContactGenerationContext), - #[cfg(feature = "simd-is-enabled")] - pub generate_contacts_simd: fn(&mut PrimitiveContactGenerationContextSimd), -} - -impl PrimitiveContactGenerator { - fn unimplemented_fn(_ctxt: &mut PrimitiveContactGenerationContext) {} - #[cfg(feature = "simd-is-enabled")] - fn unimplemented_simd_fn(_ctxt: &mut PrimitiveContactGenerationContextSimd) {} -} - -impl Default for PrimitiveContactGenerator { - fn default() -> Self { - Self { - generate_contacts: Self::unimplemented_fn, - #[cfg(feature = "simd-is-enabled")] - generate_contacts_simd: Self::unimplemented_simd_fn, - } - } -} - -pub struct ContactGenerationContext<'a> { - pub dispatcher: &'a dyn ContactDispatcher, - pub prediction_distance: f32, - pub colliders: &'a ColliderSet, - pub pair: &'a mut ContactPair, - pub solver_flags: SolverFlags, -} - -#[cfg(feature = "simd-is-enabled")] -pub struct ContactGenerationContextSimd<'a, 'b> { - pub dispatcher: &'a dyn ContactDispatcher, - pub prediction_distance: f32, - pub colliders: &'a ColliderSet, - pub pairs: &'a mut [&'b mut ContactPair], - pub solver_flags: &'a [SolverFlags], -} - -#[derive(Copy, Clone)] -pub struct ContactGenerator { - pub generate_contacts: fn(&mut ContactGenerationContext), - #[cfg(feature = "simd-is-enabled")] - pub generate_contacts_simd: fn(&mut ContactGenerationContextSimd), -} - -impl ContactGenerator { - fn unimplemented_fn(_ctxt: &mut ContactGenerationContext) {} - #[cfg(feature = "simd-is-enabled")] - fn unimplemented_simd_fn(_ctxt: &mut ContactGenerationContextSimd) {} -} - -impl Default for ContactGenerator { - fn default() -> Self { - Self { - generate_contacts: Self::unimplemented_fn, - #[cfg(feature = "simd-is-enabled")] - generate_contacts_simd: Self::unimplemented_simd_fn, - } - } -} diff --git a/src/geometry/contact_generator/contact_generator_workspace.rs b/src/geometry/contact_generator/contact_generator_workspace.rs deleted file mode 100644 index 7aac592..0000000 --- a/src/geometry/contact_generator/contact_generator_workspace.rs +++ /dev/null @@ -1,104 +0,0 @@ -use crate::data::MaybeSerializableData; -#[cfg(feature = "dim3")] -use crate::geometry::contact_generator::PfmPfmContactManifoldGeneratorWorkspace; -use crate::geometry::contact_generator::{ - HeightFieldShapeContactGeneratorWorkspace, TriMeshShapeContactGeneratorWorkspace, - WorkspaceSerializationTag, -}; - -// Note we have this newtype because it simplifies the serialization/deserialization code. -pub struct ContactGeneratorWorkspace(pub Box); - -impl Clone for ContactGeneratorWorkspace { - fn clone(&self) -> Self { - ContactGeneratorWorkspace(self.0.clone_dyn()) - } -} - -impl From for ContactGeneratorWorkspace { - fn from(data: T) -> Self { - Self(Box::new(data) as Box) - } -} - -#[cfg(feature = "serde-serialize")] -impl serde::Serialize for ContactGeneratorWorkspace { - fn serialize(&self, serializer: S) -> Result - where - S: serde::Serializer, - { - use crate::serde::ser::SerializeStruct; - - if let Some((tag, ser)) = self.0.as_serialize() { - let mut state = serializer.serialize_struct("ContactGeneratorWorkspace", 2)?; - state.serialize_field("tag", &tag)?; - state.serialize_field("inner", ser)?; - state.end() - } else { - Err(serde::ser::Error::custom( - "Found a non-serializable contact generator workspace.", - )) - } - } -} - -#[cfg(feature = "serde-serialize")] -impl<'de> serde::Deserialize<'de> for ContactGeneratorWorkspace { - fn deserialize(deserializer: D) -> Result - where - D: serde::Deserializer<'de>, - { - struct Visitor {}; - impl<'de> serde::de::Visitor<'de> for Visitor { - type Value = ContactGeneratorWorkspace; - fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(formatter, "one shape type tag and the inner shape data") - } - - fn visit_seq(self, mut seq: A) -> Result - where - A: serde::de::SeqAccess<'de>, - { - use num::cast::FromPrimitive; - - let tag: u32 = seq - .next_element()? - .ok_or_else(|| serde::de::Error::invalid_length(0, &self))?; - - fn deser<'de, A, S: MaybeSerializableData + serde::Deserialize<'de>>( - seq: &mut A, - ) -> Result, A::Error> - where - A: serde::de::SeqAccess<'de>, - { - let workspace: S = seq.next_element()?.ok_or_else(|| { - serde::de::Error::custom("Failed t