forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spotlight shadow bugfix (#5451)

Browse Source 
# Objective

fix an error in shadow map indexing that occurs when point lights without shadows are used in conjunction with spotlights with shadows

## Solution

calculate point_light_count correctly
This commit is contained in:
robtfm 2022-07-25 16:24:54 +00:00
parent d4787111a3
commit 6a1ba9c456
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/bevy_pbr/src/render/light.rs
View File

@ -797,10 +797,14 @@ pub fn prepare_lights(
let point_light_count = point_lights let point_light_count = point_lights
.iter() .iter()
.filter(|light| light.1.shadows_enabled && light.1.spot_light_angles.is_none()) .filter(|light| light.1.spot_light_angles.is_none())
.count(); .count();
let point_light_shadow_maps_count = point_light_count.min(max_texture_cubes); let point_light_shadow_maps_count = point_lights
.iter()
.filter(|light| light.1.shadows_enabled && light.1.spot_light_angles.is_none())
.count()
.min(max_texture_cubes);
let directional_shadow_maps_count = directional_lights let directional_shadow_maps_count = directional_lights
.iter() .iter()
@ -970,7 +974,7 @@ pub fn prepare_lights(
n_directional_lights: directional_lights.iter().len() as u32, n_directional_lights: directional_lights.iter().len() as u32,
// spotlight shadow maps are stored in the directional light array, starting at directional_shadow_maps_count. // spotlight shadow maps are stored in the directional light array, starting at directional_shadow_maps_count.
// the spot lights themselves start in the light array at point_light_count. so to go from light // the spot lights themselves start in the light array at point_light_count. so to go from light
// index to shadow map index, we need to subtract point light shadowmap count and add directional shadowmap count. // index to shadow map index, we need to subtract point light count and add directional shadowmap count.
spot_light_shadowmap_offset: directional_shadow_maps_count as i32 spot_light_shadowmap_offset: directional_shadow_maps_count as i32
- point_light_count as i32, - point_light_count as i32,
}; };
@ -1045,7 +1049,7 @@ pub fn prepare_lights(
let spot_view_transform = spot_view_matrix.into(); let spot_view_transform = spot_view_matrix.into();
let angle = light.spot_light_angles.expect("lights should be sorted so that \ let angle = light.spot_light_angles.expect("lights should be sorted so that \
[point_light_shadow_maps_count..point_light_shadow_maps_count + spot_light_shadow_maps_count] are spot lights").1; [point_light_count..point_light_count + spot_light_shadow_maps_count] are spot lights").1;
let spot_projection = spot_light_projection_matrix(angle); let spot_projection = spot_light_projection_matrix(angle);
let depth_texture_view = let depth_texture_view =