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

Fix spot light shadow glitches (#19273)

Browse Source 
# Objective

Spot light shadows are still broken after fixing point lights in #19265

## Solution

Fix spot lights in the same way, just using the spot light specific
visible entities component. I also changed the query to be directly in
the render world instead of being extracted to be more accurate.

## Testing

Tested with the same code but changing `PointLight` to `SpotLight`.
This commit is contained in:
Eero Lehtinen 2025-05-19 22:42:09 +03:00 committed by François Mockers
parent aab1ae8457
commit 125fbb05d3
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,17 @@ pub fn extract_lights(
point_light_shadow_map: Extract<Res<PointLightShadowMap>>, point_light_shadow_map: Extract<Res<PointLightShadowMap>>,
directional_light_shadow_map: Extract<Res<DirectionalLightShadowMap>>, directional_light_shadow_map: Extract<Res<DirectionalLightShadowMap>>,
global_visible_clusterable: Extract<Res<GlobalVisibleClusterableObjects>>, global_visible_clusterable: Extract<Res<GlobalVisibleClusterableObjects>>,
cubemap_visible_entities: Extract<Query<RenderEntity, With<CubemapVisibleEntities>>>, previous_point_lights: Query<
Entity,
(
With<RenderCubemapVisibleEntities>,
With<ExtractedPointLight>,
),
>,
previous_spot_lights: Query<
Entity,
(With<RenderVisibleMeshEntities>, With<ExtractedPointLight>),
>,
point_lights: Extract< point_lights: Extract<
Query<( Query<(
Entity, Entity,
@ -278,14 +288,20 @@ pub fn extract_lights(
commands.insert_resource(directional_light_shadow_map.clone()); commands.insert_resource(directional_light_shadow_map.clone());
} }
// Clear previous visible entities for all cubemapped lights as they might not be in the // Clear previous visible entities for all point/spot lights as they might not be in the
// `global_visible_clusterable` list anymore. // `global_visible_clusterable` list anymore.
commands.try_insert_batch( commands.try_insert_batch(
cubemap_visible_entities previous_point_lights
.iter() .iter()
.map(|render_entity| (render_entity, RenderCubemapVisibleEntities::default())) .map(|render_entity| (render_entity, RenderCubemapVisibleEntities::default()))
.collect::<Vec<_>>(), .collect::<Vec<_>>(),
); );
commands.try_insert_batch(
previous_spot_lights
.iter()
.map(|render_entity| (render_entity, RenderVisibleMeshEntities::default()))
.collect::<Vec<_>>(),
);
// This is the point light shadow map texel size for one face of the cube as a distance of 1.0 // This is the point light shadow map texel size for one face of the cube as a distance of 1.0
// world unit from the light. // world unit from the light.