diff options
| author | Sébastien Crozet <developer@crozet.re> | 2022-03-06 10:59:29 +0100 |
|---|---|---|
| committer | Sébastien Crozet <sebastien@crozet.re> | 2022-03-20 21:49:16 +0100 |
| commit | 815de4beff2ca31255c7fb937337602eb784ed67 (patch) | |
| tree | 82b93d1fcad98f9a9a6732e2cc0208f8a44fe67b /src/dynamics/solver/generic_velocity_constraint.rs | |
| parent | 2e6f133b95b614f13445722e54f28105d9664841 (diff) | |
| download | rapier-815de4beff2ca31255c7fb937337602eb784ed67.tar.gz rapier-815de4beff2ca31255c7fb937337602eb784ed67.tar.bz2 rapier-815de4beff2ca31255c7fb937337602eb784ed67.zip | |
Complete the parallel solver fix
Diffstat (limited to 'src/dynamics/solver/generic_velocity_constraint.rs')
| -rw-r--r-- | src/dynamics/solver/generic_velocity_constraint.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/dynamics/solver/generic_velocity_constraint.rs b/src/dynamics/solver/generic_velocity_constraint.rs index 99dc40e..261c4c8 100644 --- a/src/dynamics/solver/generic_velocity_constraint.rs +++ b/src/dynamics/solver/generic_velocity_constraint.rs @@ -36,7 +36,7 @@ impl GenericVelocityConstraint { out_constraints: &mut Vec<AnyVelocityConstraint>, jacobians: &mut DVector<Real>, jacobian_id: &mut usize, - push: bool, + insert_at: Option<usize>, ) where Bodies: ComponentSet<RigidBodyIds> + ComponentSet<RigidBodyVelocity> @@ -99,7 +99,7 @@ impl GenericVelocityConstraint { let required_jacobian_len = *jacobian_id + manifold.data.solver_contacts.len() * multibodies_ndof * 2 * DIM; - if jacobians.nrows() < required_jacobian_len { + if jacobians.nrows() < required_jacobian_len && !cfg!(feature = "parallel") { jacobians.resize_vertically_mut(required_jacobian_len, 0.0); } @@ -320,11 +320,10 @@ impl GenericVelocityConstraint { generic_constraint_mask, }; - if push { - out_constraints.push(AnyVelocityConstraint::NongroupedGeneric(constraint)); + if let Some(at) = insert_at { + out_constraints[at + _l] = AnyVelocityConstraint::NongroupedGeneric(constraint); } else { - out_constraints[manifold.data.constraint_index + _l] = - AnyVelocityConstraint::NongroupedGeneric(constraint); + out_constraints.push(AnyVelocityConstraint::NongroupedGeneric(constraint)); } } } |
