@woosh/meep-engine 2.169.1 → 2.169.3

package/src/engine/graphics/sh3/lightmap/lightmap_dilate.js

@@ -1,3 +1,5 @@
+import { grid_dilate_average } from "../grid_dilate_average.js";
+
 /**
  * Grow ("dilate") covered texels outward into their uncovered neighbours, so that
  * bilinear sampling across a chart boundary blends with valid lighting instead of
@@ -8,6 +10,10 @@
  * for the next iteration. Operates in place on a flat, row-major, `channels`-wide
  * pixel buffer.
  *
+ * Delegates to {@link grid_dilate_average} with a single z slice: the 3D
+ * face-neighbour sweep reduces to exactly 4-connected when `size_z` is 1. The
+ * light-probe grid runs the same kernel in 3D.
+ *
  * @param {Float32Array|number[]} data flat row-major pixel data, length width*height*channels
  * @param {Uint8Array} coverage flat row-major coverage mask (1 = has valid lighting), mutated
  * @param {number} width
@@ -16,74 +22,5 @@
  * @param {number} iterations how many texels of border to grow (≈ the atlas padding)
  */
 export function lightmap_dilate(data, coverage, width, height, channels, iterations) {
-    const acc = new Float64Array(channels);
-
-    for (let iter = 0; iter < iterations; iter++) {
-        // texels that become covered this round; deferred so a single pass does not
-        // chain-fill along a row from a texel filled earlier in the same iteration
-        const newly = [];
-
-        for (let y = 0; y < height; y++) {
-            for (let x = 0; x < width; x++) {
-                const index = y * width + x;
-
-                if (coverage[index] !== 0) {
-                    continue;
-                }
-
-                acc.fill(0);
-                let n = 0;
-
-                if (x > 0 && coverage[index - 1] !== 0) {
-                    accumulate(acc, data, (index - 1) * channels, channels);
-                    n++;
-                }
-                if (x < width - 1 && coverage[index + 1] !== 0) {
-                    accumulate(acc, data, (index + 1) * channels, channels);
-                    n++;
-                }
-                if (y > 0 && coverage[index - width] !== 0) {
-                    accumulate(acc, data, (index - width) * channels, channels);
-                    n++;
-                }
-                if (y < height - 1 && coverage[index + width] !== 0) {
-                    accumulate(acc, data, (index + width) * channels, channels);
-                    n++;
-                }
-
-                if (n === 0) {
-                    continue;
-                }
-
-                const base = index * channels;
-                const inv = 1 / n;
-                for (let c = 0; c < channels; c++) {
-                    data[base + c] = acc[c] * inv;
-                }
-
-                newly.push(index);
-            }
-        }
-
-        if (newly.length === 0) {
-            // fully grown, nothing left to reach
-            break;
-        }
-
-        for (let i = 0; i < newly.length; i++) {
-            coverage[newly[i]] = 1;
-        }
-    }
-}
-
-/**
- * @param {Float64Array} acc
- * @param {Float32Array|number[]} data
- * @param {number} offset
- * @param {number} channels
- */
-function accumulate(acc, data, offset, channels) {
-    for (let c = 0; c < channels; c++) {
-        acc[c] += data[offset + c];
-    }
+    grid_dilate_average(data, coverage, width, height, 1, channels, iterations);
 }

package/src/engine/graphics/sh3/lpg/light_probe_grid_dilate.d.ts

@@ -7,6 +7,12 @@
  * only probes that were valid before the pass started, so the result is independent of traversal
  * order. Probes with no valid probe anywhere in their connected region are left untouched.
  *
+ * Delegates to {@link grid_dilate_average}, the kernel the 2D lightmap gutter fill also uses.
+ * The iteration cap is the grid's L1 diameter, which is the exact worst case: every pass advances
+ * the filled front by one cell along each axis, so a reachable probe is always filled within
+ * `resolution_x + resolution_y + resolution_z` passes. It is a bound, not an early stop — the sweep
+ * still ends as soon as a pass fills nothing.
+ *
  * @param {Float32Array} harmonics probe data, {@link PROBE_VALUE_COUNT} values per probe; filled probes are written in place
  * @param {Uint8Array} validity one flag per probe, non-zero = valid; filled probes are marked valid in place
  * @param {number} resolution_x

package/src/engine/graphics/sh3/lpg/light_probe_grid_dilate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"light_probe_grid_dilate.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpg/light_probe_grid_dilate.js"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;;;GAeG;AACH,mDAPW,YAAY,YACZ,UAAU,gBACV,MAAM,gBACN,MAAM,gBACN,MAAM,GACJ,MAAM,CAsGlB"}
+{"version":3,"file":"light_probe_grid_dilate.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpg/light_probe_grid_dilate.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,mDAPW,YAAY,YACZ,UAAU,gBACV,MAAM,gBACN,MAAM,gBACN,MAAM,GACJ,MAAM,CAclB"}

package/src/engine/graphics/sh3/lpg/light_probe_grid_dilate.js

@@ -1,4 +1,4 @@
-import { assert } from "../../../../core/assert.js";
+import { grid_dilate_average } from "../grid_dilate_average.js";
 
 /**
  * Values per probe in {@link LightProbeGrid#harmonics}
@@ -6,10 +6,6 @@ import { assert } from "../../../../core/assert.js";
  */
 const PROBE_VALUE_COUNT = 12;
 
-const __accumulator = new Float64Array(PROBE_VALUE_COUNT);
-
-let __source_validity = new Uint8Array(0);
-
 /**
  * Fill invalid probes with the average of their valid 6-connected neighbors, expanding in waves until
  * every reachable probe is filled.
@@ -19,6 +15,12 @@ let __source_validity = new Uint8Array(0);
  * only probes that were valid before the pass started, so the result is independent of traversal
  * order. Probes with no valid probe anywhere in their connected region are left untouched.
  *
+ * Delegates to {@link grid_dilate_average}, the kernel the 2D lightmap gutter fill also uses.
+ * The iteration cap is the grid's L1 diameter, which is the exact worst case: every pass advances
+ * the filled front by one cell along each axis, so a reachable probe is always filled within
+ * `resolution_x + resolution_y + resolution_z` passes. It is a bound, not an early stop — the sweep
+ * still ends as soon as a pass fills nothing.
+ *
  * @param {Float32Array} harmonics probe data, {@link PROBE_VALUE_COUNT} values per probe; filled probes are written in place
  * @param {Uint8Array} validity one flag per probe, non-zero = valid; filled probes are marked valid in place
  * @param {number} resolution_x
@@ -31,112 +33,11 @@ export function light_probe_grid_dilate(
     validity,
     resolution_x, resolution_y, resolution_z
 ) {
-    assert.isNonNegativeInteger(resolution_x, 'resolution_x');
-    assert.isNonNegativeInteger(resolution_y, 'resolution_y');
-    assert.isNonNegativeInteger(resolution_z, 'resolution_z');
-
-    const probe_count = resolution_x * resolution_y * resolution_z;
-
-    assert.greaterThanOrEqual(validity.length, probe_count, 'validity.length');
-    assert.greaterThanOrEqual(harmonics.length, probe_count * PROBE_VALUE_COUNT, 'harmonics.length');
-
-    if (__source_validity.length < probe_count) {
-        __source_validity = new Uint8Array(probe_count);
-    }
-
-    let invalid_count = 0;
-
-    for (let i = 0; i < probe_count; i++) {
-        if (validity[i] === 0) {
-            invalid_count++;
-        }
-    }
-
-    const slice_size = resolution_x * resolution_y;
-
-    let filled_this_pass = 1;
-
-    while (invalid_count > 0 && filled_this_pass > 0) {
-        filled_this_pass = 0;
-
-        // snapshot so each pass only reads probes that were valid before it started
-        __source_validity.set(validity.subarray(0, probe_count));
-
-        for (let z = 0; z < resolution_z; z++) {
-            for (let y = 0; y < resolution_y; y++) {
-                for (let x = 0; x < resolution_x; x++) {
-
-                    const index = x + resolution_x * y + slice_size * z;
-
-                    if (__source_validity[index] !== 0) {
-                        continue;
-                    }
-
-                    __accumulator.fill(0);
-                    let neighbor_count = 0;
-
-                    if (x > 0 && __source_validity[index - 1] !== 0) {
-                        accumulate_probe(harmonics, index - 1);
-                        neighbor_count++;
-                    }
-
-                    if (x < resolution_x - 1 && __source_validity[index + 1] !== 0) {
-                        accumulate_probe(harmonics, index + 1);
-                        neighbor_count++;
-                    }
-
-                    if (y > 0 && __source_validity[index - resolution_x] !== 0) {
-                        accumulate_probe(harmonics, index - resolution_x);
-                        neighbor_count++;
-                    }
-
-                    if (y < resolution_y - 1 && __source_validity[index + resolution_x] !== 0) {
-                        accumulate_probe(harmonics, index + resolution_x);
-                        neighbor_count++;
-                    }
-
-                    if (z > 0 && __source_validity[index - slice_size] !== 0) {
-                        accumulate_probe(harmonics, index - slice_size);
-                        neighbor_count++;
-                    }
-
-                    if (z < resolution_z - 1 && __source_validity[index + slice_size] !== 0) {
-                        accumulate_probe(harmonics, index + slice_size);
-                        neighbor_count++;
-                    }
-
-                    if (neighbor_count === 0) {
-                        continue;
-                    }
-
-                    const probe_address = index * PROBE_VALUE_COUNT;
-                    const inverse_count = 1 / neighbor_count;
-
-                    for (let i = 0; i < PROBE_VALUE_COUNT; i++) {
-                        harmonics[probe_address + i] = __accumulator[i] * inverse_count;
-                    }
-
-                    validity[index] = 1;
-                    filled_this_pass++;
-                }
-            }
-        }
-
-        invalid_count -= filled_this_pass;
-    }
-
-    return invalid_count;
-}
-
-/**
- *
- * @param {Float32Array} harmonics
- * @param {number} probe_index
- */
-function accumulate_probe(harmonics, probe_index) {
-    const address = probe_index * PROBE_VALUE_COUNT;
-
-    for (let i = 0; i < PROBE_VALUE_COUNT; i++) {
-        __accumulator[i] += harmonics[address + i];
-    }
+    return grid_dilate_average(
+        harmonics,
+        validity,
+        resolution_x, resolution_y, resolution_z,
+        PROBE_VALUE_COUNT,
+        resolution_x + resolution_y + resolution_z
+    );
 }

package/src/engine/graphics/sh3/lpg/material/chunk_lpg_get_irradiance_at.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_lpg_get_irradiance_at.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/lpg/material/chunk_lpg_get_irradiance_at.js"],"names":[],"mappings":"AAIA,wjBAmBC"}
+{"version":3,"file":"chunk_lpg_get_irradiance_at.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/lpg/material/chunk_lpg_get_irradiance_at.js"],"names":[],"mappings":"AAWA,wjBAmBC"}

package/src/engine/graphics/sh3/lpg/material/chunk_lpg_get_irradiance_at.js

@@ -1,6 +1,13 @@
 
 // source: https://graphics.stanford.edu/papers/envmap/envmap.pdf
 // first two bands of chunk_lpv_get_irradiance_at, constants include the cosine-lobe convolution
+//
+// It cannot literally reuse that chunk: GLSL array parameters are sized, so a
+// `vec3[9]` evaluator cannot be handed the `vec3[4]` the LPG stores. The four
+// shared lines are therefore restated here on purpose. See the sign-convention
+// note in gi/material/chunk_lpv_get_irradiance_at.js — this file follows the
+// same ADDING convention as that one, which is the opposite of
+// core/geom/3d/sphere/harmonics/sh3_sample_irradiance_by_direction.js.
 //language=GLSL
 export const chunk_lpg_get_irradiance_at = `
 #ifndef LPG_CHUNK_GET_IRRADIANCE_AT

package/src/engine/graphics/sh3/lpg/material/space_fragment/build_fragment_shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_fragment_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_fragment/build_fragment_shader.js"],"names":[],"mappings":"AA0BA;;;GAGG;AACH,8CAFW,MAAM,UAahB"}
+{"version":3,"file":"build_fragment_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_fragment/build_fragment_shader.js"],"names":[],"mappings":"AA0BA;;;GAGG;AACH,8CAFW,MAAM,UAUhB"}

package/src/engine/graphics/sh3/lpg/material/space_fragment/build_fragment_shader.js

@@ -1,4 +1,4 @@
-import { insert_after } from "../../../../../../core/primitives/strings/insert_after.js";
+import { build_injected_shader, GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN } from "../../../build_injected_shader.js";
 import PREAMBLE_COMMON from "../common.js";
 
 //language=GLSL
@@ -30,13 +30,10 @@ const ACCUMULATION = `
  */
 export function build_fragment_shader(source) {
 
-    let result = PREAMBLE + PREAMBLE_COMMON + source;
-
-    result = insert_after(
-        result,
-        '#include <lights_fragment_begin>',
+    return build_injected_shader(
+        source,
+        PREAMBLE + PREAMBLE_COMMON,
+        GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN,
         ACCUMULATION
     );
-
-    return result;
 }

package/src/engine/graphics/sh3/lpg/material/space_fragment/build_vertex_shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_vertex_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_fragment/build_vertex_shader.js"],"names":[],"mappings":"AAiCA;;;GAGG;AACH,4CAFW,MAAM,UAahB"}
+{"version":3,"file":"build_vertex_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_fragment/build_vertex_shader.js"],"names":[],"mappings":"AAiCA;;;GAGG;AACH,4CAFW,MAAM,UAUhB"}

package/src/engine/graphics/sh3/lpg/material/space_fragment/build_vertex_shader.js

@@ -1,4 +1,4 @@
-import { insert_after } from "../../../../../../core/primitives/strings/insert_after.js";
+import { build_injected_shader, GLSL_ANCHOR_FOG_VERTEX } from "../../../build_injected_shader.js";
 
 //language=GLSL
 const PREAMBLE = `
@@ -37,13 +37,10 @@ const CAPTURE_WORLD_POSITION = `
  */
 export function build_vertex_shader(source) {
 
-    let result = PREAMBLE + source;
-
-    result = insert_after(
-        result,
-        '#include <fog_vertex>',
+    return build_injected_shader(
+        source,
+        PREAMBLE,
+        GLSL_ANCHOR_FOG_VERTEX,
         CAPTURE_WORLD_POSITION
     );
-
-    return result;
 }

package/src/engine/graphics/sh3/lpg/material/space_vertex/build_fragment_shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_fragment_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_vertex/build_fragment_shader.js"],"names":[],"mappings":"AAcA;;;GAGG;AACH,8CAFW,MAAM,UAahB"}
+{"version":3,"file":"build_fragment_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_vertex/build_fragment_shader.js"],"names":[],"mappings":"AAcA;;;GAGG;AACH,8CAFW,MAAM,UAUhB"}

package/src/engine/graphics/sh3/lpg/material/space_vertex/build_fragment_shader.js

@@ -1,4 +1,4 @@
-import { insert_after } from "../../../../../../core/primitives/strings/insert_after.js";
+import { build_injected_shader, GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN } from "../../../build_injected_shader.js";
 import PREAMBLE from "./preamble.frag.js";
 
 //language=GLSL
@@ -18,13 +18,10 @@ const ACCUMULATION = `
  */
 export function build_fragment_shader(source) {
 
-    let result = PREAMBLE + source;
-
-    result = insert_after(
-        result,
-        '#include <lights_fragment_begin>',
+    return build_injected_shader(
+        source,
+        PREAMBLE,
+        GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN,
         ACCUMULATION
     );
-
-    return result;
 }

package/src/engine/graphics/sh3/lpg/material/space_vertex/build_vertex_shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_vertex_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_vertex/build_vertex_shader.js"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,4CAFW,MAAM,UAahB"}
+{"version":3,"file":"build_vertex_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpg/material/space_vertex/build_vertex_shader.js"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,4CAFW,MAAM,UAUhB"}

package/src/engine/graphics/sh3/lpg/material/space_vertex/build_vertex_shader.js

@@ -1,4 +1,4 @@
-import { insert_after } from "../../../../../../core/primitives/strings/insert_after.js";
+import { build_injected_shader, GLSL_ANCHOR_FOG_VERTEX } from "../../../build_injected_shader.js";
 import PREAMBLE_COMMON from "../common.js";
 import PREAMBLE from "./preamble.vert.js";
 
@@ -29,13 +29,10 @@ const SHADER_CHUNK_ACCUMULATION = `
  */
 export function build_vertex_shader(source) {
 
-    let result = PREAMBLE + PREAMBLE_COMMON + source;
-
-    result = insert_after(
-        result,
-        '#include <fog_vertex>',
+    return build_injected_shader(
+        source,
+        PREAMBLE + PREAMBLE_COMMON,
+        GLSL_ANCHOR_FOG_VERTEX,
         SHADER_CHUNK_ACCUMULATION
     );
-
-    return result;
 }

package/src/engine/graphics/sh3/lpv/depth/chunk_probe_depth_sampling.d.ts

@@ -0,0 +1,38 @@
+/**
+ * GLSL source for sampling the octahedral probe-depth atlas.
+ *
+ * WHY THIS EXISTS
+ *
+ * The production GI sampler (`sh3/gi/material/common.js`) and the probe-depth
+ * debug visualiser (`sh3/lpv/depth/octahedral/v2/`) each carried their own
+ * transcription of this library — `sign_not_zero`, `quadBlendWieghts`,
+ * `VecToSphereOct`, `SampleBlended`, `lpv_bilinear_lerp`, `lpv_sample_bilinear`,
+ * `wrapOctahedralTexelCoordinates`, `lpv_probe_getDepthBilinear`,
+ * `lpv_probe_getDepthTriangular` and `lpv_probe_getPosition`. The
+ * misspelling `quadBlendWieghts` was faithfully reproduced in both, which is
+ * how we know one was pasted from the other.
+ *
+ * The whole point of the visualiser is to show what the production sampler
+ * sees. A forked copy can silently show something else, so the visualiser stops
+ * being evidence. One definition, two consumers.
+ *
+ * HOST REQUIREMENTS
+ *
+ * This chunk declares the three probe uniforms it reads
+ * (`lpv_t_probe_positions`, `lpv_t_probe_depth`,
+ * `lpv_u_probe_depth_resolution`) so a host only has to interpolate it and bind
+ * them. It must be interpolated ABOVE any code that calls into it — GLSL
+ * requires declaration before use.
+ *
+ * NOT INCLUDED — `sh3/lpv/depth/octahedral/shader/visualize.frag.glsl`
+ *
+ * That older visualiser declares a `VecToSphereOct` that folds on
+ * `direction.z < 0.0` and returns `.xy`, where this one folds on `v.y < 0.0`
+ * and returns `.xz`. Those are different octahedral mappings, not two spellings
+ * of one — switching it to this chunk would change what that visualiser draws.
+ * It is deliberately left alone; see the note at the top of that file.
+ *
+ * @type {string}
+ */
+export const GLSL_LPV_PROBE_DEPTH_SAMPLING: string;
+//# sourceMappingURL=chunk_probe_depth_sampling.d.ts.map

package/src/engine/graphics/sh3/lpv/depth/chunk_probe_depth_sampling.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk_probe_depth_sampling.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/lpv/depth/chunk_probe_depth_sampling.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,4CAFU,MAAM,CAsOd"}