From 1b449fc31df6b9ecb8d339a5ff5fb2c1763a7978 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Wed, 8 Feb 2023 22:17:04 +0100
Subject: Fix faulty snap distance

---
 src/control/character_controller.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/control')

diff --git a/src/control/character_controller.rs b/src/control/character_controller.rs
index 31f19c7..66d2d11 100644
--- a/src/control/character_controller.rs
+++ b/src/control/character_controller.rs
@@ -186,7 +186,6 @@ impl KinematicCharacterController {
             grounded: false,
         };
         let dims = self.compute_dims(character_shape);
-        let offset = self.offset.eval(dims.y);
 
         // 1. Check and fix penetrations.
         self.check_and_fix_penetrations();
@@ -208,6 +207,7 @@ impl KinematicCharacterController {
 
         let mut max_iters = 20;
         let mut kinematic_friction_translation = Vector::zeros();
+        let offset = self.offset.eval(dims.y);
 
         while let Some((translation_dir, translation_dist)) =
             UnitVector::try_new_and_get(translation_remaining, 1.0e-5)
@@ -337,8 +337,7 @@ impl KinematicCharacterController {
                     filter,
                 ) {
                     // Apply the snap.
-                    let snap_distance = hit.toi - offset;
-                    result.translation -= *self.up * snap_distance;
+                    result.translation -= *self.up * (hit.toi - offset).max(0.0);
                     result.grounded = true;
                     return Some((hit_handle, hit));
                 }
-- 
cgit