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

Fix to occlusion culling where all math is based on Euclidean distance. #98257

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Fix to occlusion culling where all math is based on Euclidean distance. #98257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions modules/raycast/raycast_occlusion_cull.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,7 @@ void RaycastOcclusionCull::RaycastHZBuffer::sort_rays(const Vector3 &p_camera_di
}
int k = tile_i * TILE_SIZE + tile_j;
int tile_index = i * tile_grid_size.x + j;
float d = camera_rays[tile_index].ray.tfar[k];

if (!p_orthogonal) {
const float &dir_x = camera_rays[tile_index].ray.dir_x[k];
const float &dir_y = camera_rays[tile_index].ray.dir_y[k];
const float &dir_z = camera_rays[tile_index].ray.dir_z[k];
float cos_theta = p_camera_dir.x * dir_x + p_camera_dir.y * dir_y + p_camera_dir.z * dir_z;
d *= cos_theta;
}

mips[0][y * buffer_size.x + x] = d;
mips[0][y * buffer_size.x + x] = camera_rays[tile_index].ray.tfar[k];
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion servers/rendering/renderer_scene_occlusion_cull.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class RendererSceneOcclusionCull {
return false;
}

float min_depth = -closest_point_view.z * 0.95f;
float min_depth = (closest_point - p_cam_position).length();

Vector2 rect_min = Vector2(FLT_MAX, FLT_MAX);
Vector2 rect_max = Vector2(FLT_MIN, FLT_MIN);
Expand All @@ -83,6 +83,10 @@ class RendererSceneOcclusionCull {
Vector3 corner = Vector3(p_bounds[0] * c.x + p_bounds[3] * nc.x, p_bounds[1] * c.y + p_bounds[4] * nc.y, p_bounds[2] * c.z + p_bounds[5] * nc.z);
Vector3 view = p_cam_inv_transform.xform(corner);

if (p_cam_projection.is_orthogonal()) {
min_depth = MIN(min_depth, view.z);
}

Plane vp = Plane(view, 1.0);
Plane projected = p_cam_projection.xform4(vp);

Expand Down
Loading