Parallel rendering improved

Author: manoelmms

final_test.png

@@ -4,7 +4,11 @@ public class Main {
     public static void main(String[] args) {
         Scene chosen = Scene.finalScene();
         Renderer render = new Renderer(chosen.camera);
-        render.imageRenderParallel(chosen.world, 500, "final_500.ppm");
+
+        // imageRender(50spp, 1280x720) for final image = 206.791s
+        // imageRenderParallel(50spp, 1280x720) for final image = 46.492s
+        render.imageRenderParallel(chosen.world, 50, "final_test.png");
+
         //render.windowRender(chosen.world, 50);
 
     }

src/RayTracing/Main.java

@@ -0,0 +1,11 @@
+package RayTracing;
+
+public class RayResult {
+    int index;
+    Color color;
+
+    public RayResult() {
+        this.index = 0;
+        this.color = new Color(0);
+    }
+}

src/RayTracing/RayResult.java

@@ -101,6 +101,7 @@ Color rayColor(Ray r, HitTable world, int depth){
         return skyColor(r);
     }
 
+    // Old version of imageRender, kept for benchmarking purposes and for futures references. Do not use.
     void imageRender(HitTable scene, int spp, String filename) {
         try(FileOutputStream file = new FileOutputStream(filename);
             PrintStream filePrint = new PrintStream(file) ) {
@@ -141,18 +142,24 @@ void imageRenderParallel(HitTable scene, int spp, String filename) {
 
         for (long y=0; y < image_height; ++y) {
             System.out.print("\r" + "Scanlines remaining: "+(image_height-y));
-            for (long x=0; x < image_width; ++x) {
+            long finalY = y;
+            IntStream.range(0, image_width).parallel().forEach(x -> {
                 Color pixelColor = new Color(0);
-
-                long finalX = x;
-                long finalY = y;
-                IntStream.range(0, spp).parallel().forEach(s -> {
-                    double u = (finalX + randomDouble()) / (image_width-1);
-                    double v = (finalY + randomDouble()) / (image_height-1);
+                for (int s = 0; s < spp; ++s) {
+                    double u = (x + randomDouble()) / (image_width - 1);
+                    double v = (finalY + randomDouble()) / (image_height - 1);
                     pixelColor.equalAdd(rayColor(camera.get_ray(u, v), scene, depth));
-                });
-                image.setRGB((int)x, (int)y, writeAwtColor(pixelColor, spp).getRGB());
-            }
+                }
+                // pixelColor = pixelColor.multiply(1.0 / spp);
+
+                RayResult result = new RayResult();
+                int index = (int) (finalY * image_width + x);
+                result.color = pixelColor;
+                result.index = index;
+                synchronized (image) {
+                    image.setRGB(index % image_width, index / image_width, writeAwtColor(result.color, spp).getRGB());
+                }
+            });
         }
         try {
             ImageIO.write(image, "png", new java.io.File(filename));