move status printing into render_frame

Author: Peter Aarestad

src/main.rs

@@ -65,6 +65,7 @@ fn main() -> anyhow::Result<()> {
     .expect("standalone render should not be cancelled");
 
     let mut image = RgbImage::new(world.image_width, world.image_height);
+
     for (flipped_y, row) in &rows {
         for (x, pixel_color) in row.iter().enumerate() {
             image.put_pixel(
@@ -73,7 +74,6 @@ fn main() -> anyhow::Result<()> {
                 pixel_color.to_image_rgbu8(world.samples_per_pixel),
             );
         }
-        println!("{} / {} scanlines done", image.height() - flipped_y, world.image_height);
     }
 
     ImageRgb8(image).save("output.png")?;

src/util/render.rs

@@ -101,13 +101,14 @@ pub fn render_frame(
     drop(tx);
 
     let mut rows = Vec::with_capacity(render_h as usize);
-    for item in rx.iter() {
+    for (idx, row) in rx.iter().enumerate() {
         if let Some((ref generation, expected)) = cancel
             && generation.load(Ordering::Acquire) != expected
         {
             return None;
         }
-        rows.push(item);
+        rows.push(row);
+        println!("{} / {} scanlines done", idx,  world.image_height);
     }
 
     if cancel.is_none_or(|(generation, expected)| generation.load(Ordering::Acquire) == expected) {