Add a denoising renderer. (#28)

* Integrated denoised path tracing renderer.

* Don't call callback on last frame of beauty pass.

* Render all passes at the same time.

* Reorder passes.

* Refactor the denoiser and create a `Denoiser` interface. Add inplace denoiser. Move settings to its own class.

* Implement saving the beauty pass.

* Bump the plugin version.

* Add support for headless mode. Clean up imports.

* Remove albedo and normal tracers. Clean up some code.

* Update README

* Update settings to use observables instead of making the entire object an observable. Fix settings to load every field from scene.

* Update settings tab with settings once it has loaded in.

* Fix NPE where normal tracer settings were not set.

Author: ThatRedox

README.md

@@ -8,26 +8,38 @@ Please use [version 0.3.2](https://github.com/chunky-dev/chunky-denoiser/release
 
 Download the latest plugin release for your Chunky version from the [releases page](https://github.com/leMaik/chunky-denoiser/releases). In the Chunky Launcher, click on _Manage plugins_ and then on _Add_ and select the `.jar` file you just downloaded. Click on `Save` to store the updated configuration, then start Chunky as usual.
 
-**Compatibility note:** If you are using the [Discord plugin](https://github.com/leMaik/chunky-discord), make sure that it is loaded _after_ the Denoising plugin, i.e. use the _Down_ button to move it below it in the plugin list. Otherwise the denoiser plugin will not work.
+Download the Intel Open Image Denoiser [here][openimagedenoise-dl]. After unpacking the archive in a safe location, you can configure the denoiser executable (`denoiser.exe` on Windows, `denoiser` on Linux) in the `Denoiser` tab inside Chunky.
 
 ## Usage
 
-Just render a scene as usual. It will render three images and save them as _Portable Float Maps_.
+Select the `DenoisedPathTracer` in the `Advanced` tab:
 
-### Denoise automatically
+![image](https://user-images.githubusercontent.com/42661490/147403029-54d291c2-8142-4a36-b6ea-4485156f9484.png)
 
-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.
+Then render the scene as usual. It will automatically render all passes and denoise the final image.
 
-### Invoke the denoiser manually
+### Denoising an Existing Render
 
-After the rendering is done, the plugin will save the resulting image as `scene-name.pfm` in the scene directory and start to render a normal image (saved as `scene-name.normal.pfm`) and an Albedo image (`scene-name.albedo.pfm`). These files can be used by [Intel Open Image Denoise][openimagedenoise-dl] like this:
+Existing renders can be denoised by clicking on the `Denoise Current Render` button in the `Denoiser` tab:
+
+![image](https://user-images.githubusercontent.com/42661490/147403139-67f3661c-1575-407f-af05-1d8780f68c73.png)
+
+**WARNING: this will overwrite your existing render.**
+
+It will automatically render all passes and denoise the final image.
+
+### Denoising Outside Chunky
+
+By checking `Save albedo map` and `Save normal map`, the denoised renderers will automatically save the albedo and normal maps as `.pfm` files inside the scene directory.
+
+![image](https://user-images.githubusercontent.com/42661490/147403108-78aa1b33-5549-46de-8194-3f33d2e799a0.png)
+
+These files can be used by [Intel Open Image Denoise][openimagedenoise-dl] like this:
 
 ```
 ./denoise -ldr scene-name.pfm -alb scene-name.albedo.pfm -nrm scene-name.normal.pfm -o output.pfm
 ```
 
-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].
-
 ## License
 
 Copyright 2019-2021 Maik Marschner (leMaik)

build.gradle

@@ -1,45 +1,40 @@
 apply plugin: 'java'
 jar.enabled = false
 
-compileJava {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
+
+configurations {
+    implementation.extendsFrom(provided)
+    implementation.extendsFrom(bundled)
 }
 
-sourceSets {
-    main {
-        if (project.properties.get("chunky") == "1") {
-            java.srcDir 'src/main/java'
-            java.srcDir 'src/chunky-1/java'
-            resources.srcDir 'src/main/resources'
-            resources.srcDir 'src/chunky-1/resources'
-        } else {
-            java.srcDir 'src/main/java'
-            java.srcDir 'src/chunky-2/java'
-            resources.srcDir 'src/main/resources'
-            resources.srcDir 'src/chunky-2/resources'
-        }
-    }
+dependencies {
+    provided 'se.llbit:chunky-core:2.4.0'
+    provided 'org.apache.commons:commons-math3:3.2'
+    provided 'it.unimi.dsi:fastutil:8.4.4'
+    provided 'se.llbit:jo-json:1.3.1'
 }
 
 task pluginJar(type: Jar) {
-	classifier = 'chunky' + project.properties.get("chunky")
     with jar
 }
 
-dependencies {
-    if (project.properties.get("chunky") == "1") {
-        compile 'se.llbit:chunky-core:1.4.5'
-    } else {
-        compile 'se.llbit:chunky-core:2.0-beta6'
+jar {
+    manifest {
+        attributes "Main-Class": "de.lemaik.chunky.denoiser.DenoiserPlugin"
+    }
+
+    from {
+        configurations.bundled.collect { it.isDirectory() ? it : zipTree(it) }
     }
-    runtimeClasspath 'org.apache.commons:commons-math3:3.2'
 }
 
 repositories {
     mavenLocal()
     mavenCentral()
     maven {
-        url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        url 'https://repo.lemaik.de/'
     }
 }
+

src/main/java/de/lemaik/chunky/denoiser/AlbedoRenderer.java

@@ -0,0 +1,43 @@
+package de.lemaik.chunky.denoiser;
+
+import se.llbit.chunky.block.Air;
+import se.llbit.chunky.block.Water;
+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 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);
+        }
+    }
+}