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-master-patch-82733' into 'master'

Browse Source 
Fixed non-character point lights

See merge request veloren/veloren!2959
This commit is contained in:
Joshua Barretto 2021-10-25 13:44:24 +00:00
commit 8e8d1a6624
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
voxygen/src/scene/mod.rs
View File

@ -560,7 +560,11 @@ impl Scene {
.state .state
.ecs() .ecs()
.read_storage::<comp::LightAnimation>(), .read_storage::<comp::LightAnimation>(),
&scene_data.state.ecs().read_storage::<comp::Health>(), scene_data
.state
.ecs()
.read_storage::<comp::Health>()
.maybe(),
) )
.join() .join()
.filter(|(pos, _, light_anim, h)| { .filter(|(pos, _, light_anim, h)| {
@ -568,7 +572,7 @@ impl Scene {
&& light_anim.strength > 0.0 && light_anim.strength > 0.0
&& (pos.0.distance_squared(player_pos) as f32) && (pos.0.distance_squared(player_pos) as f32)
< loaded_distance.powi(2) + LIGHT_DIST_RADIUS < loaded_distance.powi(2) + LIGHT_DIST_RADIUS
&& !h.is_dead && h.map_or(true, |h| !h.is_dead)
}) })
.map(|(pos, interpolated, light_anim, _)| { .map(|(pos, interpolated, light_anim, _)| {
// Use interpolated values if they are available // Use interpolated values if they are available