Skip to content

Commit

Permalink
Make spring->maxForce limit force on cpDampedSpring
Browse files Browse the repository at this point in the history
  • Loading branch information
viblo committed May 8, 2024
1 parent 0b198b7 commit 5cda934
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/cpDampedSpring.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ preStep(cpDampedSpring *spring, cpFloat dt)

// apply spring force
cpFloat f_spring = spring->springForceFunc((cpConstraint *)spring, dist);
f_spring = cpfclamp(f_spring, -spring->constraint.maxForce, spring->constraint.maxForce);
cpFloat j_spring = spring->jAcc = f_spring*dt;

apply_impulses(a, b, spring->r1, spring->r2, cpvmult(spring->n, j_spring));
}

Expand All @@ -70,9 +72,15 @@ applyImpulse(cpDampedSpring *spring, cpFloat dt)
// compute velocity loss from drag
cpFloat v_damp = (spring->target_vrn - vrn)*spring->v_coef;
spring->target_vrn = vrn + v_damp;

cpFloat j_damp = v_damp*spring->nMass;
cpFloat maxImpulse = spring->constraint.maxForce*dt;

cpFloat jAccClamped = cpfclamp(spring->jAcc+j_damp, -maxImpulse, maxImpulse);
j_damp = jAccClamped - spring->jAcc;

spring->jAcc += j_damp;

apply_impulses(a, b, spring->r1, spring->r2, cpvmult(spring->n, j_damp));
}

Expand Down

0 comments on commit 5cda934

Please sign in to comment.