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

Fix indentation

Browse Source
This commit is contained in:
Jan Nils Ferner
2023-01-26 21:43:56 +01:00
parent 3cabe58ac6
commit 9a0757aeae
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/control/character_controller.rs
View File

@@ -262,17 +262,17 @@ impl KinematicCharacterController {
&mut result, &mut result,
up up
)) { )) {
// No stairs, try to move along slopes. // No stairs, try to move along slopes.
if let Some(translation_on_slope) = if let Some(translation_on_slope) =
self.handle_slopes(&toi, &mut translation_remaining, offset) self.handle_slopes(&toi, &mut translation_remaining, offset)
{ {
translation_remaining = translation_on_slope; translation_remaining = translation_on_slope;
} else { } else {
// No slopes or stairs ahead; try to move along obstacles. // No slopes or stairs ahead; try to move along obstacles.
let allowed_translation = subtract_hit(translation_remaining, &toi, offset); let allowed_translation = subtract_hit(translation_remaining, &toi, offset);
result.translation += allowed_translation; result.translation += allowed_translation;
translation_remaining -= allowed_translation; translation_remaining -= allowed_translation;
} }
} }
} else { } else {
@@ -591,6 +591,7 @@ 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(
@@ -603,15 +604,13 @@ impl KinematicCharacterController {
false, false,
filter, filter,
) { ) {
let vertical_translation_remaining = let [_vertical_slope_translation, horizontal_slope_translation] =
*stair_dir * (stair_dir.dot(translation_remaining)); self.split_into_components(translation_remaining)
let horizontal_translation_remaining = .map(|remaining| subtract_hit(remaining, &hit, offset));
*translation_remaining - vertical_translation_remaining;
let sliding_movement = horizontal_translation_remaining
- *hit.normal1 * horizontal_translation_remaining.dot(&hit.normal1);
let angle_with_floor = stair_dir.angle(&hit.normal1); let angle_with_floor = stair_dir.angle(&hit.normal1);
let climbing = stair_dir.dot(&sliding_movement) >= 0.0; let climbing = stair_dir.dot(&horizontal_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.
@@ -619,7 +618,7 @@ impl KinematicCharacterController {
} }
// We can step, we need to find the actual step height. // We can step, we need to find the actual step height.
let step_height = self.offset.eval(dims.y) + max_height let step_height = offset + max_height
- queries - queries
.cast_shape( .cast_shape(
bodies, bodies,
@@ -637,7 +636,7 @@ impl KinematicCharacterController {
// Remove the step height from the vertical part of the self. // Remove the step height from the vertical part of the self.
*translation_remaining -= *translation_remaining -=
*stair_dir * translation_remaining.dot(&stair_dir).clamp(0.0, step_height); *stair_dir * ((translation_remaining.dot(&stair_dir)).clamp(0.0, step_height) + offset);
// 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.