Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/dynamics/solver/joint_constraint/joint_constraint_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,20 @@ impl<N: SimdRealCopy> JointTwoBodyConstraintHelper<N> {

let mut rhs_wo_bias = N::zero();
if motor_params.erp_inv_dt != N::zero() {
let ang_dist;

#[cfg(feature = "dim2")]
let ang_dist = self.ang_err.angle();
{
ang_dist = self.ang_err.angle();
}

#[cfg(feature = "dim3")]
let ang_dist = self.ang_err.imag()[_motor_axis].simd_asin() * N::splat(2.0);
{
// Clamp the component from -1.0 to 1.0 to account for slight imprecision
let clamped_err = self.ang_err.imag()[_motor_axis].simd_clamp(-N::one(), N::one());
ang_dist = clamped_err.simd_asin() * N::splat(2.0);
}

let target_ang = motor_params.target_pos;
rhs_wo_bias += utils::smallest_abs_diff_between_angles(ang_dist, target_ang)
* motor_params.erp_inv_dt;
Expand Down