@woosh/meep-engine 3.5.0 → 3.7.0

package/src/shade/renderer/global_illumination/brick4/gpu/bake/brick4_bake_basic.js

@@ -142,7 +142,7 @@ export async function brick4_bake_basic({
 
         const cycle_seed = randomIntegerBetween(random, 0, 0xFFFFFFFF) >>> 0;
 
-        graph_compute_pass({
+        const bake_pass_outputs = graph_compute_pass({
             graph,
             shader: shader_brick4_bake_probes,
             group_count: [dispatch_x],
@@ -186,7 +186,7 @@ export async function brick4_bake_basic({
                     sample_count: SAMPLES_PER_PROBE,
                     output_offset: i,
                 },
-                input: gr_cycle_trace_data,
+                input: bake_pass_outputs.output,
                 output: gr_encoded_probe_results,
             }
         })

package/src/shade/renderer/scene/bvh/StaticSceneBVH.js

@@ -390,10 +390,10 @@ export class StaticSceneBVH {
         let nearest_distance = ray.tMax;
 
         const hit_count = bvh_query_user_data_ray(
-            bvh,
-            bvh.root,
             scratch_instance_hits,
             0,
+            bvh,
+            bvh.root,
             ray.origin_x, ray.origin_y, ray.origin_z,
             ray.direction_x, ray.direction_y, ray.direction_z
         );
@@ -501,10 +501,10 @@ export class StaticSceneBVH {
         const bvh = this.instance_bvh;
 
         const hit_count = bvh_query_user_data_ray(
-            bvh,
-            bvh.root,
             scratch_instance_hits,
             0,
+            bvh,
+            bvh.root,
             ray.origin_x, ray.origin_y, ray.origin_z,
             ray.direction_x, ray.direction_y, ray.direction_z
         );

package/src/shade/renderer/shadow/map/GPUSceneShadowmapContext.js

@@ -83,7 +83,7 @@ const DEFAULT_SHADOWMAP_LOCAL_RESOLUTION = 128;
  * its turn without permanently starving other lights.
  * @type {number}
  */
-const SHADOWMAP_UPDATE_BUDGET = 32;
+const SHADOWMAP_UPDATE_BUDGET = 8;
 
 /**
  * Shadows for a single scene

package/src/engine/graphics/sh3/build_injected_shader.d.ts

@@ -1,51 +0,0 @@
-/**
- * Prepend a preamble to a three.js-generated shader and splice a chunk in after
- * a named anchor.
- *
- * WHY THIS EXISTS
- *
- * The LPV/GI and LPG material paths have eight shader builders between them
- * (`space_fragment` and `space_vertex`, vertex and fragment, times two
- * subsystems) and every one of them was the same three statements: concatenate
- * the preambles ahead of the source, `insert_after` an anchor, return. What
- * actually differs is data — which preamble, which anchor, which chunk.
- *
- * More importantly the two anchors were spelled out in eight separate string
- * literals. They are three.js's own chunk include lines, and a mismatch fails
- * *quietly* (a console warning and an unmodified shader), so having one
- * definition each is worth more than the lines it saves.
- *
- * Shader assembly happens once per material compile, not per frame.
- *
- * @param {string} source shader source three.js handed to `onBeforeCompile`
- * @param {string} preamble prepended verbatim, ahead of the source
- * @param {string} anchor see {@link GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN} / {@link GLSL_ANCHOR_FOG_VERTEX}
- * @param {string} chunk GLSL spliced in directly after `anchor`
- * @returns {string}
- */
-export function build_injected_shader(source: string, preamble: string, anchor: string, chunk: string): string;
-/**
- * three.js chunk marker after which a probe-field contribution is added to
- * `irradiance` in the fragment stage.
- *
- * `<lights_fragment_begin>` is where three declares `irradiance` and has not yet
- * consumed it, so anything added immediately after it participates in the
- * lighting equations normally. The literal must match three's include line
- * exactly — `insert_after` warns and silently returns the source unchanged when
- * it does not find the term, which shows up as GI simply not appearing.
- *
- * @type {string}
- */
-export const GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN: string;
-/**
- * three.js chunk marker after which per-vertex probe work is injected.
- *
- * `<fog_vertex>` is the last chunk in the standard vertex `main()`, so by that
- * point `worldPosition` (when declared), `position` and `normal` are all
- * available. Same exact-match requirement as
- * {@link GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN}.
- *
- * @type {string}
- */
-export const GLSL_ANCHOR_FOG_VERTEX: string;
-//# sourceMappingURL=build_injected_shader.d.ts.map

package/src/engine/graphics/sh3/build_injected_shader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build_injected_shader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/sh3/build_injected_shader.js"],"names":[],"mappings":"AA4BA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,8CANW,MAAM,YACN,MAAM,UACN,MAAM,SACN,MAAM,GACJ,MAAM,CAIlB;AArDD;;;;;;;;;;;GAWG;AACH,gDAFU,MAAM,CAEoE;AAEpF;;;;;;;;;GASG;AACH,qCAFU,MAAM,CAE8C"}

package/src/engine/graphics/sh3/build_injected_shader.js

@@ -1,56 +0,0 @@
-import { insert_after } from "../../../core/primitives/strings/insert_after.js";
-
-/**
- * three.js chunk marker after which a probe-field contribution is added to
- * `irradiance` in the fragment stage.
- *
- * `<lights_fragment_begin>` is where three declares `irradiance` and has not yet
- * consumed it, so anything added immediately after it participates in the
- * lighting equations normally. The literal must match three's include line
- * exactly — `insert_after` warns and silently returns the source unchanged when
- * it does not find the term, which shows up as GI simply not appearing.
- *
- * @type {string}
- */
-export const GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN = '#include <lights_fragment_begin>';
-
-/**
- * three.js chunk marker after which per-vertex probe work is injected.
- *
- * `<fog_vertex>` is the last chunk in the standard vertex `main()`, so by that
- * point `worldPosition` (when declared), `position` and `normal` are all
- * available. Same exact-match requirement as
- * {@link GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN}.
- *
- * @type {string}
- */
-export const GLSL_ANCHOR_FOG_VERTEX = '#include <fog_vertex>';
-
-/**
- * Prepend a preamble to a three.js-generated shader and splice a chunk in after
- * a named anchor.
- *
- * WHY THIS EXISTS
- *
- * The LPV/GI and LPG material paths have eight shader builders between them
- * (`space_fragment` and `space_vertex`, vertex and fragment, times two
- * subsystems) and every one of them was the same three statements: concatenate
- * the preambles ahead of the source, `insert_after` an anchor, return. What
- * actually differs is data — which preamble, which anchor, which chunk.
- *
- * More importantly the two anchors were spelled out in eight separate string
- * literals. They are three.js's own chunk include lines, and a mismatch fails
- * *quietly* (a console warning and an unmodified shader), so having one
- * definition each is worth more than the lines it saves.
- *
- * Shader assembly happens once per material compile, not per frame.
- *
- * @param {string} source shader source three.js handed to `onBeforeCompile`
- * @param {string} preamble prepended verbatim, ahead of the source
- * @param {string} anchor see {@link GLSL_ANCHOR_LIGHTS_FRAGMENT_BEGIN} / {@link GLSL_ANCHOR_FOG_VERTEX}
- * @param {string} chunk GLSL spliced in directly after `anchor`
- * @returns {string}
- */
-export function build_injected_shader(source, preamble, anchor, chunk) {
-    return insert_after(preamble + source, anchor, chunk);
-}

package/src/engine/graphics/sh3/fromCubeRenderTarget.d.ts

@@ -1,9 +0,0 @@
-/**
- *
- * @param {Uint8Array} data
- * @param {THREE.WebGLRenderer} renderer
- * @param {THREE.WebGLCubeRenderTarget} cubeRenderTarget
- * @return {Float64Array}
- */
-export function fromCubeRenderTarget(data: Uint8Array, renderer: THREE.WebGLRenderer, cubeRenderTarget: THREE.WebGLCubeRenderTarget): Float64Array;
-//# sourceMappingURL=fromCubeRenderTarget.d.ts.map

package/src/engine/graphics/sh3/fromCubeRenderTarget.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fromCubeRenderTarget.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/sh3/fromCubeRenderTarget.js"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,2CALW,UAAU,iFAGT,YAAY,CAgIvB"}

package/src/engine/graphics/sh3/fromCubeRenderTarget.js

@@ -1,142 +0,0 @@
-import { sh3_basis_at } from "../../../core/geom/3d/sphere/harmonics/sh3_basis_at.js";
-import { sh3_dering_optimize_positive } from "../../../core/geom/3d/sphere/harmonics/sh3_dering_optimize_positive.js";
-import { sh3_vector_accumulate } from "../../../core/geom/3d/sphere/harmonics/sh3_vector_accumulate.js";
-import { vector_scale_offset } from "../../../core/geom/vec/vector_scale_offset.js";
-import { v3_length_sqr } from "../../../core/geom/vec3/v3_length_sqr.js";
-
-const scratch_color = new Float32Array(3);
-
-/**
- *
- * @param {Uint8Array} data
- * @param {THREE.WebGLRenderer} renderer
- * @param {THREE.WebGLCubeRenderTarget} cubeRenderTarget
- * @return {Float64Array}
- */
-export function fromCubeRenderTarget(
-    data,
-    renderer,
-    cubeRenderTarget
-) {
-
-    // The renderTarget must be set to RGBA in order to make readRenderTargetPixels works
-    let total_weight = 0;
-
-    const __shared_buffer = new ArrayBuffer((27 + 9) * 8);
-
-    const sh_basis = new Float64Array(__shared_buffer, 0, 9);
-    const coefficients = new Float64Array(__shared_buffer, 9 * 8, 27);
-
-    const image_size = cubeRenderTarget.width;
-
-    const pixel_size = 2 / image_size;
-
-    let normal_x = 0, normal_y = 0, normal_z = 0;
-
-    for (let faceIndex = 0; faceIndex < 6; faceIndex++) {
-
-        renderer.readRenderTargetPixels(cubeRenderTarget, 0, 0, image_size, image_size, data, faceIndex);
-
-        // RGBA assumed
-
-        for (let i = 0, il = data.length; i < il; i += 4) {
-
-
-            // pixel coordinate on unit cube
-
-            const pixelIndex = i / 4;
-
-            const col = -1 + (pixelIndex % image_size + 0.5) * pixel_size;
-
-            const row = 1 - (Math.floor(pixelIndex / image_size) + 0.5) * pixel_size;
-
-
-            switch (faceIndex) {
-
-                case 0:
-                    normal_x = 1;
-                    normal_y = row;
-                    normal_z = -col;
-                    break;
-
-                case 1:
-                    normal_x = -1;
-                    normal_y = row;
-                    normal_z = col;
-                    break;
-
-                case 2:
-                    normal_x = col;
-                    normal_y = 1;
-                    normal_z = -row;
-                    break;
-
-                case 3:
-                    normal_x = col;
-                    normal_y = -1;
-                    normal_z = row;
-                    break;
-
-                case 4:
-                    normal_x = col;
-                    normal_y = row;
-                    normal_z = 1;
-                    break;
-
-                case 5:
-                    normal_x = -col;
-                    normal_y = row;
-                    normal_z = -1;
-                    break;
-
-            }
-
-            // weight assigned to this pixel
-
-            const length_squared = v3_length_sqr(normal_x, normal_y, normal_z);
-
-            const length = Math.sqrt(length_squared);
-
-            const weight = 4 / (length * length_squared);
-
-            total_weight += weight;
-
-            // direction vector to this pixel
-            normal_x /= length;
-            normal_y /= length;
-            normal_z /= length;
-
-            // evaluate SH basis functions in direction dir
-            sh3_basis_at(normal_x, normal_y, normal_z, sh_basis);
-
-            // pixel color, already in linear space so no sRGB->Linear conversion necessary
-
-            // 0.003921 constant value is 1/255, a conversion value from UINT8 to normalized float
-            const weight_conv = weight * 0.00392156862745098;
-
-            scratch_color[0] = data[i] * weight_conv;
-            scratch_color[1] = data[i + 1] * weight_conv;
-            scratch_color[2] = data[i + 2] * weight_conv;
-
-            // accumulate
-            sh3_vector_accumulate(
-                coefficients, 0,
-                sh_basis, 0,
-                scratch_color, 0,
-                3
-            );
-
-        }
-
-    }
-
-    // normalize
-    const norm = (4 * Math.PI) / total_weight;
-
-    vector_scale_offset(coefficients, 0, coefficients, 0, 27, norm);
-
-    sh3_dering_optimize_positive(coefficients, 0, coefficients, 0, 3);
-
-    return coefficients;
-
-}

package/src/engine/graphics/sh3/shader/visualize.frag.d.ts

@@ -1,3 +0,0 @@
-declare const _default: "\n#define RECIPROCAL_PI 0.318309886\n\nvec3 inverseTransformDirection( in vec3 normal, in mat4 matrix ) {\n    // matrix is assumed to be orthogonal\n    return normalize( ( vec4( normal, 0.0 ) * matrix ).xyz );\n}\n\n// source: https://graphics.stanford.edu/papers/envmap/envmap.pdf\n//\n// SIGN CONVENTION: coefficients 1, 3, 5 and 7 are SUBTRACTED here, matching\n// three.js's SphericalHarmonics3 and the JS reference\n// core/geom/3d/sphere/harmonics/sh3_sample_irradiance_by_direction.js. The LPV\n// and LPG shader chunks (sh3/{gi,lpg}/material/chunk_*_get_irradiance_at.js)\n// ADD them instead — see the note in chunk_lpv_get_irradiance_at.js. The\n// constants are the same in all four; only these signs differ.\nvec3 shGetIrradianceAt( in vec3 normal, in vec3 shCoefficients[ 9 ] ) {\n    // normal is assumed to have unit length\n    float x = normal.x, y = normal.y, z = normal.z;\n\n    // band 0\n    vec3 result = shCoefficients[ 0 ] * 0.8862269254527579;\n\n    // band 1\n    result -= shCoefficients[ 1 ] * 1.0233267079464885 * y;\n    result += shCoefficients[ 2 ] * 1.0233267079464885 * z;\n    result -= shCoefficients[ 3 ] * 1.0233267079464885 * x;\n\n    // band 2\n    result += shCoefficients[ 4 ] * 0.8580855308097834 * x * y;\n    result -= shCoefficients[ 5 ] * 0.8580855308097834 * y * z;\n    result += shCoefficients[ 6 ] * ( 0.7431238683011272 * z * z - 0.24770795610037571 );\n    result -= shCoefficients[ 7 ] * 0.8580855308097834 * x * z;\n    result += shCoefficients[ 8 ] * 0.4290427654048917 * ( x * x - y * y );\n\n    return result;\n}\n\nuniform vec3 sh[ 9 ]; // sh coefficients\nuniform float intensity; // light probe intensity\nvarying vec3 vNormal;\n\nvoid main() {\n    vec3 normal = normalize( vNormal );\n    vec3 worldNormal = normalize(inverseTransformDirection( normal, viewMatrix ));\n    vec3 irradiance = shGetIrradianceAt( worldNormal, sh );\n    vec3 outgoingLight = 1.0  * irradiance * intensity;\n    gl_FragColor = linearToOutputTexel( vec4( outgoingLight, 1.0 ) );\n}\n";
-export default _default;
-//# sourceMappingURL=visualize.frag.d.ts.map

package/src/engine/graphics/sh3/shader/visualize.frag.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"visualize.frag.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/shader/visualize.frag.js"],"names":[],"mappings":""}

package/src/engine/graphics/sh3/shader/visualize.frag.js

@@ -1,51 +0,0 @@
-// language=GLSL
-export default `
-#define RECIPROCAL_PI 0.318309886
-
-vec3 inverseTransformDirection( in vec3 normal, in mat4 matrix ) {
-    // matrix is assumed to be orthogonal
-    return normalize( ( vec4( normal, 0.0 ) * matrix ).xyz );
-}
-
-// source: https://graphics.stanford.edu/papers/envmap/envmap.pdf
-//
-// SIGN CONVENTION: coefficients 1, 3, 5 and 7 are SUBTRACTED here, matching
-// three.js's SphericalHarmonics3 and the JS reference
-// core/geom/3d/sphere/harmonics/sh3_sample_irradiance_by_direction.js. The LPV
-// and LPG shader chunks (sh3/{gi,lpg}/material/chunk_*_get_irradiance_at.js)
-// ADD them instead — see the note in chunk_lpv_get_irradiance_at.js. The
-// constants are the same in all four; only these signs differ.
-vec3 shGetIrradianceAt( in vec3 normal, in vec3 shCoefficients[ 9 ] ) {
-    // normal is assumed to have unit length
-    float x = normal.x, y = normal.y, z = normal.z;
-
-    // band 0
-    vec3 result = shCoefficients[ 0 ] * 0.8862269254527579;
-
-    // band 1
-    result -= shCoefficients[ 1 ] * 1.0233267079464885 * y;
-    result += shCoefficients[ 2 ] * 1.0233267079464885 * z;
-    result -= shCoefficients[ 3 ] * 1.0233267079464885 * x;
-
-    // band 2
-    result += shCoefficients[ 4 ] * 0.8580855308097834 * x * y;
-    result -= shCoefficients[ 5 ] * 0.8580855308097834 * y * z;
-    result += shCoefficients[ 6 ] * ( 0.7431238683011272 * z * z - 0.24770795610037571 );
-    result -= shCoefficients[ 7 ] * 0.8580855308097834 * x * z;
-    result += shCoefficients[ 8 ] * 0.4290427654048917 * ( x * x - y * y );
-
-    return result;
-}
-
-uniform vec3 sh[ 9 ]; // sh coefficients
-uniform float intensity; // light probe intensity
-varying vec3 vNormal;
-
-void main() {
-    vec3 normal = normalize( vNormal );
-    vec3 worldNormal = normalize(inverseTransformDirection( normal, viewMatrix ));
-    vec3 irradiance = shGetIrradianceAt( worldNormal, sh );
-    vec3 outgoingLight = 1.0  * irradiance * intensity;
-    gl_FragColor = linearToOutputTexel( vec4( outgoingLight, 1.0 ) );
-}
-`

package/src/engine/graphics/sh3/shader/visualize.vert.d.ts

@@ -1,3 +0,0 @@
-declare const _default: "\nvarying vec3 vNormal;\n\nvoid main() {\n\n    vNormal = normalize( normalMatrix * normal );\n\n    gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n\n}\n";
-export default _default;
-//# sourceMappingURL=visualize.vert.d.ts.map

package/src/engine/graphics/sh3/shader/visualize.vert.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"visualize.vert.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/shader/visualize.vert.js"],"names":[],"mappings":""}

package/src/engine/graphics/sh3/shader/visualize.vert.js

@@ -1,12 +0,0 @@
-// language=GLSL
-export default `
-varying vec3 vNormal;
-
-void main() {
-
-    vNormal = normalize( normalMatrix * normal );
-
-    gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
-
-}
-`