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

Fix code inconsistencies

Browse Source
This commit is contained in:
Jan Nils Ferner
2023-01-27 23:58:21 +01:00
parent e7cb9bea2f
commit 337a963ce3
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/control/character_controller.rs
View File

@@ -356,7 +356,7 @@ impl KinematicCharacterController {
} }
fn predict_ground(&self, up_extends: Real) -> Real { fn predict_ground(&self, up_extends: Real) -> Real {
self.offset.eval(up_extends) * 3. self.offset.eval(up_extends) * 1.4
} }
fn detect_grounded_status_and_apply_friction( fn detect_grounded_status_and_apply_friction(
@@ -532,8 +532,10 @@ impl KinematicCharacterController {
Some(autostep) => autostep, Some(autostep) => autostep,
None => return false, None => return false,
}; };
let min_width = autostep.min_width.eval(dims.x);
let max_height = autostep.max_height.eval(dims.y); let offset = self.offset.eval(dims.y);
let min_width = autostep.min_width.eval(dims.x) + offset;
let max_height = autostep.max_height.eval(dims.y) + offset;
if !autostep.include_dynamic_bodies { if !autostep.include_dynamic_bodies {
if colliders if colliders
@@ -592,7 +594,6 @@ impl KinematicCharacterController {
return false; return false;
} }
let offset = self.offset.eval(dims.y);
// Check that we are not getting into a ramp that is too steep // Check that we are not getting into a ramp that is too steep
// after stepping. // after stepping.
if let Some((_, hit)) = queries.cast_shape( if let Some((_, hit)) = queries.cast_shape(
@@ -605,13 +606,15 @@ impl KinematicCharacterController {
false, false,
filter, filter,
) { ) {
let [_vertical_slope_translation, horizontal_slope_translation] = let [vertical_slope_translation, horizontal_slope_translation] =
self.split_into_components(translation_remaining) self.split_into_components(translation_remaining)
.map(|remaining| subtract_hit(remaining, &hit, offset)); .map(|remaining| subtract_hit(remaining, &hit, offset));
let slope_translation = horizontal_slope_translation + vertical_slope_translation;
let angle_with_floor = self.up.angle(&hit.normal1); let angle_with_floor = self.up.angle(&hit.normal1);
let climbing = self.up.dot(&horizontal_slope_translation) >= 0.0; let climbing = self.up.dot(&slope_translation) >= 0.0;
if climbing && angle_with_floor > self.max_slope_climb_angle { if climbing && angle_with_floor > self.max_slope_climb_angle {
return false; // The target ramp is too steep. return false; // The target ramp is too steep.
@@ -636,16 +639,16 @@ impl KinematicCharacterController {
.unwrap_or(max_height); .unwrap_or(max_height);
// Remove the step height from the vertical part of the self. // Remove the step height from the vertical part of the self.
*translation_remaining -= let step = *self.up * step_height;
*self.up * ((translation_remaining.dot(&self.up)).clamp(0.0, step_height)); *translation_remaining -= step;
// Advance the collider on the step horizontally, to make sure further // Advance the collider on the step horizontally, to make sure further
// movement won’t just get stuck on its edge. // movement won’t just get stuck on its edge.
let horizontal_nudge = let horizontal_nudge =
horizontal_dir * min_width.min(horizontal_dir.dot(translation_remaining)); horizontal_dir * horizontal_dir.dot(translation_remaining).min(min_width);
*translation_remaining -= horizontal_nudge; *translation_remaining -= horizontal_nudge;
result.translation += *self.up * step_height + horizontal_nudge; result.translation += step + horizontal_nudge;
return true; return true;
} }