From 8173e7ada2e3f5c99de53b532adc085a26c1cefd Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 29 Mar 2021 14:54:54 +0200 Subject: Allow collider modification after its insersion to the ColliderSet. --- src/dynamics/coefficient_combine_rule.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/dynamics/coefficient_combine_rule.rs') diff --git a/src/dynamics/coefficient_combine_rule.rs b/src/dynamics/coefficient_combine_rule.rs index 2c66888..1bef022 100644 --- a/src/dynamics/coefficient_combine_rule.rs +++ b/src/dynamics/coefficient_combine_rule.rs @@ -21,6 +21,16 @@ pub enum CoefficientCombineRule { } impl CoefficientCombineRule { + pub fn from_value(val: u8) -> Self { + match val { + 0 => CoefficientCombineRule::Average, + 1 => CoefficientCombineRule::Min, + 2 => CoefficientCombineRule::Multiply, + 3 => CoefficientCombineRule::Max, + _ => panic!("Invalid coefficient combine rule."), + } + } + pub(crate) fn combine(coeff1: Real, coeff2: Real, rule_value1: u8, rule_value2: u8) -> Real { let effective_rule = rule_value1.max(rule_value2); -- cgit From d2ee6420538d7ee524f2096995d4f44fcfef4551 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Tue, 30 Mar 2021 17:08:51 +0200 Subject: CCD: take angular motion and penetration depth into account in various thresholds. --- src/dynamics/coefficient_combine_rule.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dynamics/coefficient_combine_rule.rs') diff --git a/src/dynamics/coefficient_combine_rule.rs b/src/dynamics/coefficient_combine_rule.rs index 1bef022..9b3b9ee 100644 --- a/src/dynamics/coefficient_combine_rule.rs +++ b/src/dynamics/coefficient_combine_rule.rs @@ -21,7 +21,7 @@ pub enum CoefficientCombineRule { } impl CoefficientCombineRule { - pub fn from_value(val: u8) -> Self { + pub(crate) fn from_value(val: u8) -> Self { match val { 0 => CoefficientCombineRule::Average, 1 => CoefficientCombineRule::Min, -- cgit