@woosh/meep-engine 3.50.0 → 3.52.0

package/src/shade/renderer/deferred/tonemap/TonemapAces2Tables.js

@@ -0,0 +1,97 @@
+import { assert } from "../../../../core/assert.js";
+import {
+    ACES2_BLOCK_FLOATS,
+    ACES2_LIMITING_REC709,
+    aces2_transform_block_write
+} from "../../shader/chunk/color/tonemap/aces/aces2_transform_block.js";
+import { PAPER_WHITE_NITS } from "../../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
+
+/**
+ * What {@link shader_tonemap_HDR_aces} binds as `aces2_tables`: two ACES 2.0 output transforms, each its parameters and
+ * gamut tables, both limited to Rec.709, the gamut of the SDR picture they expand.
+ *
+ * 1. An SDR display, 100 cd/m². The pass runs it backwards, from the SDR picture to the scene.
+ * 2. This display: the peak over the paper white, times 100 cd/m². A display at or under the paper white gets
+ *    100 cd/m², which the pass does not read.
+ *
+ * Both take SDR white for 100 cd/m², ACES 2.0's reference, so an SDR picture expanded for a display keeps SDR white
+ * where the paper white puts it.
+ *
+ * Building one transform takes 7 to 13 ms, so the tables are built on the first {@link update} rather than with the
+ * renderer, and again only when the display's peak changes.
+ */
+export class TonemapAces2Tables {
+    /**
+     * Both blocks, the SDR one first. Zero until the first {@link update}.
+     * @type {Float32Array}
+     */
+    data = new Float32Array(2 * ACES2_BLOCK_FLOATS);
+
+    #peak_nits = NaN;
+
+    /**
+     * @type {GPUBuffer|null}
+     */
+    #buffer = null;
+
+    #uploaded = false;
+
+    /**
+     * Build the tables for a display, if they are not built for it already.
+     *
+     * @param {number} peak_nits the display's peak, cd/m²
+     * @returns {boolean} whether {@link data} changed
+     */
+    update(peak_nits) {
+        assert.isNumber(peak_nits, 'peak_nits');
+        assert.greaterThan(peak_nits, 0, 'peak_nits');
+
+        if (peak_nits === this.#peak_nits) {
+            return false;
+        }
+
+        if (Number.isNaN(this.#peak_nits)) {
+            aces2_transform_block_write(this.data, 0, 100, ACES2_LIMITING_REC709);
+        }
+
+        const headroom = Math.max(peak_nits / PAPER_WHITE_NITS, 1);
+
+        aces2_transform_block_write(this.data, ACES2_BLOCK_FLOATS, 100 * headroom, ACES2_LIMITING_REC709);
+
+        this.#peak_nits = peak_nits;
+        this.#uploaded = false;
+
+        return true;
+    }
+
+    /**
+     * The tables on the device, written if they changed since the last call.
+     *
+     * @param {GPUDevice} device
+     * @returns {GPUBuffer}
+     */
+    gpu_buffer(device) {
+        if (this.#buffer === null) {
+            this.#buffer = device.createBuffer({
+                label: "tonemap/aces2 tables",
+                size: this.data.byteLength,
+                usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+            });
+            this.#uploaded = false;
+        }
+
+        if (!this.#uploaded) {
+            device.queue.writeBuffer(this.#buffer, 0, this.data);
+            this.#uploaded = true;
+        }
+
+        return this.#buffer;
+    }
+
+    destroy() {
+        if (this.#buffer !== null) {
+            this.#buffer.destroy();
+            this.#buffer = null;
+        }
+    }
+}

package/src/shade/renderer/deferred/{TonemapDisplaySettings.d.ts → tonemap/TonemapDisplaySettings.d.ts}

@@ -46,5 +46,5 @@ export const TONEMAP_SETTINGS_REC2020: WebGPUStruct;
  * TonemapDisplaySettings}.
  */
 export const TONEMAP_SETTINGS_REC2020_PEAK: WebGPUStruct;
-import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
+import { WebGPUStruct } from "../../shader/type/WebGPUStruct.js";
 //# sourceMappingURL=TonemapDisplaySettings.d.ts.map

package/src/shade/renderer/deferred/tonemap/TonemapDisplaySettings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TonemapDisplaySettings.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/TonemapDisplaySettings.js"],"names":[],"mappings":"AAiDA;;;;;;;;;GASG;AACH;IACI,qCAAqD;IACrD,qCAAqD;IACrD,qCAAqD;IAErD,sCAA8C;IAC9C,sCAA8C;IAC9C,sCAA8C;IAE9C;;;OAGG;IACH,WAFU,MAAM,CAEC;IAMjB;;;;;OAKG;IACH,oCAHW,oBAAoB,GAAC,MAAM,QAkBrC;CACJ;AAqBD;;GAEG;AACH,mDAAqF;AAErF;;;GAGG;AACH,wDAAmG;AAEnG;;GAEG;AACH,oDAAuF;AAEvF;;;GAGG;AACH,yDAAqG;6BAzIxE,mCAAmC"}

package/src/shade/renderer/deferred/{TonemapDisplaySettings.js → tonemap/TonemapDisplaySettings.js}

@@ -1,8 +1,8 @@
-import { m3_rgb_to_xyz_from_primaries } from "../../../core/color/xyz/m3_rgb_to_xyz_from_primaries.js";
-import { m3_invert } from "../../../core/geom/mat3/m3_invert.js";
-import { m3_multiply } from "../../../core/geom/mat3/m3_multiply.js";
-import { f32, vec3f } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
-import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
+import { m3_rgb_to_xyz_from_primaries } from "../../../../core/color/xyz/m3_rgb_to_xyz_from_primaries.js";
+import { m3_invert } from "../../../../core/geom/mat3/m3_invert.js";
+import { m3_multiply } from "../../../../core/geom/mat3/m3_multiply.js";
+import { f32, vec3f } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
+import { WebGPUStruct } from "../../shader/type/WebGPUStruct.js";
 
 // chromaticities of red, green and blue; every space here has a D65 white, so none needs chromatic adaptation
 const PRIMARIES_REC709 = [0.640, 0.330, 0.300, 0.600, 0.150, 0.060];

package/src/shade/renderer/deferred/{shader_tonemap_HDR.d.ts → tonemap/shader_tonemap_HDR.d.ts}

@@ -5,5 +5,5 @@
  * @type {ImageShader}
  */
 export const shader_tonemap_HDR: ImageShader;
-import { ImageShader } from "../shader/ImageShader.js";
+import { ImageShader } from "../../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_HDR.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_HDR.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_HDR.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_HDR.js"],"names":[],"mappings":"AA4DA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BAvEyB,6BAA6B"}

package/src/shade/renderer/deferred/{shader_tonemap_HDR.js → tonemap/shader_tonemap_HDR.js}

@@ -1,13 +1,13 @@
-import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
 import { TONEMAP_SETTINGS_REC2020_PEAK } from "./TonemapDisplaySettings.js";
-import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
-import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
-import { chunk_PAPER_WHITE_NITS } from "../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
-import { chunk_tonemap_gt7 } from "../shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_PAPER_WHITE_NITS } from "../../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
+import { chunk_tonemap_gt7 } from "../../shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
 

package/src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_aces.d.ts

@@ -0,0 +1,17 @@
+/**
+ * The HDR output with {@link ShadeToneMappingMode.ACES}, as Unreal Engine 5.8 does it with its default "Filmic" method
+ * on a display past 100 cd/m²: the SDR picture of {@link shader_tonemap_LDR_aces}, taken back to the scene through the
+ * inverse ACES 2.0 output transform for an SDR display, and rendered again with the ACES 2.0 output transform for this
+ * display, limited to Rec.709 as the SDR picture is. Written in the canvas's primaries, extended, where 1.0 is SDR
+ * white.
+ *
+ * A display at or under the paper white shows the SDR picture.
+ *
+ * Binds `aces2_tables`, the two transforms' parameters and gamut tables, which {@link TonemapAces2Tables} builds for
+ * the display.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_HDR_aces: ImageShader;
+import { ImageShader } from "../../shader/ImageShader.js";
+//# sourceMappingURL=shader_tonemap_HDR_aces.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_aces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_HDR_aces.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_aces.js"],"names":[],"mappings":"AA0EA;;;;;;;;;;;;;GAaG;AACH,sCAFU,WAAW,CAclB;4BA1FyB,6BAA6B"}

package/src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_aces.js

@@ -0,0 +1,101 @@
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
+import { f32 } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
+import { WebGPUArray } from "../../shader/type/WebGPUArray.js";
+import { TONEMAP_SETTINGS_REC709_PEAK } from "./TonemapDisplaySettings.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { ACES2_BLOCK_FLOATS } from "../../shader/chunk/color/tonemap/aces/aces2_transform_block.js";
+import { chunk_aces2_output_transform } from "../../shader/chunk/color/tonemap/aces/chunk_aces2_output_transform.js";
+import { chunk_tonemap_ue_filmic } from "../../shader/chunk/color/tonemap/aces/chunk_tonemap_ue_filmic.js";
+import { chunk_PAPER_WHITE_NITS } from "../../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
+
+const resources = new ShaderResourceSetDescriptor();
+
+resources.setImmediate("settings", TONEMAP_SETTINGS_REC709_PEAK);
+resources.createGroup()
+    .addTexture("input_color", "float")
+    .addUniform("exposure", F32_CONTAINER_STRUCT)
+    // two ACES 2.0 output transforms, TonemapAces2Tables: 100 cd/m² first, then the display's headroom
+    .addStorageBuffer("aces2_tables", WebGPUArray.from(f32))
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+const ACES2_SDR_BLOCK: u32 = 0u;
+const ACES2_DISPLAY_BLOCK: u32 = ${ACES2_BLOCK_FLOATS}u;
+
+@fragment
+fn main(
+  @builtin(position) coord : vec4<f32>,
+) -> @location(0) vec4<f32> {
+
+    // scene color in linear Rec. 709
+    var color = textureLoad(input_color, vec2i(coord.xy), 0).rgb;
+
+    // Apply exposure
+    color *= exposure.value;
+
+    // the SDR picture first, which is what Unreal 5.8 does with Filmic on any display
+    let film = tonemap_ue_filmic(color);
+
+    var picture = film;
+
+    if (settings.peak_nits > PAPER_WHITE_NITS) {
+        // back to the scene through ACES 2.0 at SDR white, then out again through ACES 2.0 at the display's peak over
+        // the paper white. Both transforms take SDR white for 100 cd/m² and both are limited to Rec.709, the SDR
+        // picture's own gamut, so as the headroom shrinks to none the picture becomes the SDR one.
+        let aces = aces2_inverse(ACES2_SDR_BLOCK, film);
+        picture = aces2_forward(ACES2_DISPLAY_BLOCK, aces);
+    }
+
+    // into the primaries the canvas reports it was configured with (Renderer#configure_context): Display P3, or
+    // sRGB where the browser would not configure P3
+    let color_display = mat3x3<f32>(
+        settings.display_from_rec709_c0,
+        settings.display_from_rec709_c1,
+        settings.display_from_rec709_c2
+    ) * picture;
+
+    // NOTE: no dithering, colorspace is wide
+
+    // apply gamma. Note that gamma is the same for "Display P3" and "sRGB"
+    return vec4(sRGBTransferOETF(color_display), 1.0);
+}
+    `, [
+        chunk_tonemap_ue_filmic,
+        chunk_aces2_output_transform,
+        chunk_PAPER_WHITE_NITS,
+        chunk_sRGBTransferOETF,
+    ]
+);
+
+/**
+ * The HDR output with {@link ShadeToneMappingMode.ACES}, as Unreal Engine 5.8 does it with its default "Filmic" method
+ * on a display past 100 cd/m²: the SDR picture of {@link shader_tonemap_LDR_aces}, taken back to the scene through the
+ * inverse ACES 2.0 output transform for an SDR display, and rendered again with the ACES 2.0 output transform for this
+ * display, limited to Rec.709 as the SDR picture is. Written in the canvas's primaries, extended, where 1.0 is SDR
+ * white.
+ *
+ * A display at or under the paper white shows the SDR picture.
+ *
+ * Binds `aces2_tables`, the two transforms' parameters and gamut tables, which {@link TonemapAces2Tables} builds for
+ * the display.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_HDR_aces = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Tonemap/HDR/aces",
+        resources,
+        body
+    }),
+    targets: [
+        {
+            label: "tone-mapped",
+            format: "rgba16float"
+        }
+    ]
+});

package/src/shade/renderer/deferred/{shader_tonemap_HDR_none.d.ts → tonemap/shader_tonemap_HDR_none.d.ts}

@@ -5,5 +5,5 @@
  * @type {ImageShader}
  */
 export const shader_tonemap_HDR_none: ImageShader;
-import { ImageShader } from "../shader/ImageShader.js";
+import { ImageShader } from "../../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_HDR_none.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_none.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_HDR_none.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_none.js"],"names":[],"mappings":"AA+CA;;;;;GAKG;AACH,sCAFU,WAAW,CAclB;4BA7DyB,6BAA6B"}

package/src/shade/renderer/deferred/{shader_tonemap_HDR_none.js → tonemap/shader_tonemap_HDR_none.js}

@@ -1,10 +1,10 @@
-import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
 import { TONEMAP_SETTINGS_REC709 } from "./TonemapDisplaySettings.js";
-import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
 resources.setImmediate("settings", TONEMAP_SETTINGS_REC709);

package/src/shade/renderer/deferred/{shader_tonemap_HDR_pbr_neutral.d.ts → tonemap/shader_tonemap_HDR_pbr_neutral.d.ts}

@@ -6,5 +6,5 @@
  * @type {ImageShader}
  */
 export const shader_tonemap_HDR_pbr_neutral: ImageShader;
-import { ImageShader } from "../shader/ImageShader.js";
+import { ImageShader } from "../../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_HDR_pbr_neutral.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_pbr_neutral.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_HDR_pbr_neutral.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_HDR_pbr_neutral.js"],"names":[],"mappings":"AA4DA;;;;;;GAMG;AACH,6CAFU,WAAW,CAclB;4BAzEyB,6BAA6B"}

package/src/shade/renderer/deferred/{shader_tonemap_HDR_pbr_neutral.js → tonemap/shader_tonemap_HDR_pbr_neutral.js}

@@ -1,12 +1,12 @@
-import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
 import { TONEMAP_SETTINGS_REC709_PEAK } from "./TonemapDisplaySettings.js";
-import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
-import { chunk_PAPER_WHITE_NITS } from "../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
-import { chunk_tonemap_khronos_pbr } from "../shader/chunk/color/tonemap/chunk_tonemap_khronos_pbr.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_PAPER_WHITE_NITS } from "../../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
+import { chunk_tonemap_khronos_pbr } from "../../shader/chunk/color/tonemap/chunk_tonemap_khronos_pbr.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
 

package/src/shade/renderer/deferred/{shader_tonemap_LDR.d.ts → tonemap/shader_tonemap_LDR.d.ts}

@@ -5,5 +5,5 @@
  * @type {ImageShader}
  */
 export const shader_tonemap_LDR: ImageShader;
-import { ImageShader } from "../shader/ImageShader.js";
+import { ImageShader } from "../../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_LDR.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_LDR.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_LDR.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_LDR.js"],"names":[],"mappings":"AA6DA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BArEyB,6BAA6B"}

package/src/shade/renderer/deferred/{shader_tonemap_LDR.js → tonemap/shader_tonemap_LDR.js}

@@ -1,16 +1,16 @@
-import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
 import { TONEMAP_SETTINGS_REC2020 } from "./TonemapDisplaySettings.js";
-import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
-import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
-import { chunk_PAPER_WHITE_NITS } from "../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
-import { chunk_tonemap_gt7 } from "../shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js";
+import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_PAPER_WHITE_NITS } from "../../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
+import { chunk_tonemap_gt7 } from "../../shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js";
 import {
     chunk_dither_color_8bit_triangle_noise
-} from "../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+} from "../../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
 resources.setImmediate("settings", TONEMAP_SETTINGS_REC2020);

package/src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_aces.d.ts

@@ -0,0 +1,10 @@
+/**
+ * The SDR output with {@link ShadeToneMappingMode.ACES}: exposure, Unreal Engine's default "Filmic" tone mapping, the
+ * canvas's primaries, the sRGB transfer curve and an 8-bit dither. {@link shader_tonemap_HDR_aces} expands the same
+ * picture into an HDR display's headroom.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_LDR_aces: ImageShader;
+import { ImageShader } from "../../shader/ImageShader.js";
+//# sourceMappingURL=shader_tonemap_LDR_aces.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_aces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_LDR_aces.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_aces.js"],"names":[],"mappings":"AAyDA;;;;;;GAMG;AACH,sCAFU,WAAW,CAclB;4BApEyB,6BAA6B"}

package/src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_aces.js

@@ -0,0 +1,77 @@
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
+import { TONEMAP_SETTINGS_REC709 } from "./TonemapDisplaySettings.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_tonemap_ue_filmic } from "../../shader/chunk/color/tonemap/aces/chunk_tonemap_ue_filmic.js";
+import {
+    chunk_dither_color_8bit_triangle_noise
+} from "../../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
+
+const resources = new ShaderResourceSetDescriptor();
+resources.setImmediate("settings", TONEMAP_SETTINGS_REC709);
+resources.createGroup()
+    .addTexture("input_color", "float")
+    .addUniform("exposure", F32_CONTAINER_STRUCT)
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@fragment
+fn main(
+  @builtin(position) coord : vec4<f32>,
+) -> @location(0) vec4<f32> {
+
+    // scene color in linear Rec. 709
+    var color = textureLoad(input_color, vec2i(coord.xy), 0).rgb;
+
+    color *= exposure.value;
+
+    // Unreal's default SDR rendering, in Rec.709 and within it
+    color = tonemap_ue_filmic(color);
+
+    // into the primaries the canvas reports it was configured with (Renderer#configure_context): Display P3, or
+    // sRGB where the browser would not configure P3. A Rec.709 colour sits inside both.
+    let color_display = mat3x3<f32>(
+        settings.display_from_rec709_c0,
+        settings.display_from_rec709_c1,
+        settings.display_from_rec709_c2
+    ) * color;
+
+    // apply gamma. Note that gamma is the same for "Display P3" and "sRGB"
+    color = sRGBTransferOETF(color_display);
+
+    // apply dither to remove color banding
+    color += dither_color_8bit_triangle_noise(coord.xy);
+
+    return vec4(color, 1.0);
+}
+    `, [
+        chunk_tonemap_ue_filmic,
+        chunk_dither_color_8bit_triangle_noise,
+        chunk_sRGBTransferOETF,
+    ]
+);
+
+/**
+ * The SDR output with {@link ShadeToneMappingMode.ACES}: exposure, Unreal Engine's default "Filmic" tone mapping, the
+ * canvas's primaries, the sRGB transfer curve and an 8-bit dither. {@link shader_tonemap_HDR_aces} expands the same
+ * picture into an HDR display's headroom.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_LDR_aces = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Tonemap/LDR/aces",
+        resources,
+        body
+    }),
+    targets: [
+        {
+            label: "tone-mapped",
+            format: "rgba8unorm"
+        }
+    ]
+});

package/src/shade/renderer/deferred/{shader_tonemap_LDR_none.d.ts → tonemap/shader_tonemap_LDR_none.d.ts}

@@ -5,5 +5,5 @@
  * @type {ImageShader}
  */
 export const shader_tonemap_LDR_none: ImageShader;
-import { ImageShader } from "../shader/ImageShader.js";
+import { ImageShader } from "../../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_LDR_none.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_none.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_LDR_none.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_none.js"],"names":[],"mappings":"AAoDA;;;;;GAKG;AACH,sCAFU,WAAW,CAclB;4BA/DyB,6BAA6B"}

package/src/shade/renderer/deferred/{shader_tonemap_LDR_none.js → tonemap/shader_tonemap_LDR_none.js}

@@ -1,13 +1,13 @@
-import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
 import { TONEMAP_SETTINGS_REC709 } from "./TonemapDisplaySettings.js";
-import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
 import {
     chunk_dither_color_8bit_triangle_noise
-} from "../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+} from "../../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
 resources.setImmediate("settings", TONEMAP_SETTINGS_REC709);

package/src/shade/renderer/deferred/{shader_tonemap_LDR_pbr_neutral.d.ts → tonemap/shader_tonemap_LDR_pbr_neutral.d.ts}

@@ -6,5 +6,5 @@
  * @type {ImageShader}
  */
 export const shader_tonemap_LDR_pbr_neutral: ImageShader;
-import { ImageShader } from "../shader/ImageShader.js";
+import { ImageShader } from "../../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_LDR_pbr_neutral.d.ts.map

package/src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_pbr_neutral.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_LDR_pbr_neutral.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/shader_tonemap_LDR_pbr_neutral.js"],"names":[],"mappings":"AAwDA;;;;;;GAMG;AACH,6CAFU,WAAW,CAclB;4BAnEyB,6BAA6B"}

package/src/shade/renderer/deferred/{shader_tonemap_LDR_pbr_neutral.js → tonemap/shader_tonemap_LDR_pbr_neutral.js}

@@ -1,14 +1,14 @@
-import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { F32_CONTAINER_STRUCT } from "../../shader/type/F32_CONTAINER_STRUCT.js";
 import { TONEMAP_SETTINGS_REC709 } from "./TonemapDisplaySettings.js";
-import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
-import { chunk_tonemap_khronos_pbr } from "../shader/chunk/color/tonemap/chunk_tonemap_khronos_pbr.js";
+import { chunk_sRGBTransferOETF } from "../../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_tonemap_khronos_pbr } from "../../shader/chunk/color/tonemap/chunk_tonemap_khronos_pbr.js";
 import {
     chunk_dither_color_8bit_triangle_noise
-} from "../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+} from "../../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
 resources.setImmediate("settings", TONEMAP_SETTINGS_REC709);

package/src/shade/renderer/fluid/GPUFluidCascade.d.ts

@@ -136,7 +136,7 @@ export class GPUFluidCascade {
      * @param {*} _resources
      * @param {{encoder: ShadeGPUCommandContext}} context
      */
-    static "__#263@#execute_restrict"(record: object, _resources: any, context: {
+    static "__#264@#execute_restrict"(record: object, _resources: any, context: {
         encoder: ShadeGPUCommandContext;
     }): void;
     /**
@@ -144,7 +144,7 @@ export class GPUFluidCascade {
      * @param {*} _resources
      * @param {{encoder: ShadeGPUCommandContext}} context
      */
-    static "__#263@#execute_fill"(record: object, _resources: any, context: {
+    static "__#264@#execute_fill"(record: object, _resources: any, context: {
         encoder: ShadeGPUCommandContext;
     }): void;
     /**
@@ -152,7 +152,7 @@ export class GPUFluidCascade {
      * @param {import("../../../engine/graphics/render/frame_graph/FramePassResources.js").FramePassResources} resources
      * @param {{encoder: ShadeGPUCommandContext}} context
      */
-    static "__#263@#execute"(record: object, resources: import("../../../engine/graphics/render/frame_graph/FramePassResources.js").FramePassResources, context: {
+    static "__#264@#execute"(record: object, resources: import("../../../engine/graphics/render/frame_graph/FramePassResources.js").FramePassResources, context: {
         encoder: ShadeGPUCommandContext;
     }): void;
     /**

package/src/shade/renderer/fluid/GPUFluidCascadeStack.d.ts

@@ -56,7 +56,7 @@ export class GPUFluidCascadeStack {
      * @param {*} _resources
      * @param {{encoder: import("../../device/ShadeGPUCommandContext.js").ShadeGPUCommandContext}} context
      */
-    static "__#265@#execute_publish"(pass: object, _resources: any, context: {
+    static "__#266@#execute_publish"(pass: object, _resources: any, context: {
         encoder: import("../../device/ShadeGPUCommandContext.js").ShadeGPUCommandContext;
     }): void;
     /**

package/src/shade/renderer/fluid/forcing/GPUFluidForcing.d.ts

@@ -90,19 +90,19 @@ export class GPUFluidForcing {
      * @param {number} clear_size bytes cleared from 0 when the pool reuses the buffer
      * @returns {BufferResourceDescriptor}
      */
-    static "__#266@#descriptor"(kept: BufferResourceDescriptor[], role: number, size: number, usage: number, clear_size: number): BufferResourceDescriptor;
+    static "__#267@#descriptor"(kept: BufferResourceDescriptor[], role: number, size: number, usage: number, clear_size: number): BufferResourceDescriptor;
     /**
      * @param {object} record
      * @param {FramePassResources} resources
      * @param {{encoder: ShadeGPUCommandContext}} context
      */
-    static "__#266@#execute_extract"(record: object, resources: FramePassResources, context: {
+    static "__#267@#execute_extract"(record: object, resources: FramePassResources, context: {
         encoder: ShadeGPUCommandContext;
     }): void;
-    static "__#266@#execute_clear"(record: any, _resources: any, context: any): void;
-    static "__#266@#execute_query"(record: any, resources: any, context: any): void;
-    static "__#266@#execute_command"(record: any, resources: any, context: any): void;
-    static "__#266@#execute_apply"(record: any, resources: any, context: any): void;
+    static "__#267@#execute_clear"(record: any, _resources: any, context: any): void;
+    static "__#267@#execute_query"(record: any, resources: any, context: any): void;
+    static "__#267@#execute_command"(record: any, resources: any, context: any): void;
+    static "__#267@#execute_apply"(record: any, resources: any, context: any): void;
     /**
      * @param {object} options
      * @param {GPUDevice} options.device