Display current frame in progress bar

Author: j-miet

PixelRay/Output/Progress/ProgressBar.cs

@@ -11,7 +11,14 @@ public void Update(RenderProgress p)
     {
         int filled = (int)(p.Percent * _width);
 
-        Console.Write("\r[");
+        if (p.Frame >= 0)
+        {
+            Console.Write($"\rFrame {p.Frame} ");
+            Console.Write("[");
+        }
+        else
+            Console.Write("\r[");
+
         Console.Write(new string('#', filled));
         Console.Write(new string('-', _width - filled));
         Console.Write($"] {p.Percent:P1} ({p.Done}/{p.Total})");

PixelRay/Output/Progress/ProgressReporter.cs

@@ -3,7 +3,7 @@ namespace PixelRay.Output.Progress;
 /// <summary>
 /// Handles rendering progress updates via a callback function
 /// </summary>
-public class ProgressReporter(int total, Action<RenderProgress> callback)
+public class ProgressReporter(int frame, int total, Action<RenderProgress> callback)
 {
     private int _done;
     private readonly int _total = total;
@@ -17,6 +17,7 @@ public void Increment(int step = 1)
         if (done % 500 == 0 || done == _total)
         {
             _callback(new RenderProgress(
+                frame,
                 done,
                 _total,
                 (double)done / _total

PixelRay/Output/Progress/RenderProgress.cs

@@ -4,6 +4,7 @@ namespace PixelRay.Output.Progress;
 /// Data record for rendering progression updates
 /// </summary>
 public readonly record struct RenderProgress(
+    int Frame,
     int Done,
     int Total,
     double Percent

PixelRay/Program.cs

@@ -213,13 +213,13 @@ public static void Main(string[] args)
             {
                 lua.Update(frame);
 
-                buffer = renderer.Render(scene, scene.Camera, settings.Threading, upScaleFactor, debug);
+                buffer = renderer.Render(scene, scene.Camera, settings.Threading, upScaleFactor, debug, frame);
                 ImageWriter.WritePNG($"{frameOutputDir}/frame-{frame}.png", buffer); // scripts will only produce png
             }
 
             // produce a GIF from frames
             if (values["produceGif"] == "enabled")
-                GifBuilder.Build(frameOutputDir, "output.gif");
+                GifBuilder.Build(frameOutputDir, "outputGIF.gif");
 
             return;
         }

PixelRay/Rendering/Renderer.cs

@@ -47,15 +47,19 @@ public FrameBuffer Render(
         Camera camera,
         bool threading,
         int upScale = 1,
-        DebugMode mode = DebugMode.None
+        DebugMode mode = DebugMode.None,
+        int frame = -1
     )
     {
         int scaledW = upScale * _width;
         int scaledH = upScale * _height;
         FrameBuffer buffer = new(scaledW, scaledH);
 
         var consoleBar = new ProgressBar(30);
+
+
         var reporter = new ProgressReporter(
+            frame,
             _width * _height,
             consoleBar.Update
         );