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 block-hopping with strangely sized blocks

Browse Source
This commit is contained in:
Joshua Barretto 2021-07-25 20:03:17 +01:00
parent 1a081cdc5b
commit 199d56b1db
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1379,7 +1379,7 @@ fn box_voxel_collision<'a, T: BaseVol<Vox = Block> + ReadVol>(
const MAX_ATTEMPTS: usize = 16; const MAX_ATTEMPTS: usize = 16;
// While the player is colliding with the terrain... // While the player is colliding with the terrain...
while let Some((_block_pos, block_aabb, block_height, block)) = while let Some((_block_pos, block_aabb, block)) =
(attempts < MAX_ATTEMPTS).then(|| { (attempts < MAX_ATTEMPTS).then(|| {
// Calculate the player's AABB // Calculate the player's AABB
let player_aabb = Aabb { let player_aabb = Aabb {
@ -1409,14 +1409,13 @@ fn box_voxel_collision<'a, T: BaseVol<Vox = Block> + ReadVol>(
min: block_pos.map(|e| e as f32), min: block_pos.map(|e| e as f32),
max: block_pos.map(|e| e as f32) + Vec3::new(1.0, 1.0, block.solid_height()), max: block_pos.map(|e| e as f32) + Vec3::new(1.0, 1.0, block.solid_height()),
}, },
block.solid_height(),
block, block,
) )
}) })
// Determine whether the block's AABB collides with the player's AABB // Determine whether the block's AABB collides with the player's AABB
.filter(|(_, block_aabb, _, _)| block_aabb.collides_with_aabb(player_aabb)) .filter(|(_, block_aabb, _)| block_aabb.collides_with_aabb(player_aabb))
// Find the maximum of the minimum collision axes (this bit is weird, trust me that it works) // Find the maximum of the minimum collision axes (this bit is weird, trust me that it works)
.min_by_key(|(_, block_aabb, _, _)| { .min_by_key(|(_, block_aabb, _)| {
ordered_float::OrderedFloat((block_aabb.center() - player_aabb.center() - Vec3::unit_z() * 0.5) ordered_float::OrderedFloat((block_aabb.center() - player_aabb.center() - Vec3::unit_z() * 0.5)
.map(f32::abs) .map(f32::abs)
.sum()) .sum())
@ -1480,7 +1479,7 @@ 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.max(block_aabb.max.z);
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 // 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) { if (vel.0 * resolve_dir).xy().magnitude_squared() < 1.0f32.powi(2) {