@woosh/meep-engine 3.58.0 → 3.59.0

package/src/shade/renderer/volumetrics/GPUViewVolumetrics.js

@@ -37,7 +37,7 @@ export class GPUViewVolumetrics {
     /**
      * Should we perform temporal integration, or not?
      * If set to true - the next update will discard history.
-     * Useful for significant scene transitions and screen resizing.
+     * Useful for significant scene transitions.
      * @type {boolean}
      */
     #reset_history = true;
@@ -82,6 +82,13 @@ export class GPUViewVolumetrics {
      */
     #tile_size = 16;
 
+    /**
+     * Froxel counts of this frame's grid. The TAA output is sized to it when it is written; the
+     * history keeps the size it was written at, see {@link graph_update}.
+     * @type {number[]}
+     */
+    #resolution = [1, 1, 1];
+
     /**
      * Number of froxel slices along the view.
      * @type {number}
@@ -90,8 +97,8 @@ export class GPUViewVolumetrics {
 
     /**
      * Size of one froxel in XY, in screen pixels. Smaller is finer fog detail at a cost that grows
-     * with the inverse square. The grid is resized on the next update and the TAA history dropped,
-     * so the frame after a change starts its accumulation over.
+     * with the inverse square. The grid is resized on the next update and the TAA history carries
+     * over: it spans the same screen uv at any froxel count.
      *
      * The grid's XY extent, `ceil(view resolution / tile_size)`, must stay within the device's
      * `maxTextureDimension3D`.
@@ -112,7 +119,8 @@ export class GPUViewVolumetrics {
 
     /**
      * Number of froxel slices between the camera near and {@link froxel_far}. Cost grows linearly.
-     * The grid is resized on the next update and the TAA history dropped, as for {@link tile_size}.
+     * The grid is resized on the next update and the TAA history dropped, because the depth curve
+     * is built for the slice count.
      * @returns {number}
      */
     get resolution_z() {
@@ -309,35 +317,12 @@ export class GPUViewVolumetrics {
      * @param {GPUViewContext} view
      */
     #update_resolution(view) {
-
         const screen_resolution = view.resolution;
+        const resolution = this.#resolution;
 
-        const output_resolution_x = Math.ceil(screen_resolution[0] / this.#tile_size);
-        const output_resolution_y = Math.ceil(screen_resolution[1] / this.#tile_size);
-        const output_resolution_z = this.#resolution_z;
-
-        const t_first = this.#volumetrics_textures[0];
-
-        if (t_first.width === output_resolution_x
-            && t_first.height === output_resolution_y
-            && t_first.depth === output_resolution_z
-        ) {
-            // already at the right resolution
-            return;
-        }
-
-        for (let i = 0; i < 2; i++) {
-
-            this.#volumetrics_textures[i].resize(
-                output_resolution_x,
-                output_resolution_y,
-                output_resolution_z
-            );
-
-        }
-
-        // drop history
-        this.#reset_history = true;
+        resolution[0] = Math.ceil(screen_resolution[0] / this.#tile_size);
+        resolution[1] = Math.ceil(screen_resolution[1] / this.#tile_size);
+        resolution[2] = this.#resolution_z;
     }
 
     /**
@@ -452,8 +437,8 @@ export class GPUViewVolumetrics {
     #update_metadata(view) {
         const camera = view.camera;
 
-        const resolution = this.#volumetrics_textures[0].size;
-        // the grid as allocated, so the curve always spans the slices the textures actually have
+        const resolution = this.#resolution;
+        // the grid this frame writes, so the curve always spans the slices its output has
         const resolution_z = resolution[2];
 
         this.#sun_shadow_light_index = this.#update_sun_shadow(view);
@@ -546,6 +531,8 @@ export class GPUViewVolumetrics {
      * @param {ShaderSwitchSet} [options.shader_switches]
      * @param {import("../global_illumination/brick4/Brick4LightMap.js").Brick4LightMap} [options.brick4]
      * @param {import("../global_illumination/lpv/GPULightProbeVolume.js").GPULightProbeVolume} [options.lpv]
+     * @param {import("../global_illumination/probe_clipmap/GPUProbeClipmapGI.js").GPUProbeClipmapGI} options.probes
+     *   the renderer's probe clipmap GI, whose probes the irradiance clipmap binds in every mode
      * @returns {{resolved: number, metadata: number, irradiance: {Y: number, CoCg: number, uniform: number}}}
      */
     graph_update({
@@ -558,6 +545,7 @@ export class GPUViewVolumetrics {
                      shader_switches = ShaderSwitchSet.EMPTY,
                      brick4,
                      lpv,
+                     probes,
                  }) {
 
         assert.defined(view, 'view');
@@ -587,7 +575,7 @@ export class GPUViewVolumetrics {
 
         const gr_metadata = graph_import_buffer(graph, this.#metadata.buffer, "volumetrics metadata");
 
-        const resolution = this.#volumetrics_textures[0].size;
+        const resolution = this.#resolution;
 
         // World-space irradiance clipmap for particle lighting.
         // Culled by the frame graph when no lit particles read it.
@@ -599,6 +587,8 @@ export class GPUViewVolumetrics {
             shader_switches,
             brick4,
             lpv,
+            probes,
+            view_uniform: view.uniform_buffer.buffer,
         });
 
         if (view.scene.volumetrics.source.volumes.length === 0) {
@@ -619,8 +609,18 @@ export class GPUViewVolumetrics {
 
         if (this.#taa_enabled) {
             const parity = view.frame_index & 1;
-            taa_history = graph_import_texture(graph, this.#volumetrics_textures[parity ^ 1], "volumetrics taa history");
-            taa_output = graph_import_texture(graph, this.#volumetrics_textures[parity], "volumetrics taa output");
+
+            const history = this.#volumetrics_textures[parity ^ 1];
+            const output = this.#volumetrics_textures[parity];
+
+            // Only the output follows the grid. The history keeps the size it was written at: the
+            // grid spans screen uv [0, 1] at any froxel count and the TAA fetches the history by uvw
+            // through a filtering sampler, so a resolution step resamples it once rather than
+            // throwing it away. It is resized in turn on the next frame, when it is the output.
+            output.resize(resolution[0], resolution[1], resolution[2]);
+
+            taa_history = graph_import_texture(graph, history, "volumetrics taa history");
+            taa_output = graph_import_texture(graph, output, "volumetrics taa output");
         }
 
         const sky = view.scene.sky;

package/src/shade/renderer/volumetrics/irradiance_clipmap/GPUIrradianceClipmap.d.ts

@@ -86,9 +86,12 @@ export class GPUIrradianceClipmap {
      * @param {ShaderSwitchSet} [options.shader_switches]
      * @param {import("../../global_illumination/brick4/Brick4LightMap.js").Brick4LightMap} [options.brick4]
      * @param {import("../../global_illumination/lpv/GPULightProbeVolume.js").GPULightProbeVolume} [options.lpv]
+     * @param {import("../../global_illumination/probe_clipmap/GPUProbeClipmapGI.js").GPUProbeClipmapGI} options.probes
+     *   the renderer's probe clipmap GI, whose probes the build binds in every mode
+     * @param {GPUBuffer} options.view_uniform the view's uniforms, whose frame index jitters the probes' pick
      * @returns {{Y: number, CoCg: number, uniform: number}}
      */
-    graph_update({ graph, camera, scene_ctx, shadowmap_atlas, shader_switches, brick4, lpv, }: {
+    graph_update({ graph, camera, scene_ctx, shadowmap_atlas, shader_switches, brick4, lpv, probes, view_uniform, }: {
         graph: import("../../../../engine/graphics/render/frame_graph/FrameGraph.js").FrameGraph;
         camera: import("../../camera/GPUCameraContext.js").GPUCameraContext;
         scene_ctx: import("../../scene/GPUSceneContext.js").GPUSceneContext;
@@ -96,6 +99,8 @@ export class GPUIrradianceClipmap {
         shader_switches?: ShaderSwitchSet;
         brick4?: import("../../global_illumination/brick4/Brick4LightMap.js").Brick4LightMap;
         lpv?: import("../../global_illumination/lpv/GPULightProbeVolume.js").GPULightProbeVolume;
+        probes: import("../../global_illumination/probe_clipmap/GPUProbeClipmapGI.js").GPUProbeClipmapGI;
+        view_uniform: GPUBuffer;
     }): {
         Y: number;
         CoCg: number;

package/src/shade/renderer/volumetrics/irradiance_clipmap/GPUIrradianceClipmap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GPUIrradianceClipmap.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/volumetrics/irradiance_clipmap/GPUIrradianceClipmap.js"],"names":[],"mappings":"AA6CA;;;;;;;;;;;;;GAaG;AACH;IA2CI;;;;;;;OAOG;IACH;QAL4B,aAAa,GAA9B,MAAM;QAC6B,UAAU,GAA7C,MAAM,GAAC,UAAU,MAAM,CAAC;QACP,SAAS,GAA1B,MAAM;QACW,WAAW,GAA5B,MAAM;OA8DhB;IAED;;OAEG;IACH,4BAEC;IAED;;OAEG;IACH,mCAEC;IAED;;OAEG;IACH,sCAEC;IAED;;OAEG;IACH,yBAEC;IAED;;OAEG;IACH,4BAEC;IAED;;;OAGG;IACH,0BAEC;IAED;;OAEG;IACH,4CAEC;IAED;;OAEG;IACH,uBAEC;IAED;;;;;;;;OAQG;IACH,oBALW,MAAM,KACN,MAAM,KACN,MAAM,oBACN,eAAe,QAgFzB;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH;QATsG,KAAK,EAAhG,OAAO,8DAA8D,EAAE,UAAU;QACZ,MAAM,EAA3E,OAAO,kCAAkC,EAAE,gBAAgB;QACO,SAAS,EAA3E,OAAO,gCAAgC,EAAE,eAAe;QACxC,eAAe,EAA/B,MAAM;QACoB,eAAe,GAAzC,eAAe;QACuE,MAAM,GAA5F,OAAO,oDAAoD,EAAE,cAAc;QACkB,GAAG,GAAhG,OAAO,sDAAsD,EAAE,mBAAmB;QAChF;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAuItD;IAED;;OAEG;IACH,gBAQC;;CACJ;+BAzd8B,uCAAuC;2CAe3B,iCAAiC;gCApB5C,0CAA0C"}
+{"version":3,"file":"GPUIrradianceClipmap.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/volumetrics/irradiance_clipmap/GPUIrradianceClipmap.js"],"names":[],"mappings":"AA6CA;;;;;;;;;;;;;GAaG;AACH;IA2CI;;;;;;;OAOG;IACH;QAL4B,aAAa,GAA9B,MAAM;QAC6B,UAAU,GAA7C,MAAM,GAAC,UAAU,MAAM,CAAC;QACP,SAAS,GAA1B,MAAM;QACW,WAAW,GAA5B,MAAM;OA8DhB;IAED;;OAEG;IACH,4BAEC;IAED;;OAEG;IACH,mCAEC;IAED;;OAEG;IACH,sCAEC;IAED;;OAEG;IACH,yBAEC;IAED;;OAEG;IACH,4BAEC;IAED;;;OAGG;IACH,0BAEC;IAED;;OAEG;IACH,4CAEC;IAED;;OAEG;IACH,uBAEC;IAED;;;;;;;;OAQG;IACH,oBALW,MAAM,KACN,MAAM,KACN,MAAM,oBACN,eAAe,QAgFzB;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH;QAZsG,KAAK,EAAhG,OAAO,8DAA8D,EAAE,UAAU;QACZ,MAAM,EAA3E,OAAO,kCAAkC,EAAE,gBAAgB;QACO,SAAS,EAA3E,OAAO,gCAAgC,EAAE,eAAe;QACxC,eAAe,EAA/B,MAAM;QACoB,eAAe,GAAzC,eAAe;QACuE,MAAM,GAA5F,OAAO,oDAAoD,EAAE,cAAc;QACkB,GAAG,GAAhG,OAAO,sDAAsD,EAAE,mBAAmB;QACgB,MAAM,EAAxG,OAAO,8DAA8D,EAAE,iBAAiB;QAErE,YAAY;QAC7B;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAkJtD;IAED;;OAEG;IACH,gBAQC;;CACJ;+BAve8B,uCAAuC;2CAe3B,iCAAiC;gCApB5C,0CAA0C"}