@woosh/meep-engine 3.49.0 → 3.50.0

package/src/shade/renderer/deferred/shader_tonemap_LDR.js

@@ -1,7 +1,5 @@
-import { f32 } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
-import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
 import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
-import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.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";
@@ -15,6 +13,7 @@ import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSe
 import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
+resources.setImmediate("settings", TONEMAP_SETTINGS_REC2020);
 resources.createGroup()
     .addTexture("input_color", "float")
     .addUniform("exposure", F32_CONTAINER_STRUCT)
@@ -33,14 +32,18 @@ fn main(
     
     // GT7's SDR mode: the peak is the paper white, so the result tops out at 1.0. The HDR pass keeps the same paper
     // white, so below the shoulder the two write the same colour.
-    color = tonemap_gt7(color, PAPER_WHITE_NITS, PAPER_WHITE_NITS);
+    let color_2020 = tonemap_gt7_rec2020(CRM_FROM_REC709_TO_REC2020 * color, PAPER_WHITE_NITS, PAPER_WHITE_NITS);
     
-    // the canvas is configured "display-p3", so output in P3, as the HDR pass does
-    let color_2020 = CRM_FROM_REC709_TO_REC2020 * color;
-    let color_p3 = CRM_FROM_REC2020_TO_P3 * color_2020;
+    // 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_rec2020_c0,
+        settings.display_from_rec2020_c1,
+        settings.display_from_rec2020_c2
+    ) * color_2020;
     
     // apply gamma. Note that gamma is the same for "Display P3" and "sRGB"
-    color = sRGBTransferOETF(color_p3);
+    color = sRGBTransferOETF(color_display);
     
     // apply dither to remove color banding
     color += dither_color_8bit_triangle_noise(coord.xy);
@@ -51,15 +54,14 @@ fn main(
         chunk_tonemap_gt7,
         chunk_PAPER_WHITE_NITS,
         chunk_CRM_FROM_REC709_TO_REC2020,
-        chunk_CRM_FROM_REC2020_TO_P3,
         chunk_dither_color_8bit_triangle_noise,
         chunk_sRGBTransferOETF,
     ]
 );
 
 /**
- * The SDR output with {@link ShadeToneMappingMode.GT7}: exposure, GT7 in its SDR mode, Display P3, the sRGB transfer
- * curve and an 8-bit dither. {@link shader_tonemap_HDR} is the same operator for an HDR display.
+ * The SDR output with {@link ShadeToneMappingMode.GT7}: exposure, GT7 in its SDR mode, the canvas's primaries, the sRGB
+ * transfer curve and an 8-bit dither. {@link shader_tonemap_HDR} is the same operator for an HDR display.
  *
  * @type {ImageShader}
  */

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

@@ -1,6 +1,6 @@
 /**
- * The SDR output with {@link ShadeToneMappingMode.NONE}: exposure, Display P3, the sRGB transfer curve and an 8-bit
- * dither, and nothing in between.
+ * The SDR output with {@link ShadeToneMappingMode.NONE}: exposure, the canvas's primaries, the sRGB transfer curve and
+ * an 8-bit dither, and nothing in between.
  *
  * @type {ImageShader}
  */

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

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

package/src/shade/renderer/deferred/shader_tonemap_LDR_none.js

@@ -1,6 +1,5 @@
 import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
-import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.js";
-import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
+import { TONEMAP_SETTINGS_REC709 } from "./TonemapDisplaySettings.js";
 import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
 import {
     chunk_dither_color_8bit_triangle_noise
@@ -11,6 +10,7 @@ import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSe
 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)
@@ -29,10 +29,15 @@ fn main(
 
     // no tone mapping: the exposed colour as it is, 1.0 at SDR white. The 8-bit target clips what lies above.
 
-    // the canvas is configured "display-p3"
-    let color_p3 = CRM_FROM_REC2020_TO_P3 * (CRM_FROM_REC709_TO_REC2020 * 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
+    let color_display = mat3x3<f32>(
+        settings.display_from_rec709_c0,
+        settings.display_from_rec709_c1,
+        settings.display_from_rec709_c2
+    ) * color;
 
-    color = sRGBTransferOETF(color_p3);
+    color = sRGBTransferOETF(color_display);
 
     // apply dither to remove color banding
     color += dither_color_8bit_triangle_noise(coord.xy);
@@ -40,16 +45,14 @@ fn main(
     return vec4(color, 1.0);
 }
     `, [
-        chunk_CRM_FROM_REC709_TO_REC2020,
-        chunk_CRM_FROM_REC2020_TO_P3,
         chunk_dither_color_8bit_triangle_noise,
         chunk_sRGBTransferOETF,
     ]
 );
 
 /**
- * The SDR output with {@link ShadeToneMappingMode.NONE}: exposure, Display P3, the sRGB transfer curve and an 8-bit
- * dither, and nothing in between.
+ * The SDR output with {@link ShadeToneMappingMode.NONE}: exposure, the canvas's primaries, the sRGB transfer curve and
+ * an 8-bit dither, and nothing in between.
  *
  * @type {ImageShader}
  */

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

@@ -1,6 +1,6 @@
 /**
- * The SDR output with {@link ShadeToneMappingMode.PBR_NEUTRAL}: exposure, the Khronos PBR Neutral specification,
- * Display P3, the sRGB transfer curve and an 8-bit dither. {@link shader_tonemap_HDR_pbr_neutral} is the same
+ * The SDR output with {@link ShadeToneMappingMode.PBR_NEUTRAL}: exposure, the Khronos PBR Neutral specification, the
+ * canvas's primaries, the sRGB transfer curve and an 8-bit dither. {@link shader_tonemap_HDR_pbr_neutral} is the same
  * operator for an HDR display.
  *
  * @type {ImageShader}

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

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

package/src/shade/renderer/deferred/shader_tonemap_LDR_pbr_neutral.js

@@ -1,6 +1,5 @@
 import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
-import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.js";
-import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.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 {
@@ -12,6 +11,7 @@ import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSe
 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)
@@ -31,11 +31,16 @@ fn main(
     // the specification: its peak is SDR white. It takes non-negative input.
     color = tonemap_khronos_pbr(max(color, vec3<f32>(0.0)), 1.0);
 
-    // the canvas is configured "display-p3", so output in P3, as the HDR pass does
-    let color_p3 = CRM_FROM_REC2020_TO_P3 * (CRM_FROM_REC709_TO_REC2020 * 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
+    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_p3);
+    color = sRGBTransferOETF(color_display);
 
     // apply dither to remove color banding
     color += dither_color_8bit_triangle_noise(coord.xy);
@@ -44,16 +49,14 @@ fn main(
 }
     `, [
         chunk_tonemap_khronos_pbr,
-        chunk_CRM_FROM_REC709_TO_REC2020,
-        chunk_CRM_FROM_REC2020_TO_P3,
         chunk_dither_color_8bit_triangle_noise,
         chunk_sRGBTransferOETF,
     ]
 );
 
 /**
- * The SDR output with {@link ShadeToneMappingMode.PBR_NEUTRAL}: exposure, the Khronos PBR Neutral specification,
- * Display P3, the sRGB transfer curve and an 8-bit dither. {@link shader_tonemap_HDR_pbr_neutral} is the same
+ * The SDR output with {@link ShadeToneMappingMode.PBR_NEUTRAL}: exposure, the Khronos PBR Neutral specification, the
+ * canvas's primaries, the sRGB transfer curve and an 8-bit dither. {@link shader_tonemap_HDR_pbr_neutral} is the same
  * operator for an HDR display.
  *
  * @type {ImageShader}

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

@@ -0,0 +1,142 @@
+/**
+ * Cells a cascade's corner moves in: even for exact restriction, in 4s for the 4-cell bricks of
+ * cell-centred data (GPU_FLUID_CASCADES_PROPOSAL_2026_10_16.md §7, D2).
+ * @type {number}
+ */
+export const FLUID_CASCADE_CORNER_STEP: number;
+/**
+ * Cells past half a corner step the anchor goes from a window's centre before it moves: re-placed past
+ * 2.1 cells (§7).
+ * @type {number}
+ */
+export const FLUID_CASCADE_HYSTERESIS: number;
+/**
+ * Parent cells a child's window keeps from every face of its parent's: the published read's edge band
+ * (`chunk_wind_field_sample` blends a cascade with its parent across its outer 5 cells, the face row
+ * and WRF rows 2..5, and takes at most two taps), so no child reaches into its parent's band and a
+ * read never needs a third. Corners on the 4-cell lattice make the kept margin 6 in practice.
+ * @type {number}
+ */
+export const FLUID_CASCADE_NEST_MARGIN: number;
+/**
+ * Smallest window side, cells, that nests: a child covers half its parent, so the other half must
+ * hold the margin on both sides, rounded out to the corner lattice.
+ * @type {number}
+ */
+export const FLUID_CASCADE_NEST_RESOLUTION_MIN: number;
+/**
+ * What {@link FluidCascadePlacementplace } did.
+ */
+export type FluidCascadePlacementResult = number;
+/**
+ * What {@link FluidCascadePlacement#place} did.
+ * @readonly
+ * @enum {number}
+ */
+export const FluidCascadePlacementResult: Readonly<{
+    /** The window held. */
+    Held: 0;
+    /** The window moved, and the rest of the stack stayed. */
+    Moved: 1;
+    /** The move would have left a child outside its parent: the whole stack was re-placed. */
+    Jumped: 2;
+}>;
+/**
+ * Where the windows of a stack of fluid cascades are (GPU_FLUID_CASCADES_PROPOSAL_2026_10_16.md §7): the
+ * CPU half of `GPUFluidCascadeStack`, on the CPU alone so that placement is pinned without a device.
+ *
+ * Cascade `c` has cells of `cell_size·2^c` and the same resolution N; its window is
+ * `[corner, corner + N)` in its own cells, and world cell `g` of it covers `[g·h_c, (g + 1)·h_c)`, so
+ * the lattices nest: child cells `2G` and `2G + 1` lie in parent cell `G`. Every corner change goes
+ * through S0's window maths: {@link ClipmapWindowSet} places, `window_scroll_regions` (the stack's) says
+ * what a move exposed, and storage wraps, so a window that moves keeps every cell it still holds.
+ *
+ * **Placement** ({@link place}), on a cascade's own step tick, coarsest first:
+ * 1. the hysteretic rule (`ClipmapWindowSet#place`, corners in 4s, moved past 2.1 cells of the anchor);
+ * 2. a jump check: if that leaves the cascade's window not inside its parent's, or its child's window
+ *    not inside its own, the move is a jump and the **whole stack is re-placed**
+ *    ({@link place_all});
+ * 3. the nesting clamp (`ClipmapWindowSet#clamp_corner`): the corner is held so that its window keeps
+ *    {@link FLUID_CASCADE_NEST_MARGIN} parent cells inside its parent's, and so that its child's
+ *    window keeps the margin inside its own. Both ranges hold the corner it had, so both clamps
+ *    together land in both.
+ *
+ * {@link place_all} places every cascade, coarsest first, by the hysteretic rule, and clamps each into
+ * its parent: the first placement, and the answer to a jump.
+ *
+ * {@link begin} remembers every corner, so that after a tick's placements {@link moved} and
+ * {@link previous_corner} say what to fill.
+ *
+ * Nothing here allocates once constructed.
+ */
+export class FluidCascadePlacement {
+    /**
+     * @param {object} options
+     * @param {number} options.cascade_count 1 to 8
+     * @param {ArrayLike<number>} options.resolution cells on each axis, powers of two; at least
+     *   {@link FLUID_CASCADE_NEST_RESOLUTION_MIN} when there is more than one cascade
+     * @param {number} options.cell_size metres, cascade 0's
+     */
+    constructor({ cascade_count, resolution, cell_size }: {
+        cascade_count: number;
+        resolution: ArrayLike<number>;
+        cell_size: number;
+    });
+    /** @returns {number} */
+    get cascade_count(): number;
+    /** @returns {Readonly<Int32Array>} */
+    get resolution(): Readonly<Int32Array>;
+    /**
+     * Whether the stack has been placed.
+     * @returns {boolean}
+     */
+    get placed(): boolean;
+    /**
+     * A cascade's cell, metres: `cell_size·2^c`.
+     * @param {number} cascade
+     * @returns {number}
+     */
+    cell_size(cascade: number): number;
+    /**
+     * @param {number} cascade
+     * @param {number} axis
+     * @returns {number} the cascade's corner on the axis, in its own cells
+     */
+    corner(cascade: number, axis: number): number;
+    /**
+     * @param {number} cascade
+     * @param {number} axis
+     * @returns {number} the corner it had at the last {@link begin}
+     */
+    previous_corner(cascade: number, axis: number): number;
+    /**
+     * @param {number} cascade
+     * @returns {boolean} whether its corner moved since the last {@link begin}
+     */
+    moved(cascade: number): boolean;
+    /**
+     * Remember every corner: what {@link moved} and {@link previous_corner} compare with.
+     */
+    begin(): void;
+    /**
+     * Place every cascade, coarsest first, by the hysteretic rule, each child clamped into its parent.
+     *
+     * @param {number} x the anchor, world metres
+     * @param {number} y
+     * @param {number} z
+     */
+    place_all(x: number, y: number, z: number): void;
+    /**
+     * Place one cascade on its own step tick: the hysteretic rule, then the jump check, then the
+     * nesting clamp. Before the first {@link place_all} this places the whole stack.
+     *
+     * @param {number} cascade
+     * @param {number} x the anchor, world metres
+     * @param {number} y
+     * @param {number} z
+     * @returns {FluidCascadePlacementResult}
+     */
+    place(cascade: number, x: number, y: number, z: number): FluidCascadePlacementResult;
+    #private;
+}
+//# sourceMappingURL=FluidCascadePlacement.d.ts.map

package/src/shade/renderer/fluid/FluidCascadePlacement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FluidCascadePlacement.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/fluid/FluidCascadePlacement.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wCAFU,MAAM,CAE2B;AAE3C;;;;GAIG;AACH,uCAFU,MAAM,CAE4B;AAE5C;;;;;;GAMG;AACH,wCAFU,MAAM,CAE2B;AAE3C;;;;GAIG;AACH,gDAFU,MAAM,CAEoC;;;;0CAK1C,MAAM;AAHhB;;;;GAIG;AACH;IACI,uBAAuB;;IAEvB,0DAA0D;;IAE1D,0FAA0F;;GAE3F;AAgBH;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH;IAkBI;;;;;;OAMG;IACH;QAL2B,aAAa,EAA7B,MAAM;QACqB,UAAU,EAArC,UAAU,MAAM,CAAC;QAED,SAAS,EAAzB,MAAM;OA2BhB;IAED,wBAAwB;IACxB,4BAEC;IAED,sCAAsC;IACtC,uCAEC;IAED;;;OAGG;IACH,sBAEC;IAED;;;;OAIG;IACH,mBAHW,MAAM,GACJ,MAAM,CAIlB;IAED;;;;OAIG;IACH,gBAJW,MAAM,QACN,MAAM,GACJ,MAAM,CAIlB;IAED;;;;OAIG;IACH,yBAJW,MAAM,QACN,MAAM,GACJ,MAAM,CAIlB;IAED;;;OAGG;IACH,eAHW,MAAM,GACJ,OAAO,CAQnB;IAED;;OAEG;IACH,cAMC;IA2DD;;;;;;OAMG;IACH,aAJW,MAAM,KACN,MAAM,KACN,MAAM,QAyBhB;IAED;;;;;;;;;OASG;IACH,eANW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,GACJ,2BAA2B,CAwCvC;;CACJ"}