diff options
| author | Sébastien Crozet <developer@crozet.re> | 2021-03-08 10:09:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 10:09:43 +0100 |
| commit | beaddea6f2596dce936355940fd98ca90945cb65 (patch) | |
| tree | 22a8e6863cce5daab7782c5de108749e5d046fbb /src/dynamics/coefficient_combine_rule.rs | |
| parent | e7f805aea45612abb655b3c36a133357fecfcdc4 (diff) | |
| parent | 152ada67ecd122fe38a9cae8b262542b4abf25fc (diff) | |
| download | rapier-beaddea6f2596dce936355940fd98ca90945cb65.tar.gz rapier-beaddea6f2596dce936355940fd98ca90945cb65.tar.bz2 rapier-beaddea6f2596dce936355940fd98ca90945cb65.zip | |
Merge pull request #146 from dimforge/implicit_friction_cone
Projection friction impulses on an implicit cone instead of a pyramid approximation.
Diffstat (limited to 'src/dynamics/coefficient_combine_rule.rs')
| -rw-r--r-- | src/dynamics/coefficient_combine_rule.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dynamics/coefficient_combine_rule.rs b/src/dynamics/coefficient_combine_rule.rs index 5e8b4a0..2c66888 100644 --- a/src/dynamics/coefficient_combine_rule.rs +++ b/src/dynamics/coefficient_combine_rule.rs @@ -25,7 +25,7 @@ impl CoefficientCombineRule { let effective_rule = rule_value1.max(rule_value2); match effective_rule { - 0 => (coeff1 + coeff1) / 2.0, + 0 => (coeff1 + coeff2) / 2.0, 1 => coeff1.min(coeff2), 2 => coeff1 * coeff2, _ => coeff1.max(coeff2), |