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 projectile/water interaction

Browse Source
This commit is contained in:
Imbris 2020-09-19 05:16:06 -04:00
parent 017d4a3c16
commit 6cd6a96b64
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,11 +618,13 @@ impl<'a> System<'a> for Sys {
.map(|block_aabb| block_aabb.max.z - pos.0.z); .map(|block_aabb| block_aabb.max.z - pos.0.z);
}, },
Collider::Point => { Collider::Point => {
let (dist, block) = terrain.ray(pos.0, pos.0 + pos_delta).ignore_error().cast(); let (dist, block) = terrain.ray(pos.0, pos.0 + pos_delta)
.until(|vox| !vox.is_air() && !vox.is_fluid())
.ignore_error().cast();
pos.0 += pos_delta.try_normalized().unwrap_or(Vec3::zero()) * dist; pos.0 += pos_delta.try_normalized().unwrap_or(Vec3::zero()) * dist;
// Can't fair since we do ignore_error above // Can't fail since we do ignore_error above
if block.unwrap().is_some() { if block.unwrap().is_some() {
let block_center = pos.0.map(|e| e.floor()) + 0.5; let block_center = pos.0.map(|e| e.floor()) + 0.5;
let block_rpos = (pos.0 - block_center) let block_rpos = (pos.0 - block_center)
@ -650,6 +652,10 @@ impl<'a> System<'a> for Sys {
}); });
} }
} }
physics_state.in_fluid = terrain.get(pos.0.map(|e| e.floor() as i32))
.ok()
.and_then(|vox| vox.is_fluid().then_some(1.0));
}, },
} }