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

Fix uncontrolled sliding

Browse Source
This commit is contained in:
Jan Nils Ferner
2023-01-27 15:50:41 +01:00
parent 247ed510b4
commit fa9ab6c2bc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/control/character_controller.rs
View File

@@ -485,8 +485,10 @@ impl KinematicCharacterController {
translation_remaining: &Vector<Real>, translation_remaining: &Vector<Real>,
offset: Real, offset: Real,
) -> Option<Vector<Real>> { ) -> Option<Vector<Real>> {
let [vertical_translation, horizontal_translation] =
self.split_into_components(translation_remaining);
let [vertical_slope_translation, horizontal_slope_translation] = let [vertical_slope_translation, horizontal_slope_translation] =
self.split_into_components(translation_remaining) [vertical_translation, horizontal_translation]
.map(|remaining| subtract_hit(remaining, hit, offset)); .map(|remaining| subtract_hit(remaining, hit, offset));
let slope_translation = horizontal_slope_translation + vertical_slope_translation; let slope_translation = horizontal_slope_translation + vertical_slope_translation;
@@ -496,10 +498,10 @@ impl KinematicCharacterController {
climbing climbing
.then(||(angle_with_floor <= self.max_slope_climb_angle) // Are we allowed to climb? .then(||(angle_with_floor <= self.max_slope_climb_angle) // Are we allowed to climb?
.then_some(slope_translation)) .then_some(horizontal_translation ))
.unwrap_or_else(|| (angle_with_floor >= self.min_slope_slide_angle)// Are we allowed to slide? .unwrap_or_else(|| (angle_with_floor >= self.min_slope_slide_angle)// Are we allowed to slide?
.then_some(slope_translation) .then_some(slope_translation )
.unwrap_or(horizontal_slope_translation) .unwrap_or(horizontal_translation)
.into()) .into())
} }