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

Cut off invalid values

Browse Source
This commit is contained in:
Jan Nils Ferner
2023-01-26 20:37:34 +01:00
parent 83a9c08b2c
commit ecd57a6519
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/control/character_controller.rs
View File

@@ -271,11 +271,7 @@ impl KinematicCharacterController {
println!("[stair] translation_remaining: {translation_remaining:?}"); println!("[stair] translation_remaining: {translation_remaining:?}");
// No slopes or stairs ahead; try to move along obstacles. // No slopes or stairs ahead; try to move along obstacles.
let allowed_translation: Vector<Real> = let allowed_translation = subtract_hit(translation_remaining, &toi, offset);
self.split_into_components(&translation_remaining)
.map(|remaining| subtract_hit(remaining, &toi, offset))
.into_iter()
.sum();
result.translation += allowed_translation; result.translation += allowed_translation;
translation_remaining -= allowed_translation; translation_remaining -= allowed_translation;
@@ -740,5 +736,5 @@ impl KinematicCharacterController {
} }
fn subtract_hit(translation: Vector<Real>, hit: &TOI, offset: Real) -> Vector<Real> { fn subtract_hit(translation: Vector<Real>, hit: &TOI, offset: Real) -> Vector<Real> {
translation - *hit.normal1 * (translation).dot(&hit.normal1) * (1.0 + offset) translation - *hit.normal1 * ((translation).dot(&hit.normal1) * (1.0 + offset)).min(0.0)
} }