Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for clipping

Browse Source
This commit is contained in:
Joshua Barretto 2019-07-09 15:07:53 +01:00
parent 9f6f9cb25f
commit bbd7f579d2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/sys/phys.rs
View File

@ -219,7 +219,7 @@ impl<'a> System<'a> for Sys {
pos.0 += pos_delta / increments;
// While the player is colliding with the terrain...
while collision_with(pos.0, near_iter.clone()) && attempts < 12 {
while collision_with(pos.0, near_iter.clone()) && attempts < 16 {
// Calculate the player's AABB
let player_aabb = Aabb {
min: pos.0 + Vec3::new(-player_rad, -player_rad, 0.0),
@ -279,7 +279,7 @@ impl<'a> System<'a> for Sys {
// When the resolution direction is non-vertical, we must be colliding with a wall
// If the space above is free...
if !collision_with(pos.0 + Vec3::unit_z() * 1.1, near_iter.clone())
if !collision_with(Vec3::new(pos.0.x, pos.0.y, (pos.0.z + 0.1).ceil()), near_iter.clone())
// ...and we're being pushed out horizontally...
&& resolve_dir.z == 0.0
// ...and the vertical resolution direction is sufficiently great...
@ -300,26 +300,26 @@ impl<'a> System<'a> for Sys {
on_ground = true;
break;
} else {
// Resolve the collision normally
pos.0 += resolve_dir;
// Correct the velocity
vel.0 = vel.0.map2(
resolve_dir,
|e, d| if d * e.signum() < 0.0 { 0.0 } else { e },
);
}
// Resolve the collision normally
pos.0 += resolve_dir;
attempts += 1;
}
}
if on_ground {
let _ = on_grounds.insert(entity, OnGround);
}
// If the space below us is free, then "snap" to the ground
if collision_with(pos.0 - Vec3::unit_z() * 1.05, near_iter.clone())
} else if collision_with(pos.0 - Vec3::unit_z() * 1.05, near_iter.clone())
&& vel.0.z < 0.0
&& vel.0.z > -3.0
&& vel.0.z > -1.5
&& was_on_ground
{
pos.0.z = (pos.0.z - 0.05).floor();