Window Renderer fixed and Render options added

Author: manoelmms

.idea/misc.xml

@@ -3,13 +3,66 @@
 public class Main {
     public static void main(String[] args) {
         Scene chosen = Scene.finalScene();
-        Renderer render = new Renderer(chosen.camera);
 
+        // Using a MacBook Air M2 for comparison:
         // imageRender(50spp, 1280x720) for final image = 206.791s
         // imageRenderParallel(50spp, 1280x720) for final image = 46.492s
-        render.imageRenderParallel(chosen.world, 50, "final_test.png");
+        // imageRenderParallel(500spp, 1280x720) for final image = 546.934s
+        // Only takes around 100MB of memory to render!
+
+        System.out.println("\nSelect a render mode:");
+        System.out.println("1. Single-threaded with 50 samples per pixel");
+        System.out.println("2. Multi-threaded with 50 samples per pixel");
+        System.out.println("3. Multi-threaded with 500 samples per pixel");
+        System.out.println("4. Windowed with 15 samples per pixel");
+        System.out.println("5. Windowed with 50 samples per pixel");
+
+
+        int choice = 0;
+        while (choice < 1 || choice > 5) {
+            choice = Utility.readInt();
+        }
 
-        //render.windowRender(chosen.world, 50);
+        System.out.println("\nSelect a Scene:");
+        System.out.println("1. Initial Scene");
+        System.out.println("2. Final Scene");
+
+        int sceneChoice = 0;
+        while (sceneChoice < 1 || sceneChoice > 2) {
+            sceneChoice = Utility.readInt();
+        }
+
+        switch (sceneChoice) {
+            case 1:
+                chosen = Scene.initScene();
+                break;
+            case 2:
+                chosen = Scene.finalScene();
+                break;
+            default:
+                break;
+        }
+
+        Renderer render = new Renderer(chosen.camera);
 
+        switch (choice) {
+            case 1:
+                render.imageRender(chosen.world, 50, "Output(50spp).png");
+                break;
+            case 2:
+                render.imageRenderParallel(chosen.world, 50, "Output(50spp).png");
+                break;
+            case 3:
+                render.imageRenderParallel(chosen.world, 500, "Output(500spp).png");
+                break;
+            case 4:
+                render.windowRender(chosen.world, 15);
+                break;
+            case 5:
+                render.windowRender(chosen.world, 50);
+                break;
+            default:
+                break;
+        }
     }
 }

src/RayTracing/Main.java

@@ -174,19 +174,27 @@ void imageRenderParallel(HitTable scene, int spp, String filename) {
 
     void windowRender(HitTable scene, int spp) {
         Color[] pixelColors = new Color[image_height*image_width];
+
         for (int i = 0; i<image_height*image_width; ++i)
             pixelColors[i] = new Color(0);
 
-        long init_time = System.currentTimeMillis(); // Time for Benchmark
+        JFrame window = getjFrame(scene, spp, pixelColors);
+        window.setVisible(true);
+        window.setResizable(false);
+        window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    }
 
+    private JFrame getjFrame(HitTable scene, int spp, Color[] pixelColors) {
         JFrame window = new JFrame("RayTracing") {
             @Override
             public void paint(Graphics g) {
                 super.paint(g);
                 System.out.println(image_width + "x" + image_height + ", " + spp + " samples per pixel");
+                long init_time = System.currentTimeMillis(); // Time for Benchmark
+                BufferedImage image = new BufferedImage(image_width, image_height, BufferedImage.TYPE_INT_RGB);
 
                 // For each sample per pixel, render the whole image
-                for (long s=0; s < spp; ++s) {
+                for (long s = 0; s < spp; ++s) {
                     long start_time = System.currentTimeMillis(); // Time for Benchmark
                     for (int y = 0; y < image_height; ++y) {
                         for (int x = 0; x < image_width; ++x) {
@@ -198,31 +206,28 @@ public void paint(Graphics g) {
                             pixelColors[y * image_width + x].equalAdd(rayColor(camera.get_ray(u, v), scene, depth));
                             g.setColor(writeAwtColor(pixelColors[y * image_width + x], s + 1));
                             g.drawRect(x, y, 1, 1);
+
+                            // Save the pixel to the image
+                            if (s == spp - 1) {
+                                image.setRGB(x, y, writeAwtColor(pixelColors[y * image_width + x], s + 1).getRGB());
+                            }
                         }
                     }
-                    System.out.print("\r" + "Sample: " + (s+1) + " " + "in " + (double)(System.currentTimeMillis()-start_time)/1000+"s");
+                    System.out.println("Sample: " + (s+1) + " " + "in " + (double)(System.currentTimeMillis()-start_time)/1000+"s");
+                }
+                try {
+                    ImageIO.write(image, "png", new java.io.File("Output.png"));
+                    System.out.println("\nImage saved to Output.png");
+                    System.out.println("Rendering finished in " + (double)(System.currentTimeMillis()-init_time)/1000+"s");
+                }
+                catch (IOException e) {
+                    throw new RuntimeException(e);
                 }
             }
         };
 
 
         window.setSize(image_width, image_height);
-        window.setVisible(true);
-        window.setResizable(false);
-        window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-        // Save the image to a file
-        try {
-            BufferedImage image = new BufferedImage(image_width, image_height, BufferedImage.TYPE_INT_RGB);
-            Graphics2D graphics = image.createGraphics();
-            window.paint(graphics);
-            ImageIO.write(image, "png", new java.io.File("Output.png"));
-            System.out.println("\nImage saved to Output.png");
-            System.out.println("Rendering finished in " + (double)(System.currentTimeMillis()-init_time)/1000+"s");
-
-        }
-        catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        return window;
     }
 }

src/RayTracing/Renderer.java

@@ -29,7 +29,7 @@ public class Scene {
     }
 
     public static Scene initScene(){
-        Point lookFrom =new Point(0, 0, 0);
+        Point lookFrom = new Point(0, 0, 0);
         Point lookAt = new Point(0, 0, -1);
         Vec3 vup = new Vec3(0, 1, 0);
         Vec3 lookLength = lookFrom.minus(lookAt);
@@ -59,7 +59,7 @@ public static Scene initScene(){
     }
 
     public static Scene finalScene(){
-        Point lookFrom =new Point(13, 2, 3);
+        Point lookFrom = new Point(13, 2, 3);
         Point lookAt = new Point(0, 0, 0);
         Vec3 vup = new Vec3(0, 1, 0);
         Vec3 lookLength = lookFrom.minus(lookAt);

src/RayTracing/Scene.java

@@ -25,4 +25,8 @@ public static double clamp(double x, double low, double high) {
         if(x<low) return low;
         else return Math.min(x, high);
     }
+
+    public static int readInt() {
+        return Integer.parseInt(System.console().readLine());
+    }
 }