aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Nils Ferner <contact@jnferner.com>2023-01-27 00:18:57 +0100
committerJan Nils Ferner <contact@jnferner.com>2023-01-27 00:18:57 +0100
commit9337093d838f6a50ccf5cf99e75ebce9e52c3619 (patch)
tree321bc0c22b92cc8592e069d7fa9997f50d5277a6
parente6035ed998e240bbf7092dd7ead612e766eca0d7 (diff)
downloadrapier-9337093d838f6a50ccf5cf99e75ebce9e52c3619.tar.gz
rapier-9337093d838f6a50ccf5cf99e75ebce9e52c3619.tar.bz2
rapier-9337093d838f6a50ccf5cf99e75ebce9e52c3619.zip
Remove duplicated code
-rw-r--r--src/control/character_controller.rs8
1 files changed, 6 insertions, 2 deletions
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<Real>>,
mut translation_remaining: Option<&mut Vector<Real>>,
) -> 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;