@woosh/meep-engine 3.33.0 → 3.35.0

package/src/shade/renderer/volumetrics/graph_build_volumetrics.d.ts

@@ -29,11 +29,13 @@ export function graph_integrate_sky({ graph }: {
  * `[1, 1, 1]` when the froxels are marching instead, which keeps the passes in the graph without
  * doing any work
  * @param {number} options.volumetrics_metadata
+ * @param {import("../ShadeIndirectLightingMode.js").ShadeIndirectLightingMode} options.indirect_lighting_mode which froxel GI module starts the
+ *   froxel irradiance volume (`gi/graph_build_froxel_gi`)
  * @param {number} [options.taa_history] imported previous-frame accumulated scattering volume
  * @param {number} [options.taa_output] imported destination for this frame's accumulated scattering volume
  * @param {GPUCameraContext} [options.camera_previous] previous-frame camera, for temporal reprojection
  */
-export function graph_build_volumetrics({ graph, camera, lights, view, light_cluster_data, light_cluster_lookup, light_cluster_parameters, shadowmap_atlas, volumetric_resolution, sun_shadow_resolution, volumetrics_metadata, taa_history, taa_output, camera_previous, }: {
+export function graph_build_volumetrics({ graph, camera, lights, view, light_cluster_data, light_cluster_lookup, light_cluster_parameters, shadowmap_atlas, volumetric_resolution, sun_shadow_resolution, volumetrics_metadata, indirect_lighting_mode, taa_history, taa_output, camera_previous, }: {
     graph: FrameGraph;
     camera: GPUCameraContext;
     lights: GPULightCollection;
@@ -45,6 +47,7 @@ export function graph_build_volumetrics({ graph, camera, lights, view, light_clu
     volumetric_resolution: number[];
     sun_shadow_resolution: number[];
     volumetrics_metadata: number;
+    indirect_lighting_mode: import("../ShadeIndirectLightingMode.js").ShadeIndirectLightingMode;
     taa_history?: number;
     taa_output?: number;
     camera_previous?: GPUCameraContext;
@@ -52,6 +55,10 @@ export function graph_build_volumetrics({ graph, camera, lights, view, light_clu
     lut_transmittance: number;
     lut_multiple_scattering: number;
     lut_aerial: any;
+    irradiance: {
+        Y: number;
+        CoCg: number;
+    };
     volumetrics_metadata: number;
 };
 //# sourceMappingURL=graph_build_volumetrics.d.ts.map

package/src/shade/renderer/volumetrics/graph_build_volumetrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_build_volumetrics.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/graph_build_volumetrics.js"],"names":[],"mappings":"AAyBA;;;;;;;;GAQG;AACH;IAH+B,KAAK;IACvB;IAAC,iBAAiB,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CA8DjE;AAuTD;;;;;;;;;;;;;;;;;;;GAmBG;AACH;IAjB+B,KAAK;IACC,MAAM;IACJ,MAAM;IACV,IAAI;IACZ,kBAAkB,EAAlC,MAAM;IACU,oBAAoB,EAApC,MAAM;IACU,wBAAwB,EAAxC,MAAM;IACU,eAAe,EAA/B,MAAM;IACY,qBAAqB,EAAvC,MAAM,EAAE;IACU,qBAAqB,EAAvC,MAAM,EAAE;IAGQ,oBAAoB,EAApC,MAAM;IACW,WAAW,GAA5B,MAAM;IACW,UAAU,GAA3B,MAAM;IACqB,eAAe;;;;;;EA0KpD"}
+{"version":3,"file":"graph_build_volumetrics.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/graph_build_volumetrics.js"],"names":[],"mappings":"AA0BA;;;;;;;;GAQG;AACH;IAH+B,KAAK;IACvB;IAAC,iBAAiB,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CA8DjE;AAqVD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH;IAnB+B,KAAK;IACC,MAAM;IACJ,MAAM;IACV,IAAI;IACZ,kBAAkB,EAAlC,MAAM;IACU,oBAAoB,EAApC,MAAM;IACU,wBAAwB,EAAxC,MAAM;IACU,eAAe,EAA/B,MAAM;IACY,qBAAqB,EAAvC,MAAM,EAAE;IACU,qBAAqB,EAAvC,MAAM,EAAE;IAGQ,oBAAoB,EAApC,MAAM;IACuE,sBAAsB,EAAnG,OAAO,iCAAiC,EAAE,yBAAyB;IAElD,WAAW,GAA5B,MAAM;IACW,UAAU,GAA3B,MAAM;IACqB,eAAe;;;;;;WAjKH,MAAM;cAAQ,MAAM;;;EA0VrE"}

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

@@ -17,6 +17,7 @@ import {
     shader_volumetrics_build_sun_shadow_volume_seeded
 } from "./shader_volumetrics_build_sun_shadow_volume.js";
 import { shader_volumetrics_taa } from "./taa/shader_volumetrics_taa.js";
+import { graph_build_froxel_gi } from "./gi/graph_build_froxel_gi.js";
 import {
     VOLUMETRICS_SUN_SHADOW_CASCADE_COUNT,
     VOLUMETRICS_SUN_SHADOW_WORKGROUP_RESOLUTION,
@@ -291,6 +292,9 @@ function graph_build_sun_shadow_volume({
  * @param view
  * @param camera
  * @param resolution
+ * @param {{Y: number, CoCg: number}} gi the froxel GI stage's volume, which the irradiance starts from
+ * @returns {{scattering: number, irradiance: {Y: number, CoCg: number}}} the lit scattering volume,
+ *   and the froxel irradiance volume: the GI plus the same lights (chunk_volumetrics_irradiance_sh)
  */
 function graph_integrate_light_scattering({
                                               graph,
@@ -308,6 +312,7 @@ function graph_integrate_light_scattering({
                                               view,
                                               camera,
                                               resolution,
+                                              gi,
                                           }) {
 
     const data = {};
@@ -352,6 +357,10 @@ function graph_integrate_light_scattering({
             tParticipatingMedia0: participating_media0.obtainView(),
             tParticipatingMedia1: participating_media1.obtainView(),
             tLighting: output.obtainView(DEFAULT_RENDER_TARGET_VIEW_DESCRIPTOR),
+            tGIY: resources.get(data.gi_Y).obtainView(),
+            tGICoCg: resources.get(data.gi_CoCg).obtainView(),
+            tIrradianceY: resources.get(data.irradiance_Y).obtainView(DEFAULT_RENDER_TARGET_VIEW_DESCRIPTOR),
+            tIrradianceCoCg: resources.get(data.irradiance_CoCg).obtainView(DEFAULT_RENDER_TARGET_VIEW_DESCRIPTOR),
             //
             light_data: lights.buffer_data,
 
@@ -391,6 +400,9 @@ function graph_integrate_light_scattering({
     data.sun_multiple_scattering_lut = pass.read(sun_multiple_scattering_lut);
     data.sun_shadow_cascades = sun_shadow_cascades.map(handle => pass.read(handle));
 
+    data.gi_Y = pass.read(gi.Y);
+    data.gi_CoCg = pass.read(gi.CoCg);
+
     data.output = pass.create("Light Scattering LUT", TextureResourceDescriptor.from({
         resolution,
         dimension: "3d",
@@ -398,8 +410,27 @@ function graph_integrate_light_scattering({
         usage: GPUTextureUsage.STORAGE_BINDING | GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.RENDER_ATTACHMENT
     }));
 
+    data.irradiance_Y = pass.create("Froxel Irradiance Y", TextureResourceDescriptor.from({
+        resolution,
+        dimension: "3d",
+        format: "rgba16float",
+        usage: GPUTextureUsage.STORAGE_BINDING | GPUTextureUsage.TEXTURE_BINDING
+    }));
 
-    return data.output;
+    data.irradiance_CoCg = pass.create("Froxel Irradiance CoCg", TextureResourceDescriptor.from({
+        resolution,
+        dimension: "3d",
+        format: "rgba16float",
+        usage: GPUTextureUsage.STORAGE_BINDING | GPUTextureUsage.TEXTURE_BINDING
+    }));
+
+    return {
+        scattering: data.output,
+        irradiance: {
+            Y: data.irradiance_Y,
+            CoCg: data.irradiance_CoCg,
+        },
+    };
 
 }
 
@@ -419,6 +450,8 @@ function graph_integrate_light_scattering({
  * `[1, 1, 1]` when the froxels are marching instead, which keeps the passes in the graph without
  * doing any work
  * @param {number} options.volumetrics_metadata
+ * @param {import("../ShadeIndirectLightingMode.js").ShadeIndirectLightingMode} options.indirect_lighting_mode which froxel GI module starts the
+ *   froxel irradiance volume (`gi/graph_build_froxel_gi`)
  * @param {number} [options.taa_history] imported previous-frame accumulated scattering volume
  * @param {number} [options.taa_output] imported destination for this frame's accumulated scattering volume
  * @param {GPUCameraContext} [options.camera_previous] previous-frame camera, for temporal reprojection
@@ -435,6 +468,7 @@ export function graph_build_volumetrics({
                                             volumetric_resolution,
                                             sun_shadow_resolution,
                                             volumetrics_metadata,
+                                            indirect_lighting_mode,
                                             taa_history,
                                             taa_output,
                                             camera_previous,
@@ -468,7 +502,20 @@ export function graph_build_volumetrics({
         resolution: sun_shadow_resolution,
     });
 
-    const light_scattering_lut = graph_integrate_light_scattering({
+    const gi = graph_build_froxel_gi({
+        graph,
+        indirect_lighting_mode,
+        scene_ctx: view.scene,
+        camera,
+        volumetrics_metadata,
+        resolution: volumetric_resolution,
+    });
+
+    const {
+        scattering: light_scattering_lut,
+        irradiance,
+    } = graph_integrate_light_scattering({
+        gi,
         graph,
         resolution: volumetric_resolution,
         camera,
@@ -589,6 +636,7 @@ export function graph_build_volumetrics({
         lut_transmittance: transmittance_lut,
         lut_multiple_scattering: multiscatted_lut,
         lut_aerial: a_data.output,
+        irradiance,
         volumetrics_metadata,
     };
 }

package/src/shade/renderer/volumetrics/shader_volumetrics_build_lighting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_volumetrics_build_lighting.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/shader_volumetrics_build_lighting.js"],"names":[],"mappings":"AA6CA;;;;;;;;;;;;;;;GAeG;AACH,wDAFU,MAAM,EAAE,CAEiD;AAkXnE,8DAIE;8BA/Z4B,4BAA4B"}
+{"version":3,"file":"shader_volumetrics_build_lighting.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/volumetrics/shader_volumetrics_build_lighting.js"],"names":[],"mappings":"AAiDA;;;;;;;;;;;;;;;GAeG;AACH,wDAFU,MAAM,EAAE,CAEiD;AAkanE,8DAIE;8BAnd4B,4BAA4B"}