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

Remove eye height check for beam

Browse Source
This commit is contained in:
Joshua Barretto 2021-03-22 14:55:24 +00:00 committed by Marcel Märtens
parent 695f6c52fe
commit 456ceab6d0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/sys/src/beam.rs
View File

@ -68,11 +68,10 @@ impl<'a> System<'a> for Sys {
&read_data.entities, &read_data.entities,
&read_data.positions, &read_data.positions,
&read_data.orientations, &read_data.orientations,
read_data.bodies.maybe(),
&beam_segments, &beam_segments,
) )
.par_join() .par_join()
.fold(|| (Vec::new(), Vec::new()), |(mut server_events, mut add_hit_entities), (entity, pos, ori, body, beam_segment)| .fold(|| (Vec::new(), Vec::new()), |(mut server_events, mut add_hit_entities), (entity, pos, ori, beam_segment)|
{ {
let creation_time = match beam_segment.creation { let creation_time = match beam_segment.creation {
Some(time) => time, Some(time) => time,
@ -116,8 +115,6 @@ impl<'a> System<'a> for Sys {
return (server_events, add_hit_entities); return (server_events, add_hit_entities);
}; };
let eye_pos = pos.0 + Vec3::unit_z() * body.map_or(0.0, |b| b.eye_height());
// Go through all other effectable entities // Go through all other effectable entities
for (target, uid_b, pos_b, health_b, body_b) in ( for (target, uid_b, pos_b, health_b, body_b) in (
&read_data.entities, &read_data.entities,
@ -142,13 +139,13 @@ impl<'a> System<'a> for Sys {
let hit = entity != target let hit = entity != target
&& !health_b.is_dead && !health_b.is_dead
// Collision shapes // Collision shapes
&& sphere_wedge_cylinder_collision(eye_pos, frame_start_dist, frame_end_dist, *ori.look_dir(), beam_segment.angle, pos_b.0, rad_b, height_b); && sphere_wedge_cylinder_collision(pos.0, frame_start_dist, frame_end_dist, *ori.look_dir(), beam_segment.angle, pos_b.0, rad_b, height_b);
// Finally, ensure that a hit has actually occurred by performing a raycast. We do this last because // Finally, ensure that a hit has actually occurred by performing a raycast. We do this last because
// it's likely to be the most expensive operation. // it's likely to be the most expensive operation.
let tgt_dist = eye_pos.distance(pos_b.0); let tgt_dist = pos.0.distance(pos_b.0);
let hit = hit && read_data.terrain let hit = hit && read_data.terrain
.ray(eye_pos, eye_pos + *ori.look_dir() * (tgt_dist + 1.0)) .ray(pos.0, pos.0 + *ori.look_dir() * (tgt_dist + 1.0))
.until(|b| b.is_filled()) .until(|b| b.is_filled())
.cast().0 >= tgt_dist; .cast().0 >= tgt_dist;