diff options
| author | Sébastien Crozet <developer@crozet.re> | 2021-02-08 11:24:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 11:24:09 +0100 |
| commit | 244afd529b4d91204c9825def00a69f233165224 (patch) | |
| tree | fae0b9afcb863d600364f7f5b5f1ed0037e06eae /src | |
| parent | a272f4ce9eb812bd14114fe95ab614bc8dddfce5 (diff) | |
| parent | e24d73a2554e5cedefe719e46a7c531a7e89e6c6 (diff) | |
| download | rapier-244afd529b4d91204c9825def00a69f233165224.tar.gz rapier-244afd529b4d91204c9825def00a69f233165224.tar.bz2 rapier-244afd529b4d91204c9825def00a69f233165224.zip | |
Merge pull request #107 from dimforge/serialization_perf
Don't serialize solver contacts + remove erased-serde dependency.
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/mod.rs | 1 | ||||
| -rw-r--r-- | src/geometry/contact_pair.rs | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/data/mod.rs b/src/data/mod.rs index edcd326..7c49314 100644 --- a/src/data/mod.rs +++ b/src/data/mod.rs @@ -1,7 +1,6 @@ //! Data structures modified with guaranteed deterministic behavior after deserialization. pub use self::coarena::Coarena; -pub use parry::utils::MaybeSerializableData; pub mod arena; mod coarena; diff --git a/src/geometry/contact_pair.rs b/src/geometry/contact_pair.rs index f6c4989..47f6678 100644 --- a/src/geometry/contact_pair.rs +++ b/src/geometry/contact_pair.rs @@ -90,15 +90,19 @@ pub struct ContactManifoldData { pub body_pair: BodyPair, pub(crate) warmstart_multiplier: Real, // The two following are set by the constraints solver. + #[cfg_attr(feature = "serde-serialize", serde(skip))] pub(crate) constraint_index: usize, + #[cfg_attr(feature = "serde-serialize", serde(skip))] pub(crate) position_constraint_index: usize, // We put the following fields here to avoids reading the colliders inside of the // contact preparation method. /// Flags used to control some aspects of the constraints solver for this contact manifold. pub solver_flags: SolverFlags, /// The world-space contact normal shared by all the contact in this contact manifold. + #[cfg_attr(feature = "serde-serialize", serde(skip))] pub normal: Vector<Real>, /// The contacts that will be seen by the constraints solver for computing forces. + #[cfg_attr(feature = "serde-serialize", serde(skip))] pub solver_contacts: Vec<SolverContact>, } |