From 9337093d838f6a50ccf5cf99e75ebce9e52c3619 Mon Sep 17 00:00:00 2001 From: Jan Nils Ferner Date: Fri, 27 Jan 2023 00:18:57 +0100 Subject: Remove duplicated code --- src/control/character_controller.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/control/character_controller.rs b/src/control/character_controller.rs index 23dd12c..5ee58df 100644 --- a/src/control/character_controller.rs +++ b/src/control/character_controller.rs @@ -355,6 +355,10 @@ impl KinematicCharacterController { None } + fn predict_ground(&self, up_extends: Real) -> Real { + self.offset.eval(up_extends) * 1.3 + } + fn detect_grounded_status_and_apply_friction( &self, dt: Real, @@ -368,7 +372,7 @@ impl KinematicCharacterController { mut kinematic_friction_translation: Option<&mut Vector>, mut translation_remaining: Option<&mut Vector>, ) -> bool { - let prediction = self.offset.eval(dims.y) * 1.2; + let prediction = self.predict_ground(dims.y); // TODO: allow custom dispatchers. let dispatcher = DefaultQueryDispatcher; @@ -667,7 +671,7 @@ impl KinematicCharacterController { let up_extent = extents.dot(&self.up); let movement_to_transfer = *collision.toi.normal1 * collision.translation_remaining.dot(&collision.toi.normal1); - let prediction = self.offset.eval(up_extent) * 1.2; + let prediction = self.predict_ground(up_extent); // TODO: allow custom dispatchers. let dispatcher = DefaultQueryDispatcher; -- cgit