From c32da78f2a6014c491aa3e975fb83ddb7c80610e Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 26 Apr 2021 17:59:25 +0200 Subject: Split rigid-bodies and colliders into multiple components --- src/dynamics/coefficient_combine_rule.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (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 9b3b9ee..1016d09 100644 --- a/src/dynamics/coefficient_combine_rule.rs +++ b/src/dynamics/coefficient_combine_rule.rs @@ -20,17 +20,13 @@ pub enum CoefficientCombineRule { Max, } -impl CoefficientCombineRule { - pub(crate) 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."), - } +impl Default for CoefficientCombineRule { + fn default() -> Self { + CoefficientCombineRule::Average } +} +impl CoefficientCombineRule { pub(crate) fn combine(coeff1: Real, coeff2: Real, rule_value1: u8, rule_value2: u8) -> Real { let effective_rule = rule_value1.max(rule_value2); -- cgit