nichkara/rapier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicated code

Browse Source
This commit is contained in:
Jan Nils Ferner
2023-01-27 00:18:57 +01:00
parent e6035ed998
commit 9337093d83
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/control/character_controller.rs
View File

@@ -355,6 +355,10 @@ impl KinematicCharacterController {
None None
} }
fn predict_ground(&self, up_extends: Real) -> Real {
self.offset.eval(up_extends) * 1.3
}
fn detect_grounded_status_and_apply_friction( fn detect_grounded_status_and_apply_friction(
&self, &self,
dt: Real, dt: Real,
@@ -368,7 +372,7 @@ impl KinematicCharacterController {
mut kinematic_friction_translation: Option<&mut Vector<Real>>, mut kinematic_friction_translation: Option<&mut Vector<Real>>,
mut translation_remaining: Option<&mut Vector<Real>>, mut translation_remaining: Option<&mut Vector<Real>>,
) -> bool { ) -> bool {
let prediction = self.offset.eval(dims.y) * 1.2; let prediction = self.predict_ground(dims.y);
// TODO: allow custom dispatchers. // TODO: allow custom dispatchers.
let dispatcher = DefaultQueryDispatcher; let dispatcher = DefaultQueryDispatcher;
@@ -667,7 +671,7 @@ impl KinematicCharacterController {
let up_extent = extents.dot(&self.up); let up_extent = extents.dot(&self.up);
let movement_to_transfer = let movement_to_transfer =
*collision.toi.normal1 * collision.translation_remaining.dot(&collision.toi.normal1); *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. // TODO: allow custom dispatchers.
let dispatcher = DefaultQueryDispatcher; let dispatcher = DefaultQueryDispatcher;