library: render: scene: add progress bar

This commit is contained in:
Bruno BELANYI 2020-03-19 00:16:24 +01:00
parent 7a78326fcf
commit e3ebd1c977

View file

@ -44,22 +44,34 @@ impl Scene {
/// Render the scene into an image. /// Render the scene into an image.
pub fn render(&self) -> RgbImage { pub fn render(&self) -> RgbImage {
let mut image = RgbImage::new(self.camera.film().width(), self.camera.film().height()); let mut image = RgbImage::new(self.camera.film().width(), self.camera.film().height());
let total = (image.width() * image.height()) as u64;
let pb = indicatif::ProgressBar::new(total);
pb.set_draw_delta(total / 10000);
pb.set_style(indicatif::ProgressStyle::default_bar().template(
"{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {percent:>3}%: {pos}/{len} pixels (ETA: {eta})",
));
let pixel_func = if self.aliasing_limit > 0 { let pixel_func = if self.aliasing_limit > 0 {
Self::anti_alias_pixel Self::anti_alias_pixel
} else { } else {
Self::pixel Self::pixel
}; };
rayon::scope(|s| { rayon::scope(|s| {
// FIXME(Bruno): it would go even faster to cut the image in blocks of rows, leading to // FIXME(Bruno): it would go even faster to cut the image in blocks of rows, leading to
// better cache-line behaviour... // better cache-line behaviour...
for (_, row) in image.enumerate_rows_mut() { for (_, row) in image.enumerate_rows_mut() {
s.spawn(|_| { s.spawn(|_| {
for (x, y, pixel) in row { for (x, y, pixel) in row {
*pixel = pixel_func(&self, x as f32, y as f32).into() *pixel = pixel_func(&self, x as f32, y as f32).into();
pb.inc(1);
} }
}) })
} }
}); });
pb.finish();
image image
} }