aboutsummaryrefslogtreecommitdiff
path: root/src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs
diff options
context:
space:
mode:
authorSébastien Crozet <sebcrozet@dimforge.com>2023-12-10 21:51:57 +0100
committerSébastien Crozet <sebcrozet@dimforge.com>2023-12-10 21:51:57 +0100
commit76557448d7bff7d1c057c982aa4f55f7ee6a612f (patch)
tree0fae47c1aa4417add310a008a3632d3fd8e8c282 /src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs
parentfef7f0f92a281dcbcccac50d1019e72ffb1ec3ee (diff)
downloadrapier-76557448d7bff7d1c057c982aa4f55f7ee6a612f.tar.gz
rapier-76557448d7bff7d1c057c982aa4f55f7ee6a612f.tar.bz2
rapier-76557448d7bff7d1c057c982aa4f55f7ee6a612f.zip
fix: also apply joint limits in case of equality
Diffstat (limited to 'src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs')
-rw-r--r--src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs b/src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs
index 7a4ccc7..f7101a1 100644
--- a/src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs
+++ b/src/dynamics/solver/joint_constraint/joint_velocity_constraint_builder.rs
@@ -95,8 +95,8 @@ impl<N: WReal> JointVelocityConstraintBuilder<N> {
self.lock_linear(params, joint_id, body1, body2, limited_axis, writeback_id);
let dist = self.lin_err.dot(&constraint.lin_jac);
- let min_enabled = dist.simd_lt(limits[0]);
- let max_enabled = limits[1].simd_lt(dist);
+ let min_enabled = dist.simd_le(limits[0]);
+ let max_enabled = limits[1].simd_le(dist);
let erp_inv_dt = N::splat(params.joint_erp_inv_dt());
let cfm_coeff = N::splat(params.joint_cfm_coeff());
@@ -293,8 +293,8 @@ impl<N: WReal> JointVelocityConstraintBuilder<N> {
let s_ang = (self.ang_err.angle() * half).simd_sin();
#[cfg(feature = "dim3")]
let s_ang = self.ang_err.imag()[_limited_axis];
- let min_enabled = s_ang.simd_lt(s_limits[0]);
- let max_enabled = s_limits[1].simd_lt(s_ang);
+ let min_enabled = s_ang.simd_le(s_limits[0]);
+ let max_enabled = s_limits[1].simd_le(s_ang);
let impulse_bounds = [
N::splat(-Real::INFINITY).select(min_enabled, zero),
@@ -498,8 +498,8 @@ impl<N: WReal> JointVelocityConstraintBuilder<N> {
let lin_jac = self.basis.column(limited_axis).into_owned();
let dist = self.lin_err.dot(&lin_jac);
- let min_enabled = dist.simd_lt(limits[0]);
- let max_enabled = limits[1].simd_lt(dist);
+ let min_enabled = dist.simd_le(limits[0]);
+ let max_enabled = limits[1].simd_le(dist);
let impulse_bounds = [
N::splat(-Real::INFINITY).select(min_enabled, zero),
@@ -835,7 +835,7 @@ impl<N: WReal> JointVelocityConstraintBuilder<N> {
joint_id: [JointIndex; LANES],
body1: &SolverBody<N, LANES>,
body2: &SolverBody<N, LANES>,
- limited_axis: usize,
+ _limited_axis: usize,
limits: [N; 2],
writeback_id: WritebackId,
) -> JointVelocityGroundConstraint<N, LANES> {
@@ -845,9 +845,9 @@ impl<N: WReal> JointVelocityConstraintBuilder<N> {
#[cfg(feature = "dim2")]
let s_ang = (self.ang_err.angle() * half).simd_sin();
#[cfg(feature = "dim3")]
- let s_ang = self.ang_err.imag()[limited_axis];
- let min_enabled = s_ang.simd_lt(s_limits[0]);
- let max_enabled = s_limits[1].simd_lt(s_ang);
+ let s_ang = self.ang_err.imag()[_limited_axis];
+ let min_enabled = s_ang.simd_le(s_limits[0]);
+ let max_enabled = s_limits[1].simd_le(s_ang);
let impulse_bounds = [
N::splat(-Real::INFINITY).select(min_enabled, zero),
@@ -857,7 +857,7 @@ impl<N: WReal> JointVelocityConstraintBuilder<N> {
#[cfg(feature = "dim2")]
let ang_jac = N::one();
#[cfg(feature = "dim3")]
- let ang_jac = self.ang_basis.column(limited_axis).into_owned();
+ let ang_jac = self.ang_basis.column(_limited_axis).into_owned();
let dvel = ang_jac.gdot(body2.angvel) - ang_jac.gdot(body1.angvel);
let rhs_wo_bias = dvel;