@woosh/meep-engine 3.67.0 → 3.68.0

package/src/shade/renderer/global_illumination/probe_clipmap/probe/shader_probe_clipmap_trace.js

@@ -1,9 +1,6 @@
 import { MESH_SDF_BRICK_VOXELS } from "../../../geometry/sdf/MESH_SDF.js";
 import { LIGHT_DATA_RESOURCE } from "../../../light/LIGHT_DATA_RESOURCE.js";
-import { LIGHT_DATABASE_SPEC } from "../../../light/LIGHT_DATABASE_SPEC.js";
-import { LIGHT_FLAGS } from "../../../light/model/io/LIGHT_FLAGS.js";
 import { chunk_rgbe9995_encode } from "../../../shader/chunk/color/rgbe9995/chunk_rgbe9995_encode.js";
-import { chunk_cone_sample_direction } from "../../../shader/chunk/geometry/cone/chunk_cone_sample_direction.js";
 import {
     chunk_uv_octahedral_unit_decode
 } from "../../../shader/chunk/geometry/octahedron/chunk_uv_octahedral_unit_decode.js";
@@ -11,11 +8,6 @@ import {
     chunk_uv_octahedral_unit_encode
 } from "../../../shader/chunk/geometry/octahedron/chunk_uv_octahedral_unit_encode.js";
 import { chunk_folded_workgroup_index } from "../../../shader/chunk/grid/chunk_folded_workgroup_index.js";
-import {
-    chunk_directional_lights_iteration_mask
-} from "../../../shader/chunk/light/io/chunk_directional_lights_iteration_mask.js";
-import { chunk_hash_to_float01 } from "../../../shader/chunk/random/chunk_hash_to_float01.js";
-import { chunk_pcg3d } from "../../../shader/chunk/random/pcg/chunk_pcg3d.js";
 import { CodeChunk } from "../../../shader/compiler/CodeChunk.js";
 import { ComputeShader } from "../../../shader/ComputeShader.js";
 import { ShaderResourceSetDescriptor } from "../../../shader/resource/ShaderResourceSetDescriptor.js";
@@ -44,9 +36,8 @@ import {
     PROBE_STATES_READ_RESOURCE,
     PROBE_TRACE_READ_RESOURCE
 } from "./chunk_probe_clipmap.js";
-import { PROBE_SHADOWED_SUNS, PROBE_THREAD_WORKGROUP_SIZE } from "./PROBE_CLIPMAP.js";
-
-const DIRECTIONAL = LIGHT_DATABASE_SPEC.get('light_directional');
+import { chunk_probe_clipmap_sun_irradiance } from "./chunk_probe_clipmap_hit_light.js";
+import { PROBE_THREAD_WORKGROUP_SIZE } from "./PROBE_CLIPMAP.js";
 
 /**
  * @type {WebGPUStruct}
@@ -104,15 +95,10 @@ resources.createGroup()
  *   rays of a round and kind are stratified inside it over the updates of that kind it takes them on.
  * - **Origin**: a point of a small ball around the probe where relocation left it, `probe_origins`, one a
  *   ray (`probe_clipmap_ray_origin`); t_min one voxel of the brick cascade there.
- * - **Direct light**: a hit off a front face takes E_dir = Σ colour·max(0, n·l)·visibility over the
- *   directional lights (§8.7). The visibility is a shadow ray, traced through the brick clipmap as the
- *   ray itself was, toward each of the first {@link PROBE_SHADOWED_SUNS} lights that cast shadows, in the
- *   table's order; lights past them are unshadowed at hits. It starts a voxel off the hit along its
- *   normal, outside the half-voxel expand, and heads for a point of the light's disk drawn as the path
- *   tracer draws it (`cone_sample_direction`), from the ray's slot and direction, so that the probe's
- *   blend of its rays integrates the penumbra. The light is seen whole if the ray misses, and not at all
- *   if it hits or spends its steps: what the march could not answer is no light, not all of it. A
- *   surface turned from a light traces no ray toward it, since the light gives it nothing.
+ * - **Direct light**: a hit off a front face takes E_dir over the directional lights, shadowed by rays
+ *   traced through the brick clipmap as the ray itself was (`probe_clipmap_sun_irradiance`, §8.7). Each
+ *   light's point of its disk is drawn from the ray's slot and direction, so that the probe's blend of its
+ *   rays integrates the penumbra.
  * - **Back face**: a hit whose field's gradient is along the ray, so it came from inside a solid.
  *
  * Writes the ray's `PROBE_RAY_STRUCT`, with E_dir as its light, which shade turns into the ray's
@@ -208,39 +194,8 @@ fn main(
     var direct = vec3<f32>(0.0);
 
     if (is_hit && !back_face) {
-        let voxel = brick_levels[hit.cascade].cell_size / ${MESH_SDF_BRICK_VOXELS}.0;
-        let lifted = hit.position + voxel * hit.normal;
-
-        var bits = directional_lights_iteration_mask(&light_data);
-        var shadowed = 0u;
-
-        while (bits != 0u) {
-            let index = countTrailingZeros(bits);
-
-            bits &= ~(1u << index);
-
-            let light = ${DIRECTIONAL.marshalling_method_read}(&light_data, index);
-            let n_dot_l = dot(hit.normal, -light.direction);
-
-            var visible = 1.0;
-
-            if ((light.flags & ${LIGHT_FLAGS.CASTS_SHADOW_BIT}u) != 0u && shadowed < ${PROBE_SHADOWED_SUNS}u) {
-                // a surface turned from the light takes none of it whatever the shadow, so it traces none;
-                // the light keeps its place among the shadowed all the same
-                if (n_dot_l > 0.0) {
-                    // a point of the disk of its own for each light, apart from the origin's draw
-                    let hash = pcg3d(vec3<u32>(slot, packed, 0x3C6EF372u + shadowed));
-                    let toward = cone_sample_direction(-light.direction, light.disk_radius, vec2<f32>(hash_to_float01(hash.x), hash_to_float01(hash.y)));
-                    let shadow = brick_clipmap_trace(lifted, toward, 0.0, settings.t_max, cascade_count, settings.brick_atlas_shift);
-
-                    visible = select(0.0, 1.0, shadow.kind == BRICK_TRACE_MISS);
-                }
-
-                shadowed++;
-            }
-
-            direct += light.color * max(n_dot_l, 0.0) * visible;
-        }
+        // each light's point of its disk drawn from the ray's slot and direction, apart from the origin's draw
+        direct = probe_clipmap_sun_irradiance(hit.position, hit.normal, hit.cascade, vec2<u32>(slot, packed), settings.t_max, cascade_count, settings.brick_atlas_shift);
     }
 
     probe_rays[ray].t = hit.t;
@@ -262,11 +217,7 @@ fn main(
             chunk_uv_octahedral_unit_decode,
             chunk_uv_octahedral_unit_encode,
             chunk_brick_clipmap_trace,
-            chunk_cone_sample_direction,
-            chunk_pcg3d,
-            chunk_hash_to_float01,
-            chunk_directional_lights_iteration_mask,
+            chunk_probe_clipmap_sun_irradiance,
             chunk_rgbe9995_encode,
-            DIRECTIONAL.chunk_read,
         ]),
 });

package/src/shade/renderer/global_illumination/screen_probe/GPUScreenProbeGI.d.ts

@@ -0,0 +1,142 @@
+/**
+ * {@link ShadeIndirectLightingMode.ScreenProbes} for one view: Lumen's screen probe gather, over the world the probe
+ * clipmap holds (`GPUProbeClipmapGI`): its bricks, which rays traverse, its surface material, which hits read, its
+ * world light clusters, and its two sets of world-space probes, which stand in for what lies past a screen probe's reach
+ * and give a hit its next bounce.
+ *
+ * **A frame**, in three passes and a capture:
+ * 1. **Place** ({@link graph_update}): a uniform probe in every tile of `downsample_factor` pixels at the frame's
+ *    jitter, then the adaptive levels, finest last, each placing a probe where the probes so far would not
+ *    interpolate to a point of its grid; then the commands over the frame's probes.
+ * 2. **Trace**, after the world's bricks: each probe's world-space pick, reach and brick origin (and the world probes
+ *    it wants); its BRDF and lighting densities and its rays, reassigned to where its light is; the screen trace; the
+ *    bricks' trace, shade, local light and bounce of what the screen left; the hits' wants; the composite into each
+ *    probe's radiance, the spatial filter's passes, and the probes' SH3.
+ * 3. **Resolve** ({@link graph_resolve}), once the bent normals exist: each pixel's irradiance from its probes, then
+ *    the temporal filter into the frame's diffuse, which the deferred passes read.
+ * 4. **Capture** ({@link graph_capture}): the lit colour of the opaque surfaces, for the next frame's screen hits.
+ *
+ * **Its history**: last frame's probes (their records and filtered radiance, for the lighting density), its diffuse
+ * and frames (for the temporal filter) and its colour (for the screen hits) are kept while the structure and the view
+ * stay, until {@link reset_history}; any change starts it again. Nothing is allocated on a frame that changes neither: the adaptive probes' slots
+ * are made with the rest, as many as the uniform probes (`screen_probe_adaptive_capacity`), and a frame that would
+ * place more places no more.
+ */
+export class GPUScreenProbeGI {
+    /**
+     * @param {GPUDevice} device
+     */
+    constructor(device: GPUDevice);
+    /**
+     * Drop the history: the next frame takes nothing from the frames before it, as a first frame does. For a cut, or a
+     * change of scene or lighting the temporal filters must not blend across (`Renderer#indicate_view_change`).
+     */
+    reset_history(): void;
+    /**
+     * @returns {boolean} whether its resources stand: a frame of the mode has run and not been left since
+     */
+    get built(): boolean;
+    /**
+     * @returns {number} uniform probes this frame's structure places
+     */
+    get uniform_count(): number;
+    /**
+     * @returns {number} adaptive probe slots
+     */
+    get adaptive_capacity(): number;
+    /**
+     * Take the frame's placement and traces, after the world's update ({@link GPUProbeClipmapGI#graph_update}) in the
+     * same frame: make the resources for the view and the structure the settings describe, unless they already are,
+     * and record the place and trace passes. {@link graph_resolve} follows once the bent normals exist.
+     *
+     * @param {Object} options
+     * @param {FrameGraph} options.graph
+     * @param {GPUViewContext} options.view
+     * @param {ScreenProbeSettings} options.settings
+     * @param {GPUProbeClipmapGI} options.world the probe clipmap GI, updated this frame: the bricks, material, light
+     *   clusters and world-space probes the screen probes trace and read
+     * @param {*} options.stbn the 2-channel spatio-temporal blue noise, `STATIC_GRAPHICS_ENGINE_ASSETS.stbn_vec2`
+     * @param {number} options.depth graph handle of the view's reverse-Z depth
+     * @param {number} options.normal graph handle of the G-buffer's shading normals
+     * @param {number} options.pbr graph handle of the G-buffer's PBR target, which holds the face normal
+     * @param {number} options.velocity graph handle of the frame's motion, internal pixels
+     * @param {number} options.occlusion graph handle of the TAA's history confidence (`shader_depth_occlusion_clip`)
+     * @param {number} options.hzb graph handle of the view's hierarchical Z buffer, from mip 1
+     * @param {number} options.exposure graph handle of the factor the display multiplies radiance by, as the last frame
+     *   was shown
+     */
+    graph_update({ graph, view, settings, world, stbn, depth, normal, pbr, velocity, occlusion, hzb, exposure }: {
+        graph: FrameGraph;
+        view: GPUViewContext;
+        settings: ScreenProbeSettings;
+        world: GPUProbeClipmapGI;
+        stbn: any;
+        depth: number;
+        normal: number;
+        pbr: number;
+        velocity: number;
+        occlusion: number;
+        hzb: number;
+        exposure: number;
+    }): void;
+    /**
+     * Take the frame's resolve, once the bent normals exist: each pixel's irradiance from its probes, then the temporal
+     * filter into the frame's diffuse.
+     *
+     * @param {Object} options
+     * @param {FrameGraph} options.graph
+     * @param {number} options.depth graph handle of the view's reverse-Z depth
+     * @param {number} options.depth_previous graph handle of last frame's
+     * @param {number} options.pbr graph handle of the G-buffer's PBR target
+     * @param {number} options.velocity graph handle of the frame's motion
+     * @param {number} options.bent_normals graph handle of the bent normals (the shading normals where GTAO is off)
+     * @param {number} options.exposure graph handle of the factor the display multiplies radiance by, as the last frame
+     *   was shown, the one {@link graph_update} took: what the probes' radiance is pre-exposed by
+     * @returns {number} graph handle of the frame's diffuse, `rgba16float`: E at the bent normal, before AO
+     */
+    graph_resolve({ graph, depth, depth_previous, pbr, velocity, bent_normals, exposure }: {
+        graph: FrameGraph;
+        depth: number;
+        depth_previous: number;
+        pbr: number;
+        velocity: number;
+        bent_normals: number;
+        exposure: number;
+    }): number;
+    /**
+     * @returns {number} graph handle of the diffuse this frame's {@link graph_resolve} wrote
+     */
+    get diffuse_handle(): number;
+    /**
+     * Put what the debug views read of the frame's probes into `bindings`: the frame uniform, the probes and their
+     * tiles' adaptive lists, the integration's output and the rays' hit words, as this frame left them.
+     *
+     * @param {Object} bindings
+     * @returns {Object} bindings
+     */
+    write_debug_bindings(bindings: any): any;
+    /**
+     * Keep the frame's lit colour of the opaque surfaces for the next frame's screen hits: once the indirect light is
+     * added, before fog and transparencies.
+     *
+     * @param {Object} options
+     * @param {FrameGraph} options.graph
+     * @param {number} options.color graph handle of the scene's colour, the view's size
+     */
+    graph_capture({ graph, color }: {
+        graph: FrameGraph;
+        color: number;
+    }): void;
+    /**
+     * Give back every resource, as on the first frame out of the mode: the next {@link graph_update} starts again
+     * from nothing.
+     */
+    release(): void;
+    destroy(): void;
+    #private;
+}
+export type FrameGraph = import("../../../../engine/graphics/render/frame_graph/FrameGraph.js").FrameGraph;
+export type GPUViewContext = import("../../view/GPUViewContext.js").GPUViewContext;
+export type ScreenProbeSettings = import("./ScreenProbeSettings.js").ScreenProbeSettings;
+export type GPUProbeClipmapGI = import("../probe_clipmap/GPUProbeClipmapGI.js").GPUProbeClipmapGI;
+//# sourceMappingURL=GPUScreenProbeGI.d.ts.map

package/src/shade/renderer/global_illumination/screen_probe/GPUScreenProbeGI.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GPUScreenProbeGI.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/global_illumination/screen_probe/GPUScreenProbeGI.js"],"names":[],"mappings":"AAqEA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH;IAsHI;;OAEG;IACH,+BAIC;IAED;;;OAGG;IACH,sBAEC;IAED;;OAEG;IACH,qBAEC;IAED;;OAEG;IACH,4BAEC;IAED;;OAEG;IACH,gCAEC;IAiBD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH;QAf+B,KAAK,EAAzB,UAAU;QACc,IAAI,EAA5B,cAAc;QACe,QAAQ,EAArC,mBAAmB;QACQ,KAAK,EAAhC,iBAAiB;QAEN,IAAI;QACC,KAAK,EAArB,MAAM;QACU,MAAM,EAAtB,MAAM;QACU,GAAG,EAAnB,MAAM;QACU,QAAQ,EAAxB,MAAM;QACU,SAAS,EAAzB,MAAM;QACU,GAAG,EAAnB,MAAM;QACU,QAAQ,EAAxB,MAAM;aAoFhB;IAED;;;;;;;;;;;;;;OAcG;IACH;QAV+B,KAAK,EAAzB,UAAU;QACM,KAAK,EAArB,MAAM;QACU,cAAc,EAA9B,MAAM;QACU,GAAG,EAAnB,MAAM;QACU,QAAQ,EAAxB,MAAM;QACU,YAAY,EAA5B,MAAM;QACU,QAAQ,EAAxB,MAAM;QAEJ,MAAM,CAqBlB;IAED;;OAEG;IACH,6BAEC;IAED;;;;;;OAMG;IACH,yCASC;IAED;;;;;;;OAOG;IACH;QAH+B,KAAK,EAAzB,UAAU;QACM,KAAK,EAArB,MAAM;aAWhB;IA6bD;;;OAGG;IACH,gBA+BC;IAED,gBAQC;;CACJ;yBAh3BY,OAAO,8DAA8D,EAAE,UAAU;6BACjF,OAAO,8BAA8B,EAAE,cAAc;kCACrD,OAAO,0BAA0B,EAAE,mBAAmB;gCACtD,OAAO,uCAAuC,EAAE,iBAAiB"}