From cc6d1b973002b4d366bc81ec6bf9e8240ad7b404 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 14 Dec 2020 15:51:43 +0100 Subject: Outsource the Shape trait, wquadtree, and shape types. --- src/dynamics/mod.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/dynamics/mod.rs') diff --git a/src/dynamics/mod.rs b/src/dynamics/mod.rs index 6967904..28f149a 100644 --- a/src/dynamics/mod.rs +++ b/src/dynamics/mod.rs @@ -7,9 +7,9 @@ pub use self::joint::RevoluteJoint; pub use self::joint::{ BallJoint, FixedJoint, Joint, JointHandle, JointParams, JointSet, PrismaticJoint, }; -pub use self::mass_properties::MassProperties; pub use self::rigid_body::{ActivationStatus, BodyStatus, RigidBody, RigidBodyBuilder}; pub use self::rigid_body_set::{BodyPair, RigidBodyHandle, RigidBodySet}; +pub use buckler::shape::MassProperties; // #[cfg(not(feature = "parallel"))] pub(crate) use self::joint::JointGraphEdge; pub(crate) use self::rigid_body::RigidBodyChanges; @@ -20,15 +20,6 @@ pub(crate) use self::solver::ParallelIslandSolver; mod integration_parameters; mod joint; -mod mass_properties; -mod mass_properties_ball; -mod mass_properties_capsule; -#[cfg(feature = "dim3")] -mod mass_properties_cone; -mod mass_properties_cuboid; -mod mass_properties_cylinder; -#[cfg(feature = "dim2")] -mod mass_properties_polygon; mod rigid_body; mod rigid_body_set; mod solver; -- cgit 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. --- src/dynamics/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dynamics/mod.rs') 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; -- cgit From 8fe2df126a279a435cc544b150aadf8f7b757868 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Thu, 17 Dec 2020 18:37:16 +0100 Subject: Remove some irrelevant code. --- src/dynamics/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dynamics/mod.rs') diff --git a/src/dynamics/mod.rs b/src/dynamics/mod.rs index 76e9de2..c2c36ef 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 eagl::shape::MassProperties; +pub use cdl::shape::MassProperties; // #[cfg(not(feature = "parallel"))] pub(crate) use self::joint::JointGraphEdge; pub(crate) use self::rigid_body::RigidBodyChanges; -- cgit From e2006599a8fa90090393ff4fed326ee78fd7c0b7 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Wed, 20 Jan 2021 15:15:03 +0100 Subject: Add 3D convex decomposition example. --- src/dynamics/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dynamics/mod.rs') diff --git a/src/dynamics/mod.rs b/src/dynamics/mod.rs index c2c36ef..d7ce0c1 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 cdl::shape::MassProperties; +pub use cdl::mass_properties::MassProperties; // #[cfg(not(feature = "parallel"))] pub(crate) use self::joint::JointGraphEdge; pub(crate) use self::rigid_body::RigidBodyChanges; -- cgit From 98d3980db7a9803f4ee965237599a87771a417d1 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Thu, 21 Jan 2021 16:03:27 +0100 Subject: Allow several rules for combining friction/restitution coefficients. --- src/dynamics/mod.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/dynamics/mod.rs') diff --git a/src/dynamics/mod.rs b/src/dynamics/mod.rs index d7ce0c1..0bc0b05 100644 --- a/src/dynamics/mod.rs +++ b/src/dynamics/mod.rs @@ -11,6 +11,7 @@ pub use self::rigid_body::{ActivationStatus, BodyStatus, RigidBody, RigidBodyBui pub use self::rigid_body_set::{BodyPair, RigidBodyHandle, RigidBodySet}; pub use cdl::mass_properties::MassProperties; // #[cfg(not(feature = "parallel"))] +pub use self::coefficient_combine_rule::CoefficientCombineRule; pub(crate) use self::joint::JointGraphEdge; pub(crate) use self::rigid_body::RigidBodyChanges; #[cfg(not(feature = "parallel"))] @@ -18,6 +19,7 @@ pub(crate) use self::solver::IslandSolver; #[cfg(feature = "parallel")] pub(crate) use self::solver::ParallelIslandSolver; +mod coefficient_combine_rule; mod integration_parameters; mod joint; mod rigid_body; -- cgit From 8f7220f03d3c23574b9ece09d81d32e862f1b5c6 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Sun, 24 Jan 2021 11:13:44 +0100 Subject: Rename cdl to parry. --- src/dynamics/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dynamics/mod.rs') diff --git a/src/dynamics/mod.rs b/src/dynamics/mod.rs index 0bc0b05..8c38dc2 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 cdl::mass_properties::MassProperties; +pub use parry::mass_properties::MassProperties; // #[cfg(not(feature = "parallel"))] pub use self::coefficient_combine_rule::CoefficientCombineRule; pub(crate) use self::joint::JointGraphEdge; -- cgit