diff options
| author | Crozet Sébastien <developer@crozet.re> | 2021-01-04 17:59:51 +0100 |
|---|---|---|
| committer | Crozet Sébastien <developer@crozet.re> | 2021-01-04 17:59:56 +0100 |
| commit | c28b14d31c43e1eb97a81df7673127d0c22d8deb (patch) | |
| tree | 05c85c5d00017235037d4be0782d3351ba5f3dff /src/dynamics/solver/solver_constraints.rs | |
| parent | aa61fe65e3ff0289ecab57b4053a3410cf6d4a87 (diff) | |
| download | rapier-c28b14d31c43e1eb97a81df7673127d0c22d8deb.tar.gz rapier-c28b14d31c43e1eb97a81df7673127d0c22d8deb.tar.bz2 rapier-c28b14d31c43e1eb97a81df7673127d0c22d8deb.zip | |
Refactor the parallel solver code the same way we did with the non-parallel solver.
Diffstat (limited to 'src/dynamics/solver/solver_constraints.rs')
| -rw-r--r-- | src/dynamics/solver/solver_constraints.rs | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/dynamics/solver/solver_constraints.rs b/src/dynamics/solver/solver_constraints.rs index 1965d6d..b9dd497 100644 --- a/src/dynamics/solver/solver_constraints.rs +++ b/src/dynamics/solver/solver_constraints.rs @@ -318,18 +318,8 @@ impl SolverConstraints<AnyJointVelocityConstraint, AnyJointPositionConstraint> { ); self.velocity_constraints.push(vel_constraint); - if let Some(pos_constraint) = - AnyJointPositionConstraint::from_wide_joint_ground(joints, bodies) - { - self.position_constraints.push(pos_constraint); - } else { - for joint in joints.iter() { - self.position_constraints - .push(AnyJointPositionConstraint::from_joint_ground( - *joint, bodies, - )) - } - } + let pos_constraint = AnyJointPositionConstraint::from_wide_joint_ground(joints, bodies); + self.position_constraints.push(pos_constraint); } } @@ -367,16 +357,8 @@ impl SolverConstraints<AnyJointVelocityConstraint, AnyJointPositionConstraint> { AnyJointVelocityConstraint::from_wide_joint(params, joints_id, joints, bodies); self.velocity_constraints.push(vel_constraint); - if let Some(pos_constraint) = - AnyJointPositionConstraint::from_wide_joint(joints, bodies) - { - self.position_constraints.push(pos_constraint); - } else { - for joint in joints.iter() { - self.position_constraints - .push(AnyJointPositionConstraint::from_joint(*joint, bodies)) - } - } + let pos_constraint = AnyJointPositionConstraint::from_wide_joint(joints, bodies); + self.position_constraints.push(pos_constraint); } } } |
