aboutsummaryrefslogtreecommitdiff
path: root/src/geometry/contact_generator/mod.rs
diff options
context:
space:
mode:
authorRobert Hrusecky <robert.hrusecky@utexas.edu>2020-11-02 15:00:12 -0600
committerRobert Hrusecky <robert.hrusecky@utexas.edu>2020-11-02 15:00:12 -0600
commit8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa (patch)
treeb59ce89ff5d1e0505cdf2b7b91740a48763efa76 /src/geometry/contact_generator/mod.rs
parentbcec54ef31d987cf20b493628a20777183a95f65 (diff)
parenta38fdc101dc74473c45a8b4f5d770f2bc43f30c2 (diff)
downloadrapier-8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa.tar.gz
rapier-8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa.tar.bz2
rapier-8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa.zip
Merge branch 'master' into infinite_fall_memory
Diffstat (limited to 'src/geometry/contact_generator/mod.rs')
-rw-r--r--src/geometry/contact_generator/mod.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/geometry/contact_generator/mod.rs b/src/geometry/contact_generator/mod.rs
index 0549420..9b14711 100644
--- a/src/geometry/contact_generator/mod.rs
+++ b/src/geometry/contact_generator/mod.rs
@@ -23,6 +23,7 @@ pub use self::pfm_pfm_contact_generator::{
generate_contacts_pfm_pfm, PfmPfmContactManifoldGeneratorWorkspace,
};
// pub use self::polygon_polygon_contact_generator::generate_contacts_polygon_polygon;
+pub use self::contact_generator_workspace::ContactGeneratorWorkspace;
pub use self::trimesh_shape_contact_generator::{
generate_contacts_trimesh_shape, TrimeshShapeContactGeneratorWorkspace,
};
@@ -31,12 +32,15 @@ pub(crate) use self::polygon_polygon_contact_generator::clip_segments;
#[cfg(feature = "dim2")]
pub(crate) use self::polygon_polygon_contact_generator::clip_segments_with_normal;
+pub(self) use self::serializable_workspace_tag::WorkspaceSerializationTag;
+
mod ball_ball_contact_generator;
mod ball_convex_contact_generator;
mod ball_polygon_contact_generator;
mod capsule_capsule_contact_generator;
mod contact_dispatcher;
mod contact_generator;
+mod contact_generator_workspace;
mod cuboid_capsule_contact_generator;
mod cuboid_cuboid_contact_generator;
mod cuboid_polygon_contact_generator;
@@ -45,6 +49,7 @@ mod heightfield_shape_contact_generator;
#[cfg(feature = "dim3")]
mod pfm_pfm_contact_generator;
mod polygon_polygon_contact_generator;
+mod serializable_workspace_tag;
mod trimesh_shape_contact_generator;
use crate::geometry::{Contact, ContactManifold};