From e24d73a2554e5cedefe719e46a7c531a7e89e6c6 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 8 Feb 2021 10:47:58 +0100 Subject: Don't serialize solver contacts + remove erased-serde dependency. --- src/data/mod.rs | 1 - src/geometry/contact_pair.rs | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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, /// The contacts that will be seen by the constraints solver for computing forces. + #[cfg_attr(feature = "serde-serialize", serde(skip))] pub solver_contacts: Vec, } -- cgit