Update the plugin for Chunky 2.4.0 (#24)

* Add support for Chunky 2.4.0, save denoised images in the snapshot directory.

* Enabled Headless Mode (Untested)

All I did was stop the check for headless from returning, it still warns the user that it may not work.

* Make the plugin compatible with Chunky 2.4.0

* Update info on Chunky 1.x vs 2.x

* Revert "Enabled Headless Mode (Untested)"

This reverts commit 06bf34b.

* Fix incomplete sentence

* Cleanup imports

Co-authored-by: MadDog443 <[email protected]>

Author: leMaik

README.md

@@ -1,8 +1,8 @@
 # Denoising Plugin
 
-This is a plugin for [Chunky][chunky] that creates _Portable Float Map_ files (.pfm) for use with denoisers, e.g. [Intel Open Image Denoise][openimagedenoise]. The plugin was compiled for and tested with Chunky 1.4.5 as well as Chunky 2.0-beta6.
+This is a plugin for [Chunky][chunky] that creates _Portable Float Map_ files (.pfm) for use with denoisers, e.g. [Intel Open Image Denoise][openimagedenoise].
 
-Please use `chunky-denoiser-chunky1.jar` for Chunky 1.x and `chunky-denoiser-chunky2.jar` for Chunky 2.x (i.e. all Chunky versions for Minecraft 1.13 or later).
+Please use [version 0.3.2](https://github.com/chunky-dev/chunky-denoiser/releases/tag/v0.3.2) for Chunky 1.x and the [latest version](https://github.com/chunky-dev/chunky-denoiser/releases/latest) for Chunky 2.4.0 or later.
 
 ## Installation
 
@@ -16,7 +16,7 @@ Just render a scene as usual. It will render three images and save them as _Port
 
 ### Denoise automatically
 
-The Intel Open Image Denoiser can be downloaded [here][openimagedenoise-dl]. After unpacking the archive, you can configure the denoiser executable (`denoiser.exe` on Windows, `denoiser` on Linux) in the _Denoiser_ tab inside Chunky.
+The Intel Open Image Denoiser can be downloaded [here][openimagedenoise-dl]. After unpacking the archive, you can configure the denoiser executable (`denoiser.exe` on Windows, `denoiser` on Linux) in the _Denoiser_ tab inside Chunky. If you do this, it will output the denoised image alongside the original image in the scene's snapshots directory.
 
 ### Invoke the denoiser manually
 
@@ -28,16 +28,9 @@ After the rendering is done, the plugin will save the resulting image as `scene-
 
 To view the resulting image, it needs to be converted back to an actual image file. This can be done by the `pfm2png.py` Python 3 script included in this repository or using an online converter, e.g. [this one][convertio].
 
-## Building the plugin
-
-The plugin can be built for Chunky 1.4.5 and Chunky 2.x by specifying the `chunky` parameter when invoking gradle.
-
-- Chunky 1.4.5: `./gradlew pluginJar -Pchunky=1`
-- Chunky 2.x: `./gradlew pluginJar -Pchunky=2`
-
 ## License
 
-Copyright 2019-2020 Maik Marschner (leMaik)
+Copyright 2019-2021 Maik Marschner (leMaik)
 
 Permission to modify and redistribute is granted under the terms of the GNU General Public License, Version 3. See the `LICENSE` file for the full license.
 

src/chunky-1/java/de/lemaik/chunky/denoiser/AlbedoTracer.java

@@ -0,0 +1,55 @@
+package de.lemaik.chunky.denoiser;
+
+import se.llbit.chunky.block.Air;
+import se.llbit.chunky.block.Water;
+import se.llbit.chunky.renderer.PathTracingRenderer;
+import se.llbit.chunky.renderer.WorkerState;
+import se.llbit.chunky.renderer.scene.PreviewRayTracer;
+import se.llbit.chunky.renderer.scene.RayTracer;
+import se.llbit.chunky.renderer.scene.Scene;
+import se.llbit.math.Ray;
+
+public class AlbedoRenderer extends PathTracingRenderer {
+
+  public static final String ID = "ALBEDO";
+
+  public AlbedoRenderer() {
+    super(ID, "Albedo map", "Renderer for albedo maps (used for denoising)",
+        new AlbedoTracer());
+  }
+
+  private static class AlbedoTracer implements RayTracer {
+
+    @Override
+    public void trace(Scene scene, WorkerState state) {
+      Ray ray = state.ray;
+      if (scene.isInWater(ray)) {
+        ray.setCurrentMaterial(Water.INSTANCE, 0);
+      } else {
+        ray.setCurrentMaterial(Air.INSTANCE, 0);
+      }
+
+      while (true) {
+        if (!PreviewRayTracer.nextIntersection(scene, ray)) {
+          if (ray.getPrevMaterial().isWater()) {
+            // set water color to white
+            ray.color.set(1, 1, 1, 1);
+          } else if (ray.depth == 0) {
+            // direct sky hit
+            if (!scene.transparentSky()) {
+              scene.sky().getSkyColorInterpolated(ray);
+            }
+          }
+          // ignore indirect sky hits
+          break;
+        }
+
+        if (ray.getCurrentMaterial() != Air.INSTANCE && ray.color.w > 0.0D) {
+          break;
+        }
+
+        ray.o.scaleAdd(1.0E-4D, ray.d);
+      }
+    }
+  }
+}