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

Merge branch 'zesterer/small-fixes' into 'master'

Browse Source 
Fix block snapping at low TPS, account for FP imprecision in block-hopping

See merge request veloren/veloren!2164
This commit is contained in:
Joshua Barretto
2021-04-20 14:58:40 +00:00
parent 65c850625f 056fa96a58
commit e8e5cb84a6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -671,6 +671,7 @@ impl<'a> PhysicsData<'a> {
let mut tgt_pos = pos.0 + pos_delta; let mut tgt_pos = pos.0 + pos_delta;
let was_on_ground = physics_state.on_ground; let was_on_ground = physics_state.on_ground;
let block_snap = body.map_or(false, |body| body.jump_impulse().is_some()); let block_snap = body.map_or(false, |body| body.jump_impulse().is_some());
let climbing = let climbing =
character_state.map_or(false, |cs| matches!(cs, CharacterState::Climb(_))); character_state.map_or(false, |cs| matches!(cs, CharacterState::Climb(_)));
@ -1316,6 +1317,10 @@ fn box_voxel_collision<'a, T: BaseVol<Vox = Block> + ReadVol>(
// ...block-hop! // ...block-hop!
pos.0.z = (pos.0.z + 0.1).floor() + block_height; pos.0.z = (pos.0.z + 0.1).floor() + block_height;
vel.0.z = vel.0.z.max(0.0); vel.0.z = vel.0.z.max(0.0);
// Push the character on to the block very slightly to avoid jitter due to imprecision
if (vel.0 * resolve_dir).xy().magnitude_squared() < 1.0f32.powi(2) {
pos.0 -= resolve_dir.normalized() * 0.05;
}
on_ground = true; on_ground = true;
break; break;
} else { } else {
@ -1357,8 +1362,8 @@ fn box_voxel_collision<'a, T: BaseVol<Vox = Block> + ReadVol>(
near_iter.clone(), near_iter.clone(),
radius, radius,
z_range.clone(), z_range.clone(),
) && vel.0.z < 0.25 ) && vel.0.z <= 0.0
&& vel.0.z > -1.5 && was_on_ground
&& block_snap && block_snap
{ {
let snap_height = terrain let snap_height = terrain