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

Simplify slope code

Browse Source
This commit is contained in:
Jan Nils Ferner
2023-01-26 19:09:50 +01:00
parent 615b7fbf6f
commit 000c759b78
1 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/control/character_controller.rs
View File

@@ -488,50 +488,23 @@ impl KinematicCharacterController {
// climb/slide down movement is decided by that translation. // climb/slide down movement is decided by that translation.
// - If there is no horizontal translation, then we only have gravity. In that case, // - If there is no horizontal translation, then we only have gravity. In that case,
// we take the vertical movement into account to decide if we need to slide down. // we take the vertical movement into account to decide if we need to slide down.
let sliding_translation_remaining = if horizontal_translation_remaining != Vector::zeros() { let sliding_translation_remaining =
println!("[slope] horizontal_translation_remaining: {horizontal_translation_remaining:?}"); translation_remaining
horizontal_translation_remaining - *hit.normal1 * (translation_remaining).dot(&hit.normal1);
- *hit.normal1 * (horizontal_translation_remaining).dot(&hit.normal1) + vertical_translation_remaining
} else { println!("[slope] sliding_translation_remaining: {sliding_translation_remaining:?}");
println!("[slope] vertical_translation_remaining: {vertical_translation_remaining:?}");
vertical_translation_remaining
- *hit.normal1 * (vertical_translation_remaining).dot(&hit.normal1)
};
// Check if there is a slope we can climb. // Check if there is a slope we can climb.
let angle_with_floor = self.up.angle(&hit.normal1); let angle_with_floor = self.up.angle(&hit.normal1);
let climbing = self.up.dot(&sliding_translation_remaining) >= 0.0; let climbing = self.up.dot(&sliding_translation_remaining) >= 0.0;
if !climbing { climbing
// Moving down the slope. .then(||(angle_with_floor <= self.max_slope_climb_angle)
let remaining = if angle_with_floor >= self.min_slope_slide_angle { .then_some((Some(sliding_translation_remaining), angle_with_floor))
// Can slide down. .unwrap_or((None, angle_with_floor)))
sliding_translation_remaining .unwrap_or_else(|| (angle_with_floor >= self.min_slope_slide_angle)
} else { .then_some((Some(sliding_translation_remaining), -angle_with_floor))
// To avoid sliding down, we remove the sliding component due to the vertical .unwrap_or((Some(horizontal_translation_remaining), -angle_with_floor)))
// part of the movement but have to keep the component due to the horizontal
// part of the self.
println!("[slope] Can't slide down.");
*translation_remaining
- (*hit.normal1 * horizontal_translation_remaining.dot(&hit.normal1)
+ vertical_translation_remaining)
// Remove the complete vertical part.
};
(Some(remaining), -angle_with_floor)
} else {
// Moving up the slope.
let remaining = if angle_with_floor <= self.max_slope_climb_angle {
// Let’s climb by cancelling from the desired movement the part that
// doesn’t line up with the slope, and continuing the loop.
Some(sliding_translation_remaining)
} else {
// The slope was too steep.
None
};
(remaining, angle_with_floor)
}
} }
fn handle_stairs( fn handle_stairs(