From 31ce4bf5e871a7c0cfa8645ae0dad6546ae18b9b Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Fri, 1 Sep 2023 15:24:03 -0400
Subject: [PATCH 01/15] Configurable exponent for emitter mapping

---
 .../chunky/renderer/scene/PathTracer.java     |  6 ++--
 .../se/llbit/chunky/renderer/scene/Scene.java | 33 +++++++++++++++++++
 .../chunky/ui/render/tabs/LightingTab.java    |  8 +++++
 .../chunky/ui/render/tabs/LightingTab.fxml    |  1 +
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
index 277f8ec3f0..cf0654f600 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
@@ -228,9 +228,9 @@ private static boolean doDiffuseReflection(Ray ray, Ray next, Material currentMa
 
     if (scene.emittersEnabled && (!scene.isPreventNormalEmitterWithSampling() || scene.getEmitterSamplingStrategy() == EmitterSamplingStrategy.NONE || ray.depth == 0) && currentMat.emittance > Ray.EPSILON) {
 
-      // Quadratic emittance mapping, so a pixel that's 50% darker will emit only 25% as much light
-      // This is arbitrary but gives pretty good results in most cases.
-      emittance = new Vector3(ray.color.x * ray.color.x, ray.color.y * ray.color.y, ray.color.z * ray.color.z);
+      // Exponential emittance mapping
+      double exp = scene.getEmitterMappingExponent();
+      emittance = new Vector3(FastMath.pow(ray.color.x, exp), FastMath.pow(ray.color.y, exp), FastMath.pow(ray.color.z, exp));
       emittance.scale(currentMat.emittance * scene.emitterIntensity);
 
       hit = true;
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
index fd1c4536d7..c263d7c081 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
@@ -115,6 +115,10 @@ public class Scene implements JsonSerializable, Refreshable {
    * Default emitter intensity.
    */
   public static final double DEFAULT_EMITTER_INTENSITY = 13;
+  /**
+   * Default exponent for emitter mapping.
+   */
+  public static final double DEFAULT_EMITTER_MAPPING_EXPONENT = 2;
 
   /**
    * Minimum emitter intensity.
@@ -126,6 +130,16 @@ public class Scene implements JsonSerializable, Refreshable {
    */
   public static final double MAX_EMITTER_INTENSITY = 1000;
 
+  /**
+   * Minimum emitter mapping exponent.
+   */
+  public static final double MIN_EMITTER_MAPPING_EXPONENT = 0;
+
+  /**
+   * Maximum emitter mapping exponent.
+   */
+  public static final double MAX_EMITTER_MAPPING_EXPONENT = 5;
+
   /**
    * Default transmissivity cap.
    */
@@ -210,6 +224,7 @@ public class Scene implements JsonSerializable, Refreshable {
   protected boolean saveSnapshots = false;
   protected boolean emittersEnabled = DEFAULT_EMITTERS_ENABLED;
   protected double emitterIntensity = DEFAULT_EMITTER_INTENSITY;
+  protected double emitterMappingExponent = DEFAULT_EMITTER_MAPPING_EXPONENT;
   protected EmitterSamplingStrategy emitterSamplingStrategy = EmitterSamplingStrategy.NONE;
   protected boolean fancierTranslucency = true;
   protected double transmissivityCap = DEFAULT_TRANSMISSIVITY_CAP;
@@ -455,6 +470,7 @@ public synchronized void copyState(Scene other, boolean copyChunks) {
     sunSamplingStrategy = other.sunSamplingStrategy;
     emittersEnabled = other.emittersEnabled;
     emitterIntensity = other.emitterIntensity;
+    emitterMappingExponent = other.emitterMappingExponent;
     emitterSamplingStrategy = other.emitterSamplingStrategy;
     preventNormalEmitterWithSampling = other.preventNormalEmitterWithSampling;
     fancierTranslucency = other.fancierTranslucency;
@@ -1755,6 +1771,21 @@ public void setEmitterIntensity(double value) {
     refresh();
   }
 
+  /**
+   * @return The current emitter mapping exponent
+   */
+  public double getEmitterMappingExponent() {
+    return emitterMappingExponent;
+  }
+
+  /**
+   * Set the emitter mapping exponent.
+   */
+  public void setEmitterMappingExponent(double value) {
+    emitterMappingExponent = value;
+    refresh();
+  }
+
   /**
    * Set the transparent sky option.
    */
@@ -2642,6 +2673,7 @@ public void setUseCustomWaterColor(boolean value) {
     json.add("saveSnapshots", saveSnapshots);
     json.add("emittersEnabled", emittersEnabled);
     json.add("emitterIntensity", emitterIntensity);
+    json.add("emitterMappingExponent", emitterMappingExponent);
     json.add("fancierTranslucency", fancierTranslucency);
     json.add("transmissivityCap", transmissivityCap);
     json.add("sunSamplingStrategy", sunSamplingStrategy.getId());
@@ -2910,6 +2942,7 @@ public synchronized void importFromJson(JsonObject json) {
     saveSnapshots = json.get("saveSnapshots").boolValue(saveSnapshots);
     emittersEnabled = json.get("emittersEnabled").boolValue(emittersEnabled);
     emitterIntensity = json.get("emitterIntensity").doubleValue(emitterIntensity);
+    emitterMappingExponent = json.get("emitterMappingExponent").doubleValue(emitterMappingExponent);
     fancierTranslucency = json.get("fancierTranslucency").boolValue(fancierTranslucency);
     transmissivityCap = json.get("transmissivityCap").doubleValue(transmissivityCap);
 
diff --git a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
index bedf302107..d32ebd1246 100644
--- a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
+++ b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
@@ -52,6 +52,7 @@ public class LightingTab extends ScrollPane implements RenderControlsTab, Initia
   @FXML private DoubleAdjuster skyIntensity;
   @FXML private DoubleAdjuster apparentSkyBrightness;
   @FXML private DoubleAdjuster emitterIntensity;
+  @FXML private DoubleAdjuster emitterMappingExponent;
   @FXML private DoubleAdjuster sunIntensity;
   @FXML private CheckBox drawSun;
   @FXML private ComboBox<SunSamplingStrategy> sunSamplingStrategy;
@@ -110,6 +111,12 @@ public LightingTab() throws IOException {
     emitterIntensity.clampMin();
     emitterIntensity.onValueChange(value -> scene.setEmitterIntensity(value));
 
+    emitterMappingExponent.setName("Emitter mapping exponent");
+    emitterMappingExponent.setTooltip("Determines how much light is emitted from darker or lighter pixels.\nHigher values will result in darker pixels emitting less light.");
+    emitterMappingExponent.setRange(Scene.MIN_EMITTER_MAPPING_EXPONENT, Scene.MAX_EMITTER_MAPPING_EXPONENT);
+    emitterMappingExponent.clampMin();
+    emitterMappingExponent.onValueChange(value -> scene.setEmitterMappingExponent(value));
+
     emitterSamplingStrategy.getItems().addAll(EmitterSamplingStrategy.values());
     emitterSamplingStrategy.getSelectionModel().selectedItemProperty()
       .addListener((observable, oldvalue, newvalue) -> {
@@ -194,6 +201,7 @@ public void setController(RenderControlsFxController controller) {
     skyIntensity.set(scene.sky().getSkyLight());
     apparentSkyBrightness.set(scene.sky().getApparentSkyLight());
     emitterIntensity.set(scene.getEmitterIntensity());
+    emitterMappingExponent.set(scene.getEmitterMappingExponent());
     sunIntensity.set(scene.sun().getIntensity());
     sunLuminosity.set(scene.sun().getLuminosity());
     apparentSunBrightness.set(scene.sun().getApparentBrightness());
diff --git a/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml b/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
index 63708d2812..cbaaede717 100644
--- a/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
+++ b/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
@@ -21,6 +21,7 @@
     <Separator />
     <CheckBox fx:id="enableEmitters" mnemonicParsing="false" text="Enable emitters" />
     <DoubleAdjuster fx:id="emitterIntensity" maxWidth="1.7976931348623157E308" />
+    <DoubleAdjuster fx:id="emitterMappingExponent" maxWidth="1.7976931348623157E308" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
       <Label text="Emitter Sampling Strategy:" />
       <ChoiceBox fx:id="emitterSamplingStrategy" />

From 95c78a08b6a1aada34ee818369714b5884437880 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Sat, 2 Sep 2023 03:30:58 -0400
Subject: [PATCH 02/15] add emitter mapping type option

---
 .../chunky/renderer/EmitterMappingType.java   | 28 +++++++++++++++++++
 .../chunky/renderer/scene/PathTracer.java     | 12 ++++++--
 .../se/llbit/chunky/renderer/scene/Scene.java | 24 ++++++++++++++++
 .../chunky/ui/render/tabs/LightingTab.java    |  8 ++++++
 .../chunky/ui/render/tabs/LightingTab.fxml    |  8 ++++--
 5 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java

diff --git a/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java b/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
new file mode 100644
index 0000000000..9274039808
--- /dev/null
+++ b/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
@@ -0,0 +1,28 @@
+package se.llbit.chunky.renderer;
+
+import se.llbit.util.Registerable;
+
+public enum EmitterMappingType implements Registerable {
+  BRIGHTEST_CHANNEL("Brightest Channel", "Emitted light (R', G', B') = (R*M^P, G*M^P, B*M^P) where M = max(R, G, B) and P is the specified power. Emitted light will always match pixel color."),
+  INDEPENDENT_CHANNELS("Independent Channels", "Emitted light (R', G', B') = (R^P, G^P, B^P) where P is the specified power. Saturation of emitted light increases with P - possibly less realistic in some situations.");
+  private final String displayName;
+  private final String description;
+  EmitterMappingType(String displayName, String description) {
+    this.displayName = displayName;
+    this.description = description;
+  }
+  @Override
+  public String getName() {
+    return this.displayName;
+  }
+
+  @Override
+  public String getDescription() {
+    return this.description;
+  }
+
+  @Override
+  public String getId() {
+    return this.name();
+  }
+}
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
index cf0654f600..9f25e792ca 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
@@ -228,9 +228,17 @@ private static boolean doDiffuseReflection(Ray ray, Ray next, Material currentMa
 
     if (scene.emittersEnabled && (!scene.isPreventNormalEmitterWithSampling() || scene.getEmitterSamplingStrategy() == EmitterSamplingStrategy.NONE || ray.depth == 0) && currentMat.emittance > Ray.EPSILON) {
 
-      // Exponential emittance mapping
+      // Emittance mapping
       double exp = scene.getEmitterMappingExponent();
-      emittance = new Vector3(FastMath.pow(ray.color.x, exp), FastMath.pow(ray.color.y, exp), FastMath.pow(ray.color.z, exp));
+      switch(scene.getEmitterMappingType()) {
+        case BRIGHTEST_CHANNEL:
+          double val = FastMath.pow(Math.max(ray.color.x, Math.max(ray.color.y, ray.color.z)), exp);
+          emittance = new Vector3(ray.color.x * val, ray.color.y * val, ray.color.z * val);
+          break;
+        case INDEPENDENT_CHANNELS:
+          emittance = new Vector3(FastMath.pow(ray.color.x, exp), FastMath.pow(ray.color.y, exp), FastMath.pow(ray.color.z, exp));
+          break;
+      }
       emittance.scale(currentMat.emittance * scene.emitterIntensity);
 
       hit = true;
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
index c263d7c081..fe5f3530e4 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
@@ -120,6 +120,11 @@ public class Scene implements JsonSerializable, Refreshable {
    */
   public static final double DEFAULT_EMITTER_MAPPING_EXPONENT = 2;
 
+  /**
+   * Default method for emitter mapping.
+   */
+  public static final EmitterMappingType DEFAULT_EMITTER_MAPPING_TYPE = EmitterMappingType.BRIGHTEST_CHANNEL;
+
   /**
    * Minimum emitter intensity.
    */
@@ -225,6 +230,7 @@ public class Scene implements JsonSerializable, Refreshable {
   protected boolean emittersEnabled = DEFAULT_EMITTERS_ENABLED;
   protected double emitterIntensity = DEFAULT_EMITTER_INTENSITY;
   protected double emitterMappingExponent = DEFAULT_EMITTER_MAPPING_EXPONENT;
+  protected EmitterMappingType emitterMappingType = DEFAULT_EMITTER_MAPPING_TYPE;
   protected EmitterSamplingStrategy emitterSamplingStrategy = EmitterSamplingStrategy.NONE;
   protected boolean fancierTranslucency = true;
   protected double transmissivityCap = DEFAULT_TRANSMISSIVITY_CAP;
@@ -471,6 +477,7 @@ public synchronized void copyState(Scene other, boolean copyChunks) {
     emittersEnabled = other.emittersEnabled;
     emitterIntensity = other.emitterIntensity;
     emitterMappingExponent = other.emitterMappingExponent;
+    emitterMappingType = other.emitterMappingType;
     emitterSamplingStrategy = other.emitterSamplingStrategy;
     preventNormalEmitterWithSampling = other.preventNormalEmitterWithSampling;
     fancierTranslucency = other.fancierTranslucency;
@@ -1786,6 +1793,21 @@ public void setEmitterMappingExponent(double value) {
     refresh();
   }
 
+  /**
+   * @return The current emitter mapping type.
+   */
+  public EmitterMappingType getEmitterMappingType() {
+    return emitterMappingType;
+  }
+
+  /**
+   * Set the emitter mapping type.
+   */
+  public void setEmitterMappingType(EmitterMappingType value) {
+    emitterMappingType = value;
+    refresh();
+  }
+
   /**
    * Set the transparent sky option.
    */
@@ -2674,6 +2696,7 @@ public void setUseCustomWaterColor(boolean value) {
     json.add("emittersEnabled", emittersEnabled);
     json.add("emitterIntensity", emitterIntensity);
     json.add("emitterMappingExponent", emitterMappingExponent);
+    json.add("emitterMappingType", emitterMappingType.getId());
     json.add("fancierTranslucency", fancierTranslucency);
     json.add("transmissivityCap", transmissivityCap);
     json.add("sunSamplingStrategy", sunSamplingStrategy.getId());
@@ -2943,6 +2966,7 @@ public synchronized void importFromJson(JsonObject json) {
     emittersEnabled = json.get("emittersEnabled").boolValue(emittersEnabled);
     emitterIntensity = json.get("emitterIntensity").doubleValue(emitterIntensity);
     emitterMappingExponent = json.get("emitterMappingExponent").doubleValue(emitterMappingExponent);
+    emitterMappingType = EmitterMappingType.valueOf(json.get("emitterMappingType").asString(DEFAULT_EMITTER_MAPPING_TYPE.getId()));
     fancierTranslucency = json.get("fancierTranslucency").boolValue(fancierTranslucency);
     transmissivityCap = json.get("transmissivityCap").doubleValue(transmissivityCap);
 
diff --git a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
index d32ebd1246..d308643c4f 100644
--- a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
+++ b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
@@ -26,6 +26,7 @@
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.paint.Color;
+import se.llbit.chunky.renderer.EmitterMappingType;
 import se.llbit.chunky.renderer.EmitterSamplingStrategy;
 import se.llbit.chunky.renderer.SunSamplingStrategy;
 import se.llbit.chunky.renderer.scene.Scene;
@@ -52,6 +53,7 @@ public class LightingTab extends ScrollPane implements RenderControlsTab, Initia
   @FXML private DoubleAdjuster skyIntensity;
   @FXML private DoubleAdjuster apparentSkyBrightness;
   @FXML private DoubleAdjuster emitterIntensity;
+  @FXML private ComboBox<EmitterMappingType> emitterMappingType;
   @FXML private DoubleAdjuster emitterMappingExponent;
   @FXML private DoubleAdjuster sunIntensity;
   @FXML private CheckBox drawSun;
@@ -111,6 +113,11 @@ public LightingTab() throws IOException {
     emitterIntensity.clampMin();
     emitterIntensity.onValueChange(value -> scene.setEmitterIntensity(value));
 
+    emitterMappingType.getItems().addAll(EmitterMappingType.values());
+    emitterMappingType.getSelectionModel().selectedItemProperty().addListener(
+      (observable, oldValue, newValue) -> scene.setEmitterMappingType(newValue));
+    emitterMappingType.setTooltip(new Tooltip("Determines how per-pixel light emission is computed."));
+
     emitterMappingExponent.setName("Emitter mapping exponent");
     emitterMappingExponent.setTooltip("Determines how much light is emitted from darker or lighter pixels.\nHigher values will result in darker pixels emitting less light.");
     emitterMappingExponent.setRange(Scene.MIN_EMITTER_MAPPING_EXPONENT, Scene.MAX_EMITTER_MAPPING_EXPONENT);
@@ -202,6 +209,7 @@ public void setController(RenderControlsFxController controller) {
     apparentSkyBrightness.set(scene.sky().getApparentSkyLight());
     emitterIntensity.set(scene.getEmitterIntensity());
     emitterMappingExponent.set(scene.getEmitterMappingExponent());
+    emitterMappingType.getSelectionModel().select(scene.getEmitterMappingType());
     sunIntensity.set(scene.sun().getIntensity());
     sunLuminosity.set(scene.sun().getLuminosity());
     apparentSunBrightness.set(scene.sun().getApparentBrightness());
diff --git a/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml b/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
index cbaaede717..e517b479c1 100644
--- a/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
+++ b/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
@@ -21,15 +21,19 @@
     <Separator />
     <CheckBox fx:id="enableEmitters" mnemonicParsing="false" text="Enable emitters" />
     <DoubleAdjuster fx:id="emitterIntensity" maxWidth="1.7976931348623157E308" />
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+      <Label text="Emitter mapping type:" />
+      <ComboBox fx:id="emitterMappingType" />
+    </HBox>
     <DoubleAdjuster fx:id="emitterMappingExponent" maxWidth="1.7976931348623157E308" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
-      <Label text="Emitter Sampling Strategy:" />
+      <Label text="Emitter sampling strategy:" />
       <ChoiceBox fx:id="emitterSamplingStrategy" />
     </HBox>
     <Separator />
     <CheckBox fx:id="drawSun" mnemonicParsing="false" text="Draw sun" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
-      <Label text="Sun Sampling Strategy:" />
+      <Label text="Sun sampling strategy:" />
       <ComboBox fx:id="sunSamplingStrategy" />
     </HBox>
     <DoubleAdjuster fx:id="sunIntensity" maxWidth="1.7976931348623157E308" />

From 91c8366580c84c579147270cc00ecaa019d59ca2 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Sun, 3 Sep 2023 22:44:06 -0400
Subject: [PATCH 03/15] make it work with emitter sampling

---
 .../chunky/renderer/scene/PathTracer.java     | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
index 9f25e792ca..e9aa1fa0c4 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
@@ -228,20 +228,9 @@ private static boolean doDiffuseReflection(Ray ray, Ray next, Material currentMa
 
     if (scene.emittersEnabled && (!scene.isPreventNormalEmitterWithSampling() || scene.getEmitterSamplingStrategy() == EmitterSamplingStrategy.NONE || ray.depth == 0) && currentMat.emittance > Ray.EPSILON) {
 
-      // Emittance mapping
-      double exp = scene.getEmitterMappingExponent();
-      switch(scene.getEmitterMappingType()) {
-        case BRIGHTEST_CHANNEL:
-          double val = FastMath.pow(Math.max(ray.color.x, Math.max(ray.color.y, ray.color.z)), exp);
-          emittance = new Vector3(ray.color.x * val, ray.color.y * val, ray.color.z * val);
-          break;
-        case INDEPENDENT_CHANNELS:
-          emittance = new Vector3(FastMath.pow(ray.color.x, exp), FastMath.pow(ray.color.y, exp), FastMath.pow(ray.color.z, exp));
-          break;
-      }
-      emittance.scale(currentMat.emittance * scene.emitterIntensity);
-
+      doEmittanceMapping(emittance, ray.color, scene, currentMat.emittance);
       hit = true;
+
     } else if (scene.emittersEnabled && scene.emitterSamplingStrategy != EmitterSamplingStrategy.NONE && scene.getEmitterGrid() != null) {
       // Sample emitter
       switch (scene.emitterSamplingStrategy) {
@@ -476,6 +465,20 @@ private static void translucentRayColor(Scene scene, Ray ray, Ray next, Vector4
     cumulativeColor.add(outputColor);
   }
 
+  private static void doEmittanceMapping(Vector3 emittance, Vector4 color, Scene scene, double materialEmittance) {
+    double exp = scene.getEmitterMappingExponent();
+    switch(scene.getEmitterMappingType()) {
+      case BRIGHTEST_CHANNEL:
+        double val = FastMath.pow(Math.max(color.x, Math.max(color.y, color.z)), exp);
+        emittance.set(color.x * val, color.y * val, color.z * val);
+        break;
+      case INDEPENDENT_CHANNELS:
+        emittance.set(FastMath.pow(color.x, exp), FastMath.pow(color.y, exp), FastMath.pow(color.z, exp));
+        break;
+    }
+    emittance.scale(materialEmittance * scene.emitterIntensity);
+  }
+
   private static double reassignTransmissivity(double from, double to, double other, double trans, double cap) {
     // Formula here derived algebraically from this system:
     // (cap - to_new)/(cap - other_new) = (from - to)/(from - other), (cap + to_new + other_new)/3 = trans
@@ -514,10 +517,11 @@ private static void sampleEmitterFace(Scene scene, Ray ray, Grid.EmitterPosition
         e /= Math.max(distance * distance, 1);
         e *= pos.block.surfaceArea(face);
         e *= emitterRay.getCurrentMaterial().emittance;
-        e *= scene.emitterIntensity;
         e *= scaler;
+        Vector3 emittance = new Vector3();
+        doEmittanceMapping(emittance, emitterRay.color, scene, e);
 
-        result.scaleAdd(e, emitterRay.color);
+        result.add(new Vector4(emittance, 0));
       }
     }
   }

From 757ada5eadd5d961f3c44a751ec2c20dd4c300d2 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Fri, 8 Sep 2023 05:10:31 -0400
Subject: [PATCH 04/15] per-material customization

---
 .../chunky/renderer/EmitterMappingType.java   |  1 +
 .../chunky/renderer/scene/PathTracer.java     | 16 +++++----
 .../se/llbit/chunky/renderer/scene/Scene.java | 23 +++++++++++-
 .../chunky/ui/render/tabs/LightingTab.java    |  1 +
 .../chunky/ui/render/tabs/MaterialsTab.java   | 36 ++++++++++++++++---
 .../java/se/llbit/chunky/world/Material.java  | 13 +++++++
 6 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java b/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
index 9274039808..305d6b3066 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
@@ -3,6 +3,7 @@
 import se.llbit.util.Registerable;
 
 public enum EmitterMappingType implements Registerable {
+  NONE("None", "Fallback to default option - should only be used for materials (not global default)"),
   BRIGHTEST_CHANNEL("Brightest Channel", "Emitted light (R', G', B') = (R*M^P, G*M^P, B*M^P) where M = max(R, G, B) and P is the specified power. Emitted light will always match pixel color."),
   INDEPENDENT_CHANNELS("Independent Channels", "Emitted light (R', G', B') = (R^P, G^P, B^P) where P is the specified power. Saturation of emitted light increases with P - possibly less realistic in some situations.");
   private final String displayName;
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
index e9aa1fa0c4..e8440dab30 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
@@ -20,6 +20,7 @@
 import org.apache.commons.math3.util.FastMath;
 import se.llbit.chunky.block.minecraft.Air;
 import se.llbit.chunky.block.minecraft.Water;
+import se.llbit.chunky.renderer.EmitterMappingType;
 import se.llbit.chunky.renderer.EmitterSamplingStrategy;
 import se.llbit.chunky.renderer.WorkerState;
 import se.llbit.chunky.world.Material;
@@ -228,7 +229,7 @@ private static boolean doDiffuseReflection(Ray ray, Ray next, Material currentMa
 
     if (scene.emittersEnabled && (!scene.isPreventNormalEmitterWithSampling() || scene.getEmitterSamplingStrategy() == EmitterSamplingStrategy.NONE || ray.depth == 0) && currentMat.emittance > Ray.EPSILON) {
 
-      doEmittanceMapping(emittance, ray.color, scene, currentMat.emittance);
+      doEmittanceMapping(emittance, ray.color, scene, currentMat);
       hit = true;
 
     } else if (scene.emittersEnabled && scene.emitterSamplingStrategy != EmitterSamplingStrategy.NONE && scene.getEmitterGrid() != null) {
@@ -465,9 +466,10 @@ private static void translucentRayColor(Scene scene, Ray ray, Ray next, Vector4
     cumulativeColor.add(outputColor);
   }
 
-  private static void doEmittanceMapping(Vector3 emittance, Vector4 color, Scene scene, double materialEmittance) {
-    double exp = scene.getEmitterMappingExponent();
-    switch(scene.getEmitterMappingType()) {
+  private static void doEmittanceMapping(Vector3 emittance, Vector4 color, Scene scene, Material material) {
+    double exp = Math.max(scene.getEmitterMappingExponent() + material.emitterMappingOffset, 0);
+    EmitterMappingType mt = material.emitterMappingType == EmitterMappingType.NONE ? scene.getEmitterMappingType() : material.emitterMappingType;
+    switch(mt) {
       case BRIGHTEST_CHANNEL:
         double val = FastMath.pow(Math.max(color.x, Math.max(color.y, color.z)), exp);
         emittance.set(color.x * val, color.y * val, color.z * val);
@@ -476,7 +478,7 @@ private static void doEmittanceMapping(Vector3 emittance, Vector4 color, Scene s
         emittance.set(FastMath.pow(color.x, exp), FastMath.pow(color.y, exp), FastMath.pow(color.z, exp));
         break;
     }
-    emittance.scale(materialEmittance * scene.emitterIntensity);
+    emittance.scale(material.emittance * scene.emitterIntensity);
   }
 
   private static double reassignTransmissivity(double from, double to, double other, double trans, double cap) {
@@ -516,10 +518,10 @@ private static void sampleEmitterFace(Scene scene, Ray ray, Grid.EmitterPosition
         double e = Math.abs(emitterRay.d.dot(emitterRay.getNormal()));
         e /= Math.max(distance * distance, 1);
         e *= pos.block.surfaceArea(face);
-        e *= emitterRay.getCurrentMaterial().emittance;
         e *= scaler;
         Vector3 emittance = new Vector3();
-        doEmittanceMapping(emittance, emitterRay.color, scene, e);
+        doEmittanceMapping(emittance, emitterRay.color, scene, emitterRay.getCurrentMaterial());
+        emittance.scale(e);
 
         result.add(new Vector4(emittance, 0));
       }
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
index fe5f3530e4..5090f78836 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
@@ -118,7 +118,7 @@ public class Scene implements JsonSerializable, Refreshable {
   /**
    * Default exponent for emitter mapping.
    */
-  public static final double DEFAULT_EMITTER_MAPPING_EXPONENT = 2;
+  public static final double DEFAULT_EMITTER_MAPPING_EXPONENT = 1.5;
 
   /**
    * Default method for emitter mapping.
@@ -3281,6 +3281,27 @@ public void setEmittance(String materialName, float value) {
     refresh(ResetReason.MATERIALS_CHANGED);
   }
 
+  /**
+   * Modifies the emittance property for the given material.
+   */
+  public void setEmitterMappingOffset(String materialName, float value) {
+    JsonObject material = materials.getOrDefault(materialName, new JsonObject()).object();
+    material.set("emitterMappingOffset", Json.of(value));
+    materials.put(materialName, material);
+    refresh(ResetReason.MATERIALS_CHANGED);
+  }
+
+  /**
+   * Modifies the emittance property for the given material.
+   */
+  public void setEmitterMappingTypeOverride(String materialName, EmitterMappingType value) {
+    JsonObject material = materials.getOrDefault(materialName, new JsonObject()).object();
+    material.set("emitterMappingType", Json.of(value.toString()));
+    materials.put(materialName, material);
+    System.out.println(materialName + ", " + value);
+    refresh(ResetReason.MATERIALS_CHANGED);
+  }
+
   /**
    * Modifies the specular coefficient property for the given material.
    */
diff --git a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
index d308643c4f..f823270603 100644
--- a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
+++ b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
@@ -114,6 +114,7 @@ public LightingTab() throws IOException {
     emitterIntensity.onValueChange(value -> scene.setEmitterIntensity(value));
 
     emitterMappingType.getItems().addAll(EmitterMappingType.values());
+    emitterMappingType.getItems().remove(EmitterMappingType.NONE);
     emitterMappingType.getSelectionModel().selectedItemProperty().addListener(
       (observable, oldValue, newValue) -> scene.setEmitterMappingType(newValue));
     emitterMappingType.setTooltip(new Tooltip("Determines how per-pixel light emission is computed."));
diff --git a/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java b/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java
index a1644556ee..709fe6f2c5 100644
--- a/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java
+++ b/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java
@@ -17,6 +17,7 @@
  */
 package se.llbit.chunky.ui.render.tabs;
 
+import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
@@ -25,12 +26,11 @@
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import se.llbit.chunky.block.*;
+import se.llbit.chunky.renderer.EmitterMappingType;
 import se.llbit.chunky.renderer.scene.Scene;
 import se.llbit.chunky.resources.Texture;
 import se.llbit.chunky.ui.DoubleAdjuster;
@@ -50,6 +50,9 @@ public class MaterialsTab extends HBox implements RenderControlsTab, Initializab
   private Scene scene;
 
   private final DoubleAdjuster emittance = new DoubleAdjuster();
+  private final DoubleAdjuster emitterMappingOffset = new DoubleAdjuster();
+  private final ComboBox<EmitterMappingType> emitterMappingType = new ComboBox<>();
+  private javafx.beans.value.ChangeListener<? super EmitterMappingType> emtListener = null;
   private final DoubleAdjuster specular = new DoubleAdjuster();
   private final DoubleAdjuster ior = new DoubleAdjuster();
   private final DoubleAdjuster perceptualSmoothness = new DoubleAdjuster();
@@ -60,6 +63,11 @@ public MaterialsTab() {
     emittance.setName("Emittance");
     emittance.setRange(0, 100);
     emittance.setTooltip("Intensity of the light emitted from the selected material.");
+    emitterMappingOffset.setName("Emitter mapping offset");
+    emitterMappingOffset.setRange(-5, 5);
+    emitterMappingOffset.setTooltip("Offset applied to the global emitter mapping exponent.");
+    emitterMappingType.getItems().addAll(EmitterMappingType.values());
+    emitterMappingType.setTooltip(new Tooltip("Overrides the global setting for emitter mapping type."));
     specular.setName("Specular");
     specular.setRange(0, 1);
     specular.setTooltip("Reflectivity of the selected material.");
@@ -83,11 +91,15 @@ public MaterialsTab() {
     listView.getSelectionModel().selectedItemProperty().addListener(
         (observable, oldValue, materialName) -> updateSelectedMaterial(materialName)
     );
+    HBox emt = new HBox();
+    emt.setSpacing(10);
+    emt.setAlignment(Pos.CENTER_LEFT);
+    emt.getChildren().addAll(new Label("Emitter mapping type:"), emitterMappingType);
     VBox settings = new VBox();
     settings.setSpacing(10);
     settings.getChildren().addAll(
         new Label("Material Properties"),
-        emittance, specular, perceptualSmoothness, ior, metalness,
+        emittance, emitterMappingOffset, emt, specular, perceptualSmoothness, ior, metalness,
         new Label("(set to zero to disable)"));
     setPadding(new Insets(10));
     setSpacing(15);
@@ -111,8 +123,13 @@ public MaterialsTab() {
 
   private void updateSelectedMaterial(String materialName) {
     boolean materialExists = false;
+    if(emtListener != null) {
+      emitterMappingType.getSelectionModel().selectedItemProperty().removeListener(emtListener);
+      emtListener = null;
+    }
     if (MaterialStore.collections.containsKey(materialName)) {
       double emAcc = 0;
+      double emoAcc = 0;
       double specAcc = 0;
       double iorAcc = 0;
       double perceptualSmoothnessAcc = 0;
@@ -120,12 +137,15 @@ private void updateSelectedMaterial(String materialName) {
       Collection<Block> blocks = MaterialStore.collections.get(materialName);
       for (Block block : blocks) {
         emAcc += block.emittance;
+        emoAcc += block.emitterMappingOffset;
         specAcc += block.specular;
         iorAcc += block.ior;
         perceptualSmoothnessAcc += block.getPerceptualSmoothness();
         metalnessAcc += block.metalness;
       }
       emittance.set(emAcc / blocks.size());
+      emitterMappingOffset.set(emoAcc / blocks.size());
+      emitterMappingType.getSelectionModel().select(EmitterMappingType.NONE);
       specular.set(specAcc / blocks.size());
       ior.set(iorAcc / blocks.size());
       perceptualSmoothness.set(perceptualSmoothnessAcc / blocks.size());
@@ -135,6 +155,8 @@ private void updateSelectedMaterial(String materialName) {
       Material material = ExtraMaterials.idMap.get(materialName);
       if (material != null) {
         emittance.set(material.emittance);
+        emitterMappingOffset.set(material.emitterMappingOffset);
+        emitterMappingType.getSelectionModel().select(material.emitterMappingType);
         specular.set(material.specular);
         ior.set(material.ior);
         perceptualSmoothness.set(material.getPerceptualSmoothness());
@@ -145,6 +167,8 @@ private void updateSelectedMaterial(String materialName) {
       Block block = new MinecraftBlock(materialName.substring(10), Texture.air);
       scene.getPalette().applyMaterial(block);
       emittance.set(block.emittance);
+      emitterMappingOffset.set(block.emitterMappingOffset);
+      emitterMappingType.getSelectionModel().select(block.emitterMappingType);
       specular.set(block.specular);
       ior.set(block.ior);
       perceptualSmoothness.set(block.getPerceptualSmoothness());
@@ -153,12 +177,16 @@ private void updateSelectedMaterial(String materialName) {
     }
     if (materialExists) {
       emittance.onValueChange(value -> scene.setEmittance(materialName, value.floatValue()));
+      emitterMappingOffset.onValueChange(value -> scene.setEmitterMappingOffset(materialName, value.floatValue()));
+      emtListener = (observable, oldValue, newValue) -> scene.setEmitterMappingTypeOverride(materialName, newValue);
+      emitterMappingType.getSelectionModel().selectedItemProperty().addListener(emtListener);
       specular.onValueChange(value -> scene.setSpecular(materialName, value.floatValue()));
       ior.onValueChange(value -> scene.setIor(materialName, value.floatValue()));
       perceptualSmoothness.onValueChange(value -> scene.setPerceptualSmoothness(materialName, value.floatValue()));
       metalness.onValueChange(value -> scene.setMetalness(materialName, value.floatValue()));
     } else {
       emittance.onValueChange(value -> {});
+      emitterMappingOffset.onValueChange(value -> {});
       specular.onValueChange(value -> {});
       ior.onValueChange(value -> {});
       perceptualSmoothness.onValueChange(value -> {});
diff --git a/chunky/src/java/se/llbit/chunky/world/Material.java b/chunky/src/java/se/llbit/chunky/world/Material.java
index 572af56774..204f77cc52 100644
--- a/chunky/src/java/se/llbit/chunky/world/Material.java
+++ b/chunky/src/java/se/llbit/chunky/world/Material.java
@@ -16,6 +16,7 @@
  */
 package se.llbit.chunky.world;
 
+import se.llbit.chunky.renderer.EmitterMappingType;
 import se.llbit.chunky.resources.Texture;
 import se.llbit.json.JsonObject;
 import se.llbit.json.JsonString;
@@ -60,6 +61,16 @@ public abstract class Material {
    */
   public float emittance = 0;
 
+  /**
+   * Offset to apply to the global emitter mapping exponent (the resulting value will be constrained to be >= 0).
+   */
+  public float emitterMappingOffset = 0;
+
+  /**
+   * Overrides the global emitter mapping type unless set to NONE.
+   */
+  public EmitterMappingType emitterMappingType = EmitterMappingType.NONE;
+
   /**
    * The (linear) roughness controlling how rough a shiny block appears. A value of 0 makes the
    * surface perfectly specular, a value of 1 makes it diffuse.
@@ -123,6 +134,8 @@ public void loadMaterialProperties(JsonObject json) {
     ior = json.get("ior").floatValue(ior);
     specular = json.get("specular").floatValue(specular);
     emittance = json.get("emittance").floatValue(emittance);
+    emitterMappingOffset = json.get("emitterMappingOffset").floatValue(emitterMappingOffset);
+    emitterMappingType = EmitterMappingType.valueOf(json.get("emitterMappingType").asString(emitterMappingType.toString()));
     roughness = json.get("roughness").floatValue(roughness);
     metalness = json.get("metalness").floatValue(metalness);
   }

From 3fe2548d8efd28cfe219491ecb6a747a548c7558 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Sat, 9 Sep 2023 00:37:07 -0400
Subject: [PATCH 05/15] assign some defaults and fix all emittances

---
 .../chunky/block/MinecraftBlockProvider.java  |   4 +-
 .../se/llbit/chunky/chunk/BlockPalette.java   | 115 +++++++++++-------
 .../se/llbit/chunky/world/ExtraMaterials.java |  11 +-
 .../java/se/llbit/chunky/world/Material.java  |   8 ++
 4 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
index f5421d9c7c..68497bd5c9 100644
--- a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
+++ b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
@@ -1935,9 +1935,7 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
         return stairs(
             tag, Texture.redSandstoneSide, Texture.redSandstoneTop, Texture.redSandstoneBottom);
       case "magma_block": {
-        Block block = new MinecraftBlock(name, Texture.magma);
-        block.emittance = 0.6f;
-        return block;
+        return new MinecraftBlock(name, Texture.magma);
       }
       case "nether_wart_block":
         return new MinecraftBlock(name, Texture.netherWartBlock);
diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index 3a39859f5d..c97c35d35d 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -245,7 +245,7 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     materialProperties.put(
         "minecraft:lava",
         block -> {
-          block.emittance = 1.0f;
+          block.setLightLevel(15);
         });
     Consumer<Block> glassConfig =
         block -> {
@@ -339,22 +339,27 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     });
     materialProperties.put("minecraft:redstone_torch", block -> {
       if (block instanceof RedstoneTorch && ((RedstoneTorch) block).isLit()) {
-        block.emittance = 1.0f;
+        block.setLightLevel(7);
+        block.emitterMappingOffset = 0.5f;
       }
     });
     materialProperties.put("minecraft:redstone_wall_torch", block -> {
       if (block instanceof  RedstoneWallTorch && ((RedstoneWallTorch) block).isLit()) {
-        block.emittance = 1.0f;
+        block.setLightLevel(7);
+        block.emitterMappingOffset = 0.5f;
       }
     });
     materialProperties.put("minecraft:torch", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(14);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:wall_torch", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(14);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:fire", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
+      block.emitterMappingOffset = -0.5f;
     });
     materialProperties.put("minecraft:ice", block -> {
       block.ior = 1.31f;
@@ -365,37 +370,38 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       block.refractive = true;
     });
     materialProperties.put("minecraft:glowstone", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
     });
     materialProperties.put("minecraft:portal", block -> { // MC <1.13
-      block.emittance = 0.4f;
+      block.setLightLevel(11);
     });
     materialProperties.put("minecraft:nether_portal", block -> { // MC >=1.13
-      block.emittance = 0.4f;
+      block.setLightLevel(11);
     });
     materialProperties.put("minecraft:jack_o_lantern", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:beacon", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
       block.ior = 1.52f;
     });
     materialProperties.put("minecraft:redstone_lamp", block -> {
       if (block instanceof RedstoneLamp && ((RedstoneLamp) block).isLit()) {
-        block.emittance = 1.0f;
+        block.setLightLevel(15);
       }
     });
     materialProperties.put("minecraft:emerald_block", block -> {
       block.specular = 0.04f;
     });
     materialProperties.put("minecraft:sea_lantern", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
     });
-    materialProperties.put("minecraft:magma", block -> {
-      block.emittance = 0.6f;
+    materialProperties.put("minecraft:magma_block", block -> {
+      block.setLightLevel(3);
     });
     materialProperties.put("minecraft:end_rod", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(14);
     });
     materialProperties.put("minecraft:kelp", block -> {
       block.waterlogged = true;
@@ -412,68 +418,79 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     materialProperties.put("minecraft:sea_pickle", block -> {
       if (block instanceof SeaPickle) {
         if (((SeaPickle) block).live) {
-          block.emittance = 1.0f / 15f * (3 * ((SeaPickle) block).pickles + 1);
+          block.setLightLevel(3 * ((SeaPickle) block).pickles + 1);
         }
       }
     });
     materialProperties.put("minecraft:campfire", block -> {
       if (block instanceof Campfire && ((Campfire)block).isLit) {
-        block.emittance = 1.0f;
+        block.setLightLevel(15);
       }
     });
     materialProperties.put("minecraft:furnace", block -> {
       if(block instanceof Furnace && ((Furnace)block).isLit()) {
-        block.emittance = 1.0f;
+        block.setLightLevel(13);
+        block.emitterMappingOffset = 0.5f;
       }
     });
     materialProperties.put("minecraft:smoker", block -> {
       if(block instanceof Smoker && ((Smoker)block).isLit()) {
-        block.emittance = 1.0f;
+        block.setLightLevel(13);
+        block.emitterMappingOffset = 0.5f;
       }
     });
     materialProperties.put("minecraft:blast_furnace", block -> {
       if(block instanceof BlastFurnace && ((BlastFurnace)block).isLit()) {
-        block.emittance = 1.0f;
+        block.setLightLevel(13);
+        block.emitterMappingOffset = 0.5f;
       }
     });
     materialProperties.put("minecraft:lantern", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:shroomlight", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
     });
     materialProperties.put("minecraft:soul_fire_lantern", block -> { // MC 20w06a-20w16a
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:soul_lantern", block -> { // MC >= 20w17a
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:soul_fire_torch", block -> { // MC 20w06a-20w16a
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:soul_torch", block -> { // MC >= 20w17a
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:soul_fire_wall_torch", block -> { // MC 20w06a-20w16a
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:soul_wall_torch", block -> { // MC >= 20w17a
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
+      block.emitterMappingOffset = 0.5f;
     });
     materialProperties.put("minecraft:soul_fire", block -> {
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
+      block.emitterMappingOffset = -0.5f;
     });
     materialProperties.put("minecraft:crying_obsidian", block -> {
-      block.emittance = 0.6f;
+      block.setLightLevel(10);
     });
     materialProperties.put("minecraft:enchanting_table", block -> {
-      block.emittance = 0.5f;
+      block.setLightLevel(7);
     });
     materialProperties.put("minecraft:respawn_anchor", block -> {
       if (block instanceof RespawnAnchor) {
         int charges = ((RespawnAnchor)block).charges;
         if (charges > 0) {
-          block.emittance = 1.0f / 15 * (charges * 4 - 2);
+          block.setLightLevel(charges * 4 - 2);
         }
       }
     });
@@ -528,57 +545,61 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       }
     });
     materialProperties.put("minecraft:small_amethyst_bud", block -> {
-      block.emittance = 1.0f / 15f;
+      block.setLightLevel(1);
     });
     materialProperties.put("minecraft:medium_amethyst_bud", block -> {
-      block.emittance = 1.0f / 15f * 2;
+      block.setLightLevel(2);
     });
     materialProperties.put("minecraft:large_amethyst_bud", block -> {
-      block.emittance = 1.0f / 15f * 4;
+      block.setLightLevel(4);
     });
     materialProperties.put("minecraft:amethyst_cluster", block -> {
-      block.emittance = 1.0f / 15f * 5;
+      block.setLightLevel(5);
     });
     materialProperties.put("minecraft:tinted_glass", glassConfig);
     materialProperties.put("minecraft:sculk_sensor", block -> {
       if (block instanceof SculkSensor && ((SculkSensor) block).isActive()) {
-        block.emittance = 1.0f / 15f;
+        block.setLightLevel(1);
       }
     });
     materialProperties.put("minecraft:calibrated_sculk_sensor", block -> {
       if (block instanceof CalibratedSculkSensor && ((CalibratedSculkSensor) block).isActive()) {
-        block.emittance = 1.0f / 15f;
+        block.setLightLevel(1);
       }
     });
     materialProperties.put("minecraft:glow_lichen", block -> {
-      block.emittance = 1.0f / 15f * 7;
+      block.setLightLevel(7);
     });
     materialProperties.put("minecraft:cave_vines_plant", block -> {
       if (block instanceof CaveVines && ((CaveVines) block).hasBerries()) {
-        block.emittance = 1.0f / 15f * 14;
+        block.setLightLevel(14);
       }
     });
     materialProperties.put("minecraft:cave_vines", block -> {
       if (block instanceof CaveVines && ((CaveVines) block).hasBerries()) {
-        block.emittance = 1.0f / 15f * 14;
+        block.setLightLevel(14);
+        block.emitterMappingOffset = 0.5f;
       }
     });
     materialProperties.put("minecraft:light", block -> {
       if (block instanceof LightBlock) {
-        block.emittance = 1.0f / 15f * 4 * ((LightBlock) block).getLevel();
+        block.setLightLevel(4 * ((LightBlock) block).getLevel());
       }
     });
     materialProperties.put("minecraft:ochre_froglight", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
+      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:verdant_froglight", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
+      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:pearlescent_froglight", block -> {
-      block.emittance = 1.0f;
+      block.setLightLevel(15);
+      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:sculk_catalyst", block -> {
-      block.emittance = 1.0f / 15f * 6;
+      block.setLightLevel(6);
     });
     for(String s : new String[]{"minecraft:", "minecraft:waxed_"}) {
       materialProperties.put(s + "copper_bulb", block -> {
diff --git a/chunky/src/java/se/llbit/chunky/world/ExtraMaterials.java b/chunky/src/java/se/llbit/chunky/world/ExtraMaterials.java
index f34613f649..bd19c72d6c 100644
--- a/chunky/src/java/se/llbit/chunky/world/ExtraMaterials.java
+++ b/chunky/src/java/se/llbit/chunky/world/ExtraMaterials.java
@@ -42,16 +42,19 @@ public static void loadDefaultMaterialProperties() {
     CloudMaterial.INSTANCE.restoreDefaults();
 
     Candle.flameMaterial.restoreDefaults();
-    Candle.flameMaterial.emittance = 1.0f;
+    Candle.flameMaterial.setLightLevel(12);
+    Candle.flameMaterial.emitterMappingOffset = -0.5f;
 
     Campfire.flameMaterial.restoreDefaults();
-    Campfire.flameMaterial.emittance = 1.0f;
+    Campfire.flameMaterial.setLightLevel(15);
+    Campfire.flameMaterial.emitterMappingOffset = -0.5f;
 
     Campfire.soulFlameMaterial.restoreDefaults();
-    Campfire.soulFlameMaterial.emittance = 0.6f;
+    Campfire.soulFlameMaterial.setLightLevel(10);
+    Campfire.soulFlameMaterial.emitterMappingOffset = -0.5f;
 
     CalibratedSculkSensorAmethyst.activeMaterial.restoreDefaults();
-    CalibratedSculkSensorAmethyst.activeMaterial.emittance = 1.0f / 15;
+    CalibratedSculkSensorAmethyst.activeMaterial.setLightLevel(1);
 
     CalibratedSculkSensorAmethyst.inactiveMaterial.restoreDefaults();
   }
diff --git a/chunky/src/java/se/llbit/chunky/world/Material.java b/chunky/src/java/se/llbit/chunky/world/Material.java
index 204f77cc52..0524508b48 100644
--- a/chunky/src/java/se/llbit/chunky/world/Material.java
+++ b/chunky/src/java/se/llbit/chunky/world/Material.java
@@ -159,4 +159,12 @@ public double getPerceptualSmoothness() {
   public void setPerceptualSmoothness(double perceptualSmoothness) {
     roughness = (float) Math.pow(1 - perceptualSmoothness, 2);
   }
+
+  /**
+   * Set the emittance based on a Minecraft light level
+   * @param level The light level from 0 to 15
+   */
+  public void setLightLevel(float level) {
+    emittance = level / 15;
+  }
 }

From 1a345205164d9a20383a04081df454989541bb96 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Sat, 9 Sep 2023 00:59:38 -0400
Subject: [PATCH 06/15] tweaks

---
 .../src/java/se/llbit/chunky/chunk/BlockPalette.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index c97c35d35d..1ce03d7414 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -430,35 +430,35 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     materialProperties.put("minecraft:furnace", block -> {
       if(block instanceof Furnace && ((Furnace)block).isLit()) {
         block.setLightLevel(13);
-        block.emitterMappingOffset = 0.5f;
+        block.emitterMappingOffset = 2.0f;
       }
     });
     materialProperties.put("minecraft:smoker", block -> {
       if(block instanceof Smoker && ((Smoker)block).isLit()) {
         block.setLightLevel(13);
-        block.emitterMappingOffset = 0.5f;
+        block.emitterMappingOffset = 2.0f;
       }
     });
     materialProperties.put("minecraft:blast_furnace", block -> {
       if(block instanceof BlastFurnace && ((BlastFurnace)block).isLit()) {
         block.setLightLevel(13);
-        block.emitterMappingOffset = 0.5f;
+        block.emitterMappingOffset = 2.0f;
       }
     });
     materialProperties.put("minecraft:lantern", block -> {
       block.setLightLevel(15);
-      block.emitterMappingOffset = 0.5f;
+      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:shroomlight", block -> {
       block.setLightLevel(15);
     });
     materialProperties.put("minecraft:soul_fire_lantern", block -> { // MC 20w06a-20w16a
       block.setLightLevel(10);
-      block.emitterMappingOffset = 0.5f;
+      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:soul_lantern", block -> { // MC >= 20w17a
       block.setLightLevel(10);
-      block.emitterMappingOffset = 0.5f;
+      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:soul_fire_torch", block -> { // MC 20w06a-20w16a
       block.setLightLevel(10);

From db8e0892d168fa242058b88260703a37e241046e Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Sat, 9 Sep 2023 14:03:18 -0400
Subject: [PATCH 07/15] add REFERENCE_COLORS mode

---
 .../se/llbit/chunky/chunk/BlockPalette.java     | 13 ++++++++++---
 .../chunky/renderer/EmitterMappingType.java     |  1 +
 .../llbit/chunky/renderer/scene/PathTracer.java | 11 ++++++++++-
 .../java/se/llbit/chunky/world/Material.java    | 17 +++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index 1ce03d7414..1d9e21b44f 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -20,7 +20,10 @@
 import se.llbit.chunky.block.minecraft.*;
 import se.llbit.chunky.plugin.PluginApi;
 import se.llbit.chunky.resources.Texture;
+import se.llbit.chunky.renderer.EmitterMappingType;
+import se.llbit.chunky.renderer.scene.Scene;
 import se.llbit.math.Octree;
+import se.llbit.math.Vector3;
 import se.llbit.nbt.CompoundTag;
 import se.llbit.nbt.IntTag;
 import se.llbit.nbt.StringTag;
@@ -428,21 +431,25 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       }
     });
     materialProperties.put("minecraft:furnace", block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(255, 255, 215, 0.38f);
+      block.addRefColorGammaCorrected(230, 171, 16, 0.38f);
       if(block instanceof Furnace && ((Furnace)block).isLit()) {
         block.setLightLevel(13);
-        block.emitterMappingOffset = 2.0f;
       }
     });
     materialProperties.put("minecraft:smoker", block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(228, 169, 17, 0.32f);
       if(block instanceof Smoker && ((Smoker)block).isLit()) {
         block.setLightLevel(13);
-        block.emitterMappingOffset = 2.0f;
       }
     });
     materialProperties.put("minecraft:blast_furnace", block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(224, 128, 46, 0.25f);
       if(block instanceof BlastFurnace && ((BlastFurnace)block).isLit()) {
         block.setLightLevel(13);
-        block.emitterMappingOffset = 2.0f;
       }
     });
     materialProperties.put("minecraft:lantern", block -> {
diff --git a/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java b/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
index 305d6b3066..2fde1f0653 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/EmitterMappingType.java
@@ -5,6 +5,7 @@
 public enum EmitterMappingType implements Registerable {
   NONE("None", "Fallback to default option - should only be used for materials (not global default)"),
   BRIGHTEST_CHANNEL("Brightest Channel", "Emitted light (R', G', B') = (R*M^P, G*M^P, B*M^P) where M = max(R, G, B) and P is the specified power. Emitted light will always match pixel color."),
+  REFERENCE_COLORS("Reference Colors", "Like BRIGHTEST_CHANNEL, but only for colors near enough to a reference color; rest of pixels won't emit at all."),
   INDEPENDENT_CHANNELS("Independent Channels", "Emitted light (R', G', B') = (R^P, G^P, B^P) where P is the specified power. Saturation of emitted light increases with P - possibly less realistic in some situations.");
   private final String displayName;
   private final String description;
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
index e8440dab30..4f9107584f 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
@@ -469,9 +469,18 @@ private static void translucentRayColor(Scene scene, Ray ray, Ray next, Vector4
   private static void doEmittanceMapping(Vector3 emittance, Vector4 color, Scene scene, Material material) {
     double exp = Math.max(scene.getEmitterMappingExponent() + material.emitterMappingOffset, 0);
     EmitterMappingType mt = material.emitterMappingType == EmitterMappingType.NONE ? scene.getEmitterMappingType() : material.emitterMappingType;
+    double val;
     switch(mt) {
       case BRIGHTEST_CHANNEL:
-        double val = FastMath.pow(Math.max(color.x, Math.max(color.y, color.z)), exp);
+        val = FastMath.pow(Math.max(color.x, Math.max(color.y, color.z)), exp);
+        emittance.set(color.x * val, color.y * val, color.z * val);
+        break;
+      case REFERENCE_COLORS:
+        boolean emit = false;
+        for(Vector4 refcolor : material.emitterMappingReferenceColor) {
+          emit = emit || (Math.max(Math.abs(color.x - refcolor.x), Math.max(Math.abs(color.y - refcolor.y), Math.abs(color.z - refcolor.z))) <= refcolor.w);
+        }
+        val = emit ? FastMath.pow(Math.max(color.x, Math.max(color.y, color.z)), exp) : 0;
         emittance.set(color.x * val, color.y * val, color.z * val);
         break;
       case INDEPENDENT_CHANNELS:
diff --git a/chunky/src/java/se/llbit/chunky/world/Material.java b/chunky/src/java/se/llbit/chunky/world/Material.java
index 0524508b48..676ee405b0 100644
--- a/chunky/src/java/se/llbit/chunky/world/Material.java
+++ b/chunky/src/java/se/llbit/chunky/world/Material.java
@@ -17,11 +17,15 @@
 package se.llbit.chunky.world;
 
 import se.llbit.chunky.renderer.EmitterMappingType;
+import se.llbit.chunky.renderer.scene.Scene;
 import se.llbit.chunky.resources.Texture;
 import se.llbit.json.JsonObject;
 import se.llbit.json.JsonString;
 import se.llbit.json.JsonValue;
 import se.llbit.math.Ray;
+import se.llbit.math.Vector4;
+
+import java.util.ArrayList;
 
 public abstract class Material {
 
@@ -71,6 +75,12 @@ public abstract class Material {
    */
   public EmitterMappingType emitterMappingType = EmitterMappingType.NONE;
 
+  /**
+   * (x, y, z): The color to use for the REFERENCE_COLORS emitter mapping type.
+   * w: The range surrounding the specified color to apply full brightness.
+   */
+  public ArrayList<Vector4> emitterMappingReferenceColor = new ArrayList<>();
+
   /**
    * The (linear) roughness controlling how rough a shiny block appears. A value of 0 makes the
    * surface perfectly specular, a value of 1 makes it diffuse.
@@ -114,6 +124,9 @@ public void restoreDefaults() {
     solid = true;
     specular = 0;
     emittance = 0;
+    emitterMappingOffset = 0;
+    emitterMappingType = EmitterMappingType.NONE;
+    emitterMappingReferenceColor = new ArrayList<>();
     roughness = 0;
     subSurfaceScattering = false;
   }
@@ -167,4 +180,8 @@ public void setPerceptualSmoothness(double perceptualSmoothness) {
   public void setLightLevel(float level) {
     emittance = level / 15;
   }
+
+  public void addRefColorGammaCorrected(float r, float g, float b, float delta) {
+    emitterMappingReferenceColor.add(new Vector4(Math.pow(r/255, Scene.DEFAULT_GAMMA), Math.pow(g/255, Scene.DEFAULT_GAMMA), Math.pow(b/255, Scene.DEFAULT_GAMMA), delta));
+  }
 }

From d48dc3f3960ec1f6518f0a02761bff690abd7dde Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Sat, 9 Sep 2023 17:30:21 -0400
Subject: [PATCH 08/15] colors for torches and lanterns

---
 .../se/llbit/chunky/chunk/BlockPalette.java   | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index 1d9e21b44f..1b7d68302d 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -340,26 +340,25 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       block.metalness = 1.0f;
       block.setPerceptualSmoothness(0.9);
     });
-    materialProperties.put("minecraft:redstone_torch", block -> {
+    Consumer<Block> redstoneTorchConfig = block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(255, 255, 210, 0.35f);
+      block.addRefColorGammaCorrected(255, 185, 0, 0.25f);
+      block.addRefColorGammaCorrected(221, 0, 0, 0.3f);
       if (block instanceof RedstoneTorch && ((RedstoneTorch) block).isLit()) {
         block.setLightLevel(7);
-        block.emitterMappingOffset = 0.5f;
       }
-    });
-    materialProperties.put("minecraft:redstone_wall_torch", block -> {
-      if (block instanceof  RedstoneWallTorch && ((RedstoneWallTorch) block).isLit()) {
-        block.setLightLevel(7);
-        block.emitterMappingOffset = 0.5f;
-      }
-    });
-    materialProperties.put("minecraft:torch", block -> {
-      block.setLightLevel(14);
-      block.emitterMappingOffset = 0.5f;
-    });
-    materialProperties.put("minecraft:wall_torch", block -> {
+    };
+    materialProperties.put("minecraft:redstone_torch", redstoneTorchConfig);
+    materialProperties.put("minecraft:redstone_wall_torch", redstoneTorchConfig);
+    Consumer<Block> torchConfig = block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(255, 255, 210, 0.35f);
+      block.addRefColorGammaCorrected(255, 185, 0, 0.25f);
       block.setLightLevel(14);
-      block.emitterMappingOffset = 0.5f;
-    });
+    };
+    materialProperties.put("minecraft:torch", torchConfig);
+    materialProperties.put("minecraft:wall_torch", torchConfig);
     materialProperties.put("minecraft:fire", block -> {
       block.setLightLevel(15);
       block.emitterMappingOffset = -0.5f;
@@ -453,36 +452,37 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       }
     });
     materialProperties.put("minecraft:lantern", block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(254, 254, 179, 0.25f);
+      block.addRefColorGammaCorrected(253, 158, 76, 0.45f);
+      block.addRefColorGammaCorrected(134, 73, 42, 0.05f);
       block.setLightLevel(15);
-      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:shroomlight", block -> {
       block.setLightLevel(15);
     });
     materialProperties.put("minecraft:soul_fire_lantern", block -> { // MC 20w06a-20w16a
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(220, 252, 255, 0.5f);
+      block.addRefColorGammaCorrected(76, 198, 202, 0.3f);
       block.setLightLevel(10);
-      block.emitterMappingOffset = 1.0f;
     });
     materialProperties.put("minecraft:soul_lantern", block -> { // MC >= 20w17a
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(220, 252, 255, 0.5f);
+      block.addRefColorGammaCorrected(76, 198, 202, 0.3f);
       block.setLightLevel(10);
-      block.emitterMappingOffset = 1.0f;
-    });
-    materialProperties.put("minecraft:soul_fire_torch", block -> { // MC 20w06a-20w16a
-      block.setLightLevel(10);
-      block.emitterMappingOffset = 0.5f;
-    });
-    materialProperties.put("minecraft:soul_torch", block -> { // MC >= 20w17a
-      block.setLightLevel(10);
-      block.emitterMappingOffset = 0.5f;
-    });
-    materialProperties.put("minecraft:soul_fire_wall_torch", block -> { // MC 20w06a-20w16a
-      block.setLightLevel(10);
-      block.emitterMappingOffset = 0.5f;
     });
-    materialProperties.put("minecraft:soul_wall_torch", block -> { // MC >= 20w17a
+    Consumer<Block> soulTorchConfig = block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(199, 252, 254, 0.45f);
+      block.addRefColorGammaCorrected(35, 204, 209, 0.25f);
       block.setLightLevel(10);
-      block.emitterMappingOffset = 0.5f;
-    });
+    };
+    materialProperties.put("minecraft:soul_fire_torch", soulTorchConfig); // MC 20w06a-20w16a
+    materialProperties.put("minecraft:soul_torch", soulTorchConfig); // MC >= 20w17a
+    materialProperties.put("minecraft:soul_fire_wall_torch", soulTorchConfig); // MC 20w06a-20w16a
+    materialProperties.put("minecraft:soul_wall_torch", soulTorchConfig); // MC >= 20w17a
     materialProperties.put("minecraft:soul_fire", block -> {
       block.setLightLevel(10);
       block.emitterMappingOffset = -0.5f;

From 90164ad9814cdd1cf4c49f60ac71f0de01e56a92 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Sat, 9 Sep 2023 22:02:35 -0400
Subject: [PATCH 09/15] end rods and glow berries

---
 .../se/llbit/chunky/chunk/BlockPalette.java     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index 1b7d68302d..9892dacf74 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -403,6 +403,8 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       block.setLightLevel(3);
     });
     materialProperties.put("minecraft:end_rod", block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(248, 236, 219, 0.3f);
       block.setLightLevel(14);
     });
     materialProperties.put("minecraft:kelp", block -> {
@@ -577,17 +579,16 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     materialProperties.put("minecraft:glow_lichen", block -> {
       block.setLightLevel(7);
     });
-    materialProperties.put("minecraft:cave_vines_plant", block -> {
-      if (block instanceof CaveVines && ((CaveVines) block).hasBerries()) {
-        block.setLightLevel(14);
-      }
-    });
-    materialProperties.put("minecraft:cave_vines", block -> {
+    Consumer<Block> caveVinesConfig = block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(241, 189, 85, 0.3f);
+      block.addRefColorGammaCorrected(164, 100, 34, 0.05f);
       if (block instanceof CaveVines && ((CaveVines) block).hasBerries()) {
         block.setLightLevel(14);
-        block.emitterMappingOffset = 0.5f;
       }
-    });
+    };
+    materialProperties.put("minecraft:cave_vines_plant", caveVinesConfig);
+    materialProperties.put("minecraft:cave_vines", caveVinesConfig);
     materialProperties.put("minecraft:light", block -> {
       if (block instanceof LightBlock) {
         block.setLightLevel(4 * ((LightBlock) block).getLevel());

From b5172945084b0a59c5bef9c22e57fe4563a42638 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Wed, 13 Sep 2023 01:37:50 -0400
Subject: [PATCH 10/15] JSON parsing for reference colors

---
 .../chunky/renderer/scene/PathTracer.java     |  2 +-
 .../java/se/llbit/chunky/world/Material.java  | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
index 4f9107584f..0b514892a5 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
@@ -477,7 +477,7 @@ private static void doEmittanceMapping(Vector3 emittance, Vector4 color, Scene s
         break;
       case REFERENCE_COLORS:
         boolean emit = false;
-        for(Vector4 refcolor : material.emitterMappingReferenceColor) {
+        for(Vector4 refcolor : material.emitterMappingReferenceColors) {
           emit = emit || (Math.max(Math.abs(color.x - refcolor.x), Math.max(Math.abs(color.y - refcolor.y), Math.abs(color.z - refcolor.z))) <= refcolor.w);
         }
         val = emit ? FastMath.pow(Math.max(color.x, Math.max(color.y, color.z)), exp) : 0;
diff --git a/chunky/src/java/se/llbit/chunky/world/Material.java b/chunky/src/java/se/llbit/chunky/world/Material.java
index 676ee405b0..ca3eec0150 100644
--- a/chunky/src/java/se/llbit/chunky/world/Material.java
+++ b/chunky/src/java/se/llbit/chunky/world/Material.java
@@ -19,6 +19,7 @@
 import se.llbit.chunky.renderer.EmitterMappingType;
 import se.llbit.chunky.renderer.scene.Scene;
 import se.llbit.chunky.resources.Texture;
+import se.llbit.json.JsonArray;
 import se.llbit.json.JsonObject;
 import se.llbit.json.JsonString;
 import se.llbit.json.JsonValue;
@@ -79,7 +80,7 @@ public abstract class Material {
    * (x, y, z): The color to use for the REFERENCE_COLORS emitter mapping type.
    * w: The range surrounding the specified color to apply full brightness.
    */
-  public ArrayList<Vector4> emitterMappingReferenceColor = new ArrayList<>();
+  public ArrayList<Vector4> emitterMappingReferenceColors = new ArrayList<>();
 
   /**
    * The (linear) roughness controlling how rough a shiny block appears. A value of 0 makes the
@@ -126,7 +127,7 @@ public void restoreDefaults() {
     emittance = 0;
     emitterMappingOffset = 0;
     emitterMappingType = EmitterMappingType.NONE;
-    emitterMappingReferenceColor = new ArrayList<>();
+    emitterMappingReferenceColors = new ArrayList<>();
     roughness = 0;
     subSurfaceScattering = false;
   }
@@ -146,11 +147,24 @@ public JsonValue toJson() {
   public void loadMaterialProperties(JsonObject json) {
     ior = json.get("ior").floatValue(ior);
     specular = json.get("specular").floatValue(specular);
+    roughness = json.get("roughness").floatValue(roughness);
+    metalness = json.get("metalness").floatValue(metalness);
     emittance = json.get("emittance").floatValue(emittance);
     emitterMappingOffset = json.get("emitterMappingOffset").floatValue(emitterMappingOffset);
     emitterMappingType = EmitterMappingType.valueOf(json.get("emitterMappingType").asString(emitterMappingType.toString()));
-    roughness = json.get("roughness").floatValue(roughness);
-    metalness = json.get("metalness").floatValue(metalness);
+    JsonArray referenceColors = json.get("emitterMappingReferenceColors").array();
+    // Overwrite existing reference colors, but only if any are specified
+    if(referenceColors.size() > 0) {
+      emitterMappingReferenceColors = new ArrayList<>();
+    }
+    for(JsonValue refColorJson : referenceColors.elements) {
+      Vector4 refColor = new Vector4();
+      refColor.x = refColorJson.object().get("red").floatValue(0);
+      refColor.y = refColorJson.object().get("green").floatValue(0);
+      refColor.z = refColorJson.object().get("blue").floatValue(0);
+      refColor.w = refColorJson.object().get("range").floatValue(0);
+      emitterMappingReferenceColors.add(refColor);
+    }
   }
 
   public boolean isWater() {
@@ -182,6 +196,6 @@ public void setLightLevel(float level) {
   }
 
   public void addRefColorGammaCorrected(float r, float g, float b, float delta) {
-    emitterMappingReferenceColor.add(new Vector4(Math.pow(r/255, Scene.DEFAULT_GAMMA), Math.pow(g/255, Scene.DEFAULT_GAMMA), Math.pow(b/255, Scene.DEFAULT_GAMMA), delta));
+    emitterMappingReferenceColors.add(new Vector4(Math.pow(r/255, Scene.DEFAULT_GAMMA), Math.pow(g/255, Scene.DEFAULT_GAMMA), Math.pow(b/255, Scene.DEFAULT_GAMMA), delta));
   }
 }

From 8fb22d534fd0725efbed24a77d5c39ccde3341db Mon Sep 17 00:00:00 2001
From: Justin Barker <justintimecuber@gmail.com>
Date: Wed, 13 Sep 2023 12:21:05 -0400
Subject: [PATCH 11/15] Hide extra settings behind "Advanced" checkbox in
 materials & "Enable emitters" in lighting

---
 .../chunky/ui/render/tabs/LightingTab.java    | 18 ++++++++++-
 .../chunky/ui/render/tabs/MaterialsTab.java   | 30 ++++++++++++++-----
 .../chunky/ui/render/tabs/LightingTab.fxml    | 22 +++++++-------
 3 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
index f823270603..cfbf250dc2 100644
--- a/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
+++ b/chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java
@@ -25,6 +25,7 @@
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import se.llbit.chunky.renderer.EmitterMappingType;
 import se.llbit.chunky.renderer.EmitterSamplingStrategy;
@@ -53,6 +54,7 @@ public class LightingTab extends ScrollPane implements RenderControlsTab, Initia
   @FXML private DoubleAdjuster skyIntensity;
   @FXML private DoubleAdjuster apparentSkyBrightness;
   @FXML private DoubleAdjuster emitterIntensity;
+  @FXML private VBox emitterSettings;
   @FXML private ComboBox<EmitterMappingType> emitterMappingType;
   @FXML private DoubleAdjuster emitterMappingExponent;
   @FXML private DoubleAdjuster sunIntensity;
@@ -104,7 +106,21 @@ public LightingTab() throws IOException {
 
     enableEmitters.setTooltip(new Tooltip("Allow blocks to emit light based on their material settings."));
     enableEmitters.selectedProperty().addListener(
-      (observable, oldValue, newValue) -> scene.setEmittersEnabled(newValue));
+      (observable, oldValue, newValue) -> {
+        scene.setEmittersEnabled(newValue);
+        emitterSettings.setVisible(newValue);
+        emitterSettings.setManaged(newValue);
+      });
+    boolean showEmitterSettings = scene != null && scene.getEmittersEnabled();
+    emitterSettings.setVisible(showEmitterSettings);
+    emitterSettings.setManaged(showEmitterSettings);
+
+//    fancierTranslucency.selectedProperty()
+//      .addListener((observable, oldValue, newValue) -> {
+//        scene.setFancierTranslucency(newValue);
+//        transmissivityCap.setVisible(newValue);
+//        transmissivityCap.setManaged(newValue);
+//      });
 
     emitterIntensity.setName("Emitter intensity");
     emitterIntensity.setTooltip("Modifies the intensity of emitter light.");
diff --git a/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java b/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java
index 709fe6f2c5..99e09955db 100644
--- a/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java
+++ b/chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java
@@ -57,6 +57,8 @@ public class MaterialsTab extends HBox implements RenderControlsTab, Initializab
   private final DoubleAdjuster ior = new DoubleAdjuster();
   private final DoubleAdjuster perceptualSmoothness = new DoubleAdjuster();
   private final DoubleAdjuster metalness = new DoubleAdjuster();
+  private final CheckBox advanced = new CheckBox();
+  private final VBox advancedSettings = new VBox();
   private final ListView<String> listView;
 
   public MaterialsTab() {
@@ -80,6 +82,20 @@ public MaterialsTab() {
     metalness.setName("Metalness");
     metalness.setRange(0, 1);
     metalness.setTooltip("Metalness (texture-tinted reflectivity) of the selected material.");
+    advanced.setText("Advanced settings");
+    advanced.setTooltip(new Tooltip("Show advanced settings"));
+    advanced.selectedProperty().addListener((observable, oldValue, newValue) -> {
+        advancedSettings.setVisible(newValue);
+        advancedSettings.setManaged(newValue);
+      });
+    HBox emt = new HBox();
+    emt.setSpacing(10);
+    emt.setAlignment(Pos.CENTER_LEFT);
+    emt.getChildren().addAll(new Label("Emitter mapping type:"), emitterMappingType);
+    advancedSettings.setSpacing(10);
+    advancedSettings.getChildren().addAll(emitterMappingOffset, emt);
+    advancedSettings.setVisible(false);
+    advancedSettings.setManaged(false);
     ObservableList<String> blockIds = FXCollections.observableArrayList();
     blockIds.addAll(MaterialStore.collections.keySet());
     blockIds.addAll(ExtraMaterials.idMap.keySet());
@@ -91,16 +107,14 @@ public MaterialsTab() {
     listView.getSelectionModel().selectedItemProperty().addListener(
         (observable, oldValue, materialName) -> updateSelectedMaterial(materialName)
     );
-    HBox emt = new HBox();
-    emt.setSpacing(10);
-    emt.setAlignment(Pos.CENTER_LEFT);
-    emt.getChildren().addAll(new Label("Emitter mapping type:"), emitterMappingType);
     VBox settings = new VBox();
     settings.setSpacing(10);
     settings.getChildren().addAll(
         new Label("Material Properties"),
-        emittance, emitterMappingOffset, emt, specular, perceptualSmoothness, ior, metalness,
-        new Label("(set to zero to disable)"));
+        emittance, specular, perceptualSmoothness, ior, metalness,
+        new Label("(set to zero to disable)"),
+        advanced, advancedSettings
+      );
     setPadding(new Insets(10));
     setSpacing(15);
     TextField filterField = new TextField();
@@ -176,7 +190,9 @@ private void updateSelectedMaterial(String materialName) {
       materialExists = true;
     }
     if (materialExists) {
-      emittance.onValueChange(value -> scene.setEmittance(materialName, value.floatValue()));
+      emittance.onValueChange(value -> {
+        scene.setEmittance(materialName, value.floatValue());
+      });
       emitterMappingOffset.onValueChange(value -> scene.setEmitterMappingOffset(materialName, value.floatValue()));
       emtListener = (observable, oldValue, newValue) -> scene.setEmitterMappingTypeOverride(materialName, newValue);
       emitterMappingType.getSelectionModel().selectedItemProperty().addListener(emtListener);
diff --git a/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml b/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
index e517b479c1..047cacf8de 100644
--- a/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
+++ b/chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml
@@ -20,16 +20,18 @@
     <DoubleAdjuster fx:id="apparentSkyBrightness" maxWidth="1.7976931348623157E308" />
     <Separator />
     <CheckBox fx:id="enableEmitters" mnemonicParsing="false" text="Enable emitters" />
-    <DoubleAdjuster fx:id="emitterIntensity" maxWidth="1.7976931348623157E308" />
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-      <Label text="Emitter mapping type:" />
-      <ComboBox fx:id="emitterMappingType" />
-    </HBox>
-    <DoubleAdjuster fx:id="emitterMappingExponent" maxWidth="1.7976931348623157E308" />
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-      <Label text="Emitter sampling strategy:" />
-      <ChoiceBox fx:id="emitterSamplingStrategy" />
-    </HBox>
+    <VBox fx:id="emitterSettings" spacing="10.0">
+      <DoubleAdjuster fx:id="emitterIntensity" maxWidth="1.7976931348623157E308" />
+      <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="Emitter mapping type:" />
+        <ComboBox fx:id="emitterMappingType" />
+      </HBox>
+      <DoubleAdjuster fx:id="emitterMappingExponent" maxWidth="1.7976931348623157E308" />
+      <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="Emitter sampling strategy:" />
+        <ChoiceBox fx:id="emitterSamplingStrategy" />
+      </HBox>
+    </VBox>
     <Separator />
     <CheckBox fx:id="drawSun" mnemonicParsing="false" text="Draw sun" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">

From eba5b5fe3d7b75da9eddc85550fce5c17d1d7235 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Wed, 20 Sep 2023 23:05:44 -0400
Subject: [PATCH 12/15] add redstone ore reference colors

---
 .../src/java/se/llbit/chunky/chunk/BlockPalette.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index 9892dacf74..5fde1114c3 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -351,6 +351,16 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     };
     materialProperties.put("minecraft:redstone_torch", redstoneTorchConfig);
     materialProperties.put("minecraft:redstone_wall_torch", redstoneTorchConfig);
+    materialProperties.put("minecraft:redstone_ore", block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(254, 118, 118, 0.2f);
+      block.addRefColorGammaCorrected(210, 3, 3, 0.2f);
+    });
+    materialProperties.put("minecraft:deepslate_redstone_ore", block -> {
+      block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+      block.addRefColorGammaCorrected(254, 118, 118, 0.2f);
+      block.addRefColorGammaCorrected(210, 3, 3, 0.35f);
+    });
     Consumer<Block> torchConfig = block -> {
       block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
       block.addRefColorGammaCorrected(255, 255, 210, 0.35f);

From 38dc155e1b487725816977c3fcabed85e133127a Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Wed, 1 Nov 2023 20:56:39 -0400
Subject: [PATCH 13/15] copper bulb emitter maps

---
 .../chunky/block/MinecraftBlockProvider.java  |  6 ++--
 .../se/llbit/chunky/chunk/BlockPalette.java   | 34 ++++++++++++++++---
 .../chunky/renderer/scene/PathTracer.java     | 21 +++++++-----
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
index 68497bd5c9..0348129e8e 100644
--- a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
+++ b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
@@ -1095,19 +1095,19 @@ private static void addBlocks(Texture texture, String... names) {
       addBlock(s + "copper_door", (name, tag) -> door(tag, Texture.copperDoorTop, Texture.copperDoorBottom));
       addBlock(s + "copper_trapdoor", (name, tag) -> trapdoor(tag, Texture.copperTrapdoor));
       addBlock(s + "exposed_chiseled_copper", Texture.exposedChiseledCopper);
-      addBlock(s + "exposed_copper_grate", Texture.exposedCopperGrate);
+      addBlock(s + "exposed_copper_grate", (name, tag) -> new SolidNonOpaqueBlock(name, Texture.exposedCopperGrate));
       addBlock(s + "exposed_copper_bulb", (name, tag) -> new CopperBulb(name, tag.get("Properties").get("lit").stringValue().equals("true"), tag.get("Properties").get("powered").stringValue().equals("true"),
         Texture.exposedCopperBulbLitPowered, Texture.exposedCopperBulbLit, Texture.exposedCopperBulbPowered, Texture.exposedCopperBulb));
       addBlock(s + "exposed_copper_door", (name, tag) -> door(tag, Texture.exposedCopperDoorTop, Texture.exposedCopperDoorBottom));
       addBlock(s + "exposed_copper_trapdoor", (name, tag) -> trapdoor(tag, Texture.exposedCopperTrapdoor));
       addBlock(s + "weathered_chiseled_copper", Texture.weatheredChiseledCopper);
-      addBlock(s + "weathered_copper_grate", Texture.weatheredCopperGrate);
+      addBlock(s + "weathered_copper_grate", (name, tag) -> new SolidNonOpaqueBlock(name, Texture.weatheredCopperGrate));
       addBlock(s + "weathered_copper_bulb", (name, tag) -> new CopperBulb(name, tag.get("Properties").get("lit").stringValue().equals("true"), tag.get("Properties").get("powered").stringValue().equals("true"),
         Texture.weatheredCopperBulbLitPowered, Texture.weatheredCopperBulbLit, Texture.weatheredCopperBulbPowered, Texture.weatheredCopperBulb));
       addBlock(s + "weathered_copper_door", (name, tag) -> door(tag, Texture.weatheredCopperDoorTop, Texture.weatheredCopperDoorBottom));
       addBlock(s + "weathered_copper_trapdoor", (name, tag) -> trapdoor(tag, Texture.weatheredCopperTrapdoor));
       addBlock(s + "oxidized_chiseled_copper", Texture.oxidizedChiseledCopper);
-      addBlock(s + "oxidized_copper_grate", Texture.oxidizedCopperGrate);
+      addBlock(s + "oxidized_copper_grate", (name, tag) -> new SolidNonOpaqueBlock(name, Texture.oxidizedCopperGrate));
       addBlock(s + "oxidized_copper_bulb", (name, tag) -> new CopperBulb(name, tag.get("Properties").get("lit").stringValue().equals("true"), tag.get("Properties").get("powered").stringValue().equals("true"),
         Texture.oxidizedCopperBulbLitPowered, Texture.oxidizedCopperBulbLit, Texture.oxidizedCopperBulbPowered, Texture.oxidizedCopperBulb));
       addBlock(s + "oxidized_copper_door", (name, tag) -> door(tag, Texture.oxidizedCopperDoorTop, Texture.oxidizedCopperDoorBottom));
diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index 5fde1114c3..e3cb04da19 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -619,25 +619,49 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     materialProperties.put("minecraft:sculk_catalyst", block -> {
       block.setLightLevel(6);
     });
+    Consumer<Block> copperBulbRedLight = block -> {
+      block.addRefColorGammaCorrected(217, 35, 35, 0.05f);
+      block.addRefColorGammaCorrected(176, 23, 23, 0.05f);
+      block.addRefColorGammaCorrected(138, 24, 24, 0.05f);
+    };
     for(String s : new String[]{"minecraft:", "minecraft:waxed_"}) {
       materialProperties.put(s + "copper_bulb", block -> {
-        if(block instanceof CopperBulb && ((CopperBulb) block).isLit()) {
-          block.emittance = 1.0f;
+        block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+        block.addRefColorGammaCorrected(255, 235, 186, 0.25f);
+        block.addRefColorGammaCorrected(251, 184, 96, 0.25f);
+        copperBulbRedLight.accept(block);
+        copperConfig.accept(block);
+        if(block instanceof CopperBulb && (((CopperBulb) block).isLit() || ((CopperBulb) block).isPowered())) {
+          block.setLightLevel(15);
         }
       });
       materialProperties.put(s + "exposed_copper_bulb", block -> {
+        block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+        block.addRefColorGammaCorrected(247, 204, 136, 0.25f);
+        block.addRefColorGammaCorrected(238, 155, 50, 0.2f);
+        copperBulbRedLight.accept(block);
+        exposedCopperConfig.accept(block);
         if(block instanceof CopperBulb && ((CopperBulb) block).isLit()) {
-          block.emittance = 12 / 15f;
+          block.setLightLevel(12);
         }
       });
       materialProperties.put(s + "weathered_copper_bulb", block -> {
+        block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+        block.addRefColorGammaCorrected(234, 184, 91, 0.25f);
+        block.addRefColorGammaCorrected(224, 151, 53, 0.25f);
+        copperBulbRedLight.accept(block);
+        weatheredCopperConfig.accept(block);
         if(block instanceof CopperBulb && ((CopperBulb) block).isLit()) {
-          block.emittance = 8 / 15f;
+          block.setLightLevel(8);
         }
       });
       materialProperties.put(s + "oxidized_copper_bulb", block -> {
+        block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
+        block.addRefColorGammaCorrected(212, 153, 67, 0.25f);
+        block.addRefColorGammaCorrected(191, 113, 65, 0.25f);
+        copperBulbRedLight.accept(block);
         if(block instanceof CopperBulb && ((CopperBulb) block).isLit()) {
-          block.emittance = 4 / 15f;
+          block.setLightLevel(4);
         }
       });
     }
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
index 0b514892a5..40bd8753a7 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
@@ -140,7 +140,7 @@ public static boolean pathTrace(Scene scene, Ray ray, WorkerState state,
       for (int i = 0; i < count; i++) {
         boolean doMetal = pMetal > Ray.EPSILON && random.nextFloat() < pMetal;
         if (doMetal || (pSpecular > Ray.EPSILON && random.nextFloat() < pSpecular)) {
-          hit |= doSpecularReflection(ray, next, cumulativeColor, doMetal, random, state, scene);
+          hit |= doSpecularReflection(ray, next, currentMat, cumulativeColor, doMetal, random, state, scene);
         } else if(random.nextFloat() < pDiffuse) {
           hit |= doDiffuseReflection(ray, next, currentMat, cumulativeColor, random, state, scene);
         } else if (n1 != n2) {
@@ -202,20 +202,23 @@ public static boolean pathTrace(Scene scene, Ray ray, WorkerState state,
     return hit;
   }
 
-  private static boolean doSpecularReflection(Ray ray, Ray next, Vector4 cumulativeColor, boolean doMetal, Random random, WorkerState state, Scene scene) {
+  private static boolean doSpecularReflection(Ray ray, Ray next, Material currentMat, Vector4 cumulativeColor, boolean doMetal, Random random, WorkerState state, Scene scene) {
     boolean hit = false;
+    Vector3 emittance = new Vector3();
+    if(scene.emittersEnabled && currentMat.emittance > Ray.EPSILON) {
+      doEmittanceMapping(emittance, ray.color, scene, currentMat);
+    }
     next.specularReflection(ray, random);
     if (pathTrace(scene, next, state, false)) {
-
       if (doMetal) {
         // use the albedo color as specular color
-        cumulativeColor.x += ray.color.x * next.color.x;
-        cumulativeColor.y += ray.color.y * next.color.y;
-        cumulativeColor.z += ray.color.z * next.color.z;
+        cumulativeColor.x += emittance.x + ray.color.x * next.color.x;
+        cumulativeColor.y += emittance.y + ray.color.y * next.color.y;
+        cumulativeColor.z += emittance.z + ray.color.z * next.color.z;
       } else {
-        cumulativeColor.x += next.color.x;
-        cumulativeColor.y += next.color.y;
-        cumulativeColor.z += next.color.z;
+        cumulativeColor.x += emittance.x + next.color.x;
+        cumulativeColor.y += emittance.y + next.color.y;
+        cumulativeColor.z += emittance.z + next.color.z;
       }
       hit = true;
     }

From 863237c84d03926926556e75bda1dad025c08780 Mon Sep 17 00:00:00 2001
From: JustinTimeCuber <justintimecuber@gmail.com>
Date: Thu, 2 Nov 2023 20:31:38 -0400
Subject: [PATCH 14/15] some small fixes

---
 .../src/java/se/llbit/chunky/chunk/BlockPalette.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
index e3cb04da19..b98fcd9195 100644
--- a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
+++ b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -622,6 +622,7 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
     Consumer<Block> copperBulbRedLight = block -> {
       block.addRefColorGammaCorrected(217, 35, 35, 0.05f);
       block.addRefColorGammaCorrected(176, 23, 23, 0.05f);
+      block.addRefColorGammaCorrected(163, 24, 24, 0.05f);
       block.addRefColorGammaCorrected(138, 24, 24, 0.05f);
     };
     for(String s : new String[]{"minecraft:", "minecraft:waxed_"}) {
@@ -637,11 +638,11 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       });
       materialProperties.put(s + "exposed_copper_bulb", block -> {
         block.emitterMappingType = EmitterMappingType.REFERENCE_COLORS;
-        block.addRefColorGammaCorrected(247, 204, 136, 0.25f);
-        block.addRefColorGammaCorrected(238, 155, 50, 0.2f);
+        block.addRefColorGammaCorrected(253, 202, 138, 0.25f);
+        block.addRefColorGammaCorrected(223, 139, 41, 0.2f);
         copperBulbRedLight.accept(block);
         exposedCopperConfig.accept(block);
-        if(block instanceof CopperBulb && ((CopperBulb) block).isLit()) {
+        if(block instanceof CopperBulb && (((CopperBulb) block).isLit() || ((CopperBulb) block).isPowered())) {
           block.setLightLevel(12);
         }
       });
@@ -651,7 +652,7 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
         block.addRefColorGammaCorrected(224, 151, 53, 0.25f);
         copperBulbRedLight.accept(block);
         weatheredCopperConfig.accept(block);
-        if(block instanceof CopperBulb && ((CopperBulb) block).isLit()) {
+        if(block instanceof CopperBulb && (((CopperBulb) block).isLit() || ((CopperBulb) block).isPowered())) {
           block.setLightLevel(8);
         }
       });
@@ -660,7 +661,7 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
         block.addRefColorGammaCorrected(212, 153, 67, 0.25f);
         block.addRefColorGammaCorrected(191, 113, 65, 0.25f);
         copperBulbRedLight.accept(block);
-        if(block instanceof CopperBulb && ((CopperBulb) block).isLit()) {
+        if(block instanceof CopperBulb && (((CopperBulb) block).isLit() || ((CopperBulb) block).isPowered())) {
           block.setLightLevel(4);
         }
       });

From bf900cb8eb6561984f15ae3609087101c773bafa Mon Sep 17 00:00:00 2001
From: Justin Barker <46458276+JustinTimeCuber@users.noreply.github.com>
Date: Sun, 24 Mar 2024 21:47:20 -0400
Subject: [PATCH 15/15] Remove debug output

Co-authored-by: Maik Marschner <m.marschner@wertarbyte.com>
---
 chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
index 6fab11ee7a..5f9ced5153 100644
--- a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
+++ b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
@@ -3257,7 +3257,6 @@ public void setEmitterMappingTypeOverride(String materialName, EmitterMappingTyp
     JsonObject material = materials.getOrDefault(materialName, new JsonObject()).object();
     material.set("emitterMappingType", Json.of(value.toString()));
     materials.put(materialName, material);
-    System.out.println(materialName + ", " + value);
     refresh(ResetReason.MATERIALS_CHANGED);
   }