Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix orthographic cluster aabb for spotlight culling #9614

Merged
merged 5 commits into from
Oct 8, 2023
Merged

fix orthographic cluster aabb for spotlight culling #9614

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95b96c1
fix ortho cluster aabb
robtfm Aug 29, 2023
541aec0
account for near plane
robtfm Aug 29, 2023
b0b7436
simplify
robtfm Aug 29, 2023
280f7e3
remove debug
robtfm Aug 29, 2023
b70eb21
fmt
robtfm Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions crates/bevy_pbr/src/light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,20 +1050,12 @@ fn compute_aabb_for_cluster(

// Convert to view space at the cluster near and far planes
// NOTE: 1.0 is the near plane due to using reverse z projections
let p_min = screen_to_view(
screen_size,
inverse_projection,
p_min,
1.0 - (ijk.z / cluster_dimensions.z as f32),
)
.xyz();
let p_max = screen_to_view(
screen_size,
inverse_projection,
p_max,
1.0 - ((ijk.z + 1.0) / cluster_dimensions.z as f32),
)
.xyz();
let mut p_min = screen_to_view(screen_size, inverse_projection, p_min, 0.0).xyz();
let mut p_max = screen_to_view(screen_size, inverse_projection, p_max, 0.0).xyz();

// calculate cluster depth using z_near and z_far
p_min.z = -z_near + (z_near - z_far) * ijk.z / cluster_dimensions.z as f32;
p_max.z = -z_near + (z_near - z_far) * (ijk.z + 1.0) / cluster_dimensions.z as f32;

cluster_min = p_min.min(p_max);
cluster_max = p_min.max(p_max);
Expand Down