From 552fd4751a77eb1e8ee9c4a061b5a6dd83dab091 Mon Sep 17 00:00:00 2001
From: ntibi <ntibi@protonmail.com>
Date: Sat, 9 Dec 2023 17:08:45 +0100
Subject: [PATCH 1/2] add reaply_lost_speed to KinematicCharacterController

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

diff --git a/src/control/character_controller.rs b/src/control/character_controller.rs
index 230b1eb18..50aec93a6 100644
--- a/src/control/character_controller.rs
+++ b/src/control/character_controller.rs
@@ -128,6 +128,9 @@ pub struct KinematicCharacterController {
     pub offset: CharacterLength,
     /// Should the character try to slide against the floor if it hits it?
     pub slide: bool,
+    /// Should the speed lost because of collisions be applied to the final direction ?
+    /// Useless if sliding is not enabled
+    pub reapply_lost_speed: bool,
     /// Should the character automatically step over small obstacles? (disabled by default)
     ///
     /// Note that autostepping is currently a very computationally expensive feature, so it
@@ -160,6 +163,7 @@ impl Default for KinematicCharacterController {
             offset: CharacterLength::Relative(0.01),
             slide: true,
             autostep: None,
+            reapply_lost_speed: false,
             max_slope_climb_angle: Real::frac_pi_4(),
             min_slope_slide_angle: Real::frac_pi_4(),
             snap_to_ground: Some(CharacterLength::Relative(0.2)),
@@ -290,8 +294,8 @@ impl KinematicCharacterController {
                 });
 
                 let hit_info = self.compute_hit_info(hit);
-
-                // Try to go upstairs.
+                let pre_slide_translation_remaining = translation_remaining;
+                // Try to go up stairs.
                 if !self.handle_stairs(
                     bodies,
                     colliders,
@@ -314,6 +318,17 @@ impl KinematicCharacterController {
                         &mut result,
                     );
                 }
+                if self.slide && self.reapply_lost_speed {
+                    let diff =
+                        pre_slide_translation_remaining.norm() - translation_remaining.norm();
+                    if let Some((normalized_dir, _)) =
+                        // threshold has to be > subtract_hit hardcoded correction, if not, we get made up movement in the direction of the hit normal
+                        UnitVector::try_new_and_get(translation_remaining, 1.0e-4)
+                    {
+                        // reapply the lost speed (but in the corrected direction)
+                        translation_remaining += *normalized_dir * diff;
+                    }
+                }
             } else {
                 // No interference along the path.
                 result.translation += translation_remaining;

From a12b5524f253fab633afad2a710e051d2a16488a Mon Sep 17 00:00:00 2001
From: ntibi <ntibi@protonmail.com>
Date: Sat, 3 Aug 2024 13:43:09 +0200
Subject: [PATCH 2/2] fix rebase

---
 src/control/character_controller.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/control/character_controller.rs b/src/control/character_controller.rs
index 50aec93a6..e43f6532e 100644
--- a/src/control/character_controller.rs
+++ b/src/control/character_controller.rs
@@ -295,7 +295,7 @@ impl KinematicCharacterController {
 
                 let hit_info = self.compute_hit_info(hit);
                 let pre_slide_translation_remaining = translation_remaining;
-                // Try to go up stairs.
+                // Try to go upstairs.
                 if !self.handle_stairs(
                     bodies,
                     colliders,