Skip to content
Snippets Groups Projects
Commit 8cd82904 authored by JamesPerlman's avatar JamesPerlman
Browse files

minor refactor

parent 3aa777a7
No related branches found
No related tags found
No related merge requests found
...@@ -303,15 +303,14 @@ inline NGP_HOST_DEVICE Ray pixel_to_ray( ...@@ -303,15 +303,14 @@ inline NGP_HOST_DEVICE Ray pixel_to_ray(
dir = camera_matrix.block<3, 3>(0, 0) * dir; dir = camera_matrix.block<3, 3>(0, 0) * dir;
Eigen::Vector3f origin = camera_matrix.block<3, 3>(0, 0) * head_pos + camera_matrix.col(3); Eigen::Vector3f origin = camera_matrix.block<3, 3>(0, 0) * head_pos + camera_matrix.col(3);
if (aperture_size == 0.0f) {
origin += dir * near_distance; if (aperture_size > 0.0f) {
return {origin, dir}; Eigen::Vector3f lookat = origin + dir * focus_z;
Eigen::Vector2f blur = aperture_size * square2disk_shirley(ld_random_val_2d(spp, (uint32_t)pixel.x() * 19349663 + (uint32_t)pixel.y() * 96925573) * 2.0f - Eigen::Vector2f::Ones());
origin += camera_matrix.block<3, 2>(0, 0) * blur;
dir = (lookat - origin) / focus_z;
} }
Eigen::Vector3f lookat = origin + dir * focus_z;
Eigen::Vector2f blur = aperture_size * square2disk_shirley(ld_random_val_2d(spp, (uint32_t)pixel.x() * 19349663 + (uint32_t)pixel.y() * 96925573) * 2.0f - Eigen::Vector2f::Ones());
origin += camera_matrix.block<3, 2>(0, 0) * blur;
dir = (lookat - origin) / focus_z;
origin += dir * near_distance; origin += dir * near_distance;
return {origin, dir}; return {origin, dir};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment