wathiede/raytracers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtiow: descend both children in BVHTriangles::hit.

Browse Source
This commit is contained in:
Bill Thiede 2023-01-29 09:05:16 -08:00
parent d3dd002883
commit 95827a4a52
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rtiow/renderer/src/bvh_triangles.rs
View File

@ -194,13 +194,15 @@ where
} }
} }
} else { } else {
let hr = self.intersect_bvh(r, node.left_child, t_min, t_max); let r1 = self.intersect_bvh(r, node.left_child, t_min, t_max);
if hr.is_some() { let r2 = self.intersect_bvh(r, node.left_child + 1, t_min, t_max);
return hr; // Merge results, if both hit, take the one closest to the ray origin (smallest t
} // value).
let hr = self.intersect_bvh(r, node.left_child + 1, t_min, t_max); match (&r1, &r2) {
if hr.is_some() { (Some(_), None) => return r1,
return hr; (None, Some(_)) => return r2,
(None, None) => (),
(Some(rp1), Some(rp2)) => return if rp1.t < rp2.t { r1 } else { r2 },
} }
} }
None None
@ -282,7 +284,7 @@ fn ray_triangle_intersect_moller_trumbore(r: Ray, tri: &Triangle) -> Option<RayT
if t > EPSILON { if t > EPSILON {
return Some(RayTriangleResult { return Some(RayTriangleResult {
t, t,
p: r.origin + r.direction * t, p: r.point_at_parameter(t),
}); });
} }
None None