ambroisie/pathtracer
ambroisie/pathtracer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

library: render: pathtracer: use map_or_else

Browse source
This commit is contained in:
Bruno BELANYI 2020-04-06 15:07:43 +02:00
parent 482e6bea3f
commit c1801a7a78
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pathtracer/src/render/pathtrace/pathtracer.rs
View file

@ -59,11 +59,12 @@ impl Pathtracer {
fn pixel_ray(&self, x: f32, y: f32) -> LinearColor { fn pixel_ray(&self, x: f32, y: f32) -> LinearColor {
let (x, y) = self.scene.camera.film().pixel_ratio(x, y); let (x, y) = self.scene.camera.film().pixel_ratio(x, y);
let ray = self.scene.camera.ray_with_ratio(x, y); let ray = self.scene.camera.ray_with_ratio(x, y);
if let Some(_) = self.cast_ray(ray) { self.cast_ray(ray).map_or_else(
LinearColor::new(1., 1., 1.) // FIXME: calculate real color || self.scene.background.clone(),
} else { |(t, obj)| {
LinearColor::black() LinearColor::new(1., 1., 1.) // FIXME: calculate real color
} },
)
} }
fn cast_ray(&self, ray: Ray) -> Option<(f32, &Object)> { fn cast_ray(&self, ray: Ray) -> Option<(f32, &Object)> {