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

Fix erroneous sliding

Browse Source
This commit is contained in:
Jan Hohenheim
2023-02-05 02:18:43 +01:00
parent 4ed3adda6e
commit fac561c902
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/control/character_controller.rs
View File

@@ -499,16 +499,20 @@ impl KinematicCharacterController {
let angle_with_floor = self.up.angle(&hit.normal1); let angle_with_floor = self.up.angle(&hit.normal1);
let climbing = self.up.dot(&slope_translation) >= 0.0; let climbing = self.up.dot(&slope_translation) >= 0.0;
if climbing { climbing
// Are we allowed to climb? .then(|| {
(angle_with_floor <= self.max_slope_climb_angle).then_some(slope_translation) (angle_with_floor <= self.max_slope_climb_angle) // Are we allowed to climb?
} .then_some(horizontal_translation)
// Are we forced to slide? })
else if angle_with_floor >= self.min_slope_slide_angle { .unwrap_or_else(|| {
slope_translation.into() // Are we allowed to slide?
} else { if angle_with_floor >= self.min_slope_slide_angle {
horizontal_translation.into() slope_translation
} } else {
horizontal_translation
}
.into()
})
} }
fn split_into_components(&self, translation: &Vector<Real>) -> [Vector<Real>; 2] { fn split_into_components(&self, translation: &Vector<Real>) -> [Vector<Real>; 2] {