From e6035ed998e240bbf7092dd7ead612e766eca0d7 Mon Sep 17 00:00:00 2001 From: Jan Nils Ferner Date: Fri, 27 Jan 2023 00:13:21 +0100 Subject: Reintroduce offset --- src/control/character_controller.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/control/character_controller.rs b/src/control/character_controller.rs index a91e8b4..23dd12c 100644 --- a/src/control/character_controller.rs +++ b/src/control/character_controller.rs @@ -267,7 +267,7 @@ impl KinematicCharacterController { translation_remaining = translation_on_slope; } else { // No slopes or stairs ahead; try to move along obstacle. - let allowed_translation = subtract_hit(translation_remaining, &toi, 0.); + let allowed_translation = subtract_hit(translation_remaining, &toi, offset); result.translation += allowed_translation; translation_remaining -= allowed_translation; } @@ -606,7 +606,7 @@ impl KinematicCharacterController { ) { let [_vertical_slope_translation, horizontal_slope_translation] = self.split_into_components(translation_remaining) - .map(|remaining| subtract_hit(remaining, &hit, 0.)); + .map(|remaining| subtract_hit(remaining, &hit, offset)); let angle_with_floor = self.up.angle(&hit.normal1); @@ -734,6 +734,6 @@ impl KinematicCharacterController { } fn subtract_hit(translation: Vector, hit: &TOI, offset: Real) -> Vector { - let hit_normal = (translation.dot(&hit.normal1) * (1.0 + 0.)).min(0.0); + let hit_normal = (translation.dot(&hit.normal1) * (1.0 + offset)).min(0.0); translation - *hit.normal1 * hit_normal } -- cgit