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

Revert grounded checks to not be grounded by default again

Browse Source
This commit is contained in:
Jan Hohenheim
2023-02-04 19:55:05 +01:00
parent b461d028df
commit 7a2759c52f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/control/character_controller.rs
View File

@@ -376,7 +376,7 @@ impl KinematicCharacterController {
.compute_aabb(character_pos) .compute_aabb(character_pos)
.loosened(prediction); .loosened(prediction);
let mut grounded = true; let mut grounded = false;
queries.colliders_with_aabb_intersecting_aabb(&character_aabb, |handle| { queries.colliders_with_aabb_intersecting_aabb(&character_aabb, |handle| {
if let Some(collider) = colliders.get(*handle) { if let Some(collider) = colliders.get(*handle) {
@@ -404,9 +404,10 @@ impl KinematicCharacterController {
for m in &manifolds { for m in &manifolds {
let normal = -(character_pos * m.local_n1); let normal = -(character_pos * m.local_n1);
if normal.dot(&self.up) <= 1.0e-5 { if normal.dot(&self.up) >= -1.0e-5 {
grounded = false; grounded = true;
} }
if let Some(kinematic_parent) = kinematic_parent { if let Some(kinematic_parent) = kinematic_parent {
let mut num_active_contacts = 0; let mut num_active_contacts = 0;
let mut manifold_center = Point::origin(); let mut manifold_center = Point::origin();
@@ -451,9 +452,13 @@ impl KinematicCharacterController {
for m in &manifolds { for m in &manifolds {
let normal = character_pos * m.local_n1; let normal = character_pos * m.local_n1;
if normal.dot(&self.up) >= -1.0e-5 { if normal.dot(&self.up) <= 1.0e-5 {
grounded = false; for contact in &m.points {
return false; // We can stop the search early. if contact.dist <= prediction {
grounded = true;
return false; // We can stop the search early.
}
}
} }
} }
} }