@woosh/meep-engine 3.15.0 → 3.17.0

package/src/shade/renderer/global_illumination/probe/octahedral/GPUProbeAtlas.js

@@ -297,11 +297,18 @@ export class GPUProbeAtlas {
         });
 
 
-        const t_radiance = graph_import_texture(graph, this.texture_radiance);
-        const t_depth = graph_import_texture(graph, this.#texture_depth);
+        /*
+         Both atlases are threaded from here on: every helper that writes one hands back a renamed
+         handle, and the next reader has to be given that one. Reading the version a previous pass
+         has already superseded is the shape `validate()` exists to reject, and with assertions
+         stripped it leaves the border and convolution passes with no recorded dependency on the
+         passes that filled the atlas.
+        */
+        let t_radiance = graph_import_texture(graph, this.texture_radiance);
+        let t_depth = graph_import_texture(graph, this.#texture_depth);
         const b_probes = graph_import_buffer(graph, scene.light_probe_volume.buffer_probes)
 
-        graph_lpv_shade({
+        ({ radiance: t_radiance } = graph_lpv_shade({
             graph,
             scene,
             atlas: this,
@@ -317,7 +324,7 @@ export class GPUProbeAtlas {
             g_buffer_pbr,
             g_buffer_position,
             g_buffer_indirect,
-        });
+        }));
 
         // avoid upsetting WebGPU validator with empty buffers
         if (update_count > 0) {
@@ -356,7 +363,7 @@ export class GPUProbeAtlas {
                     output_resolution: g_buffer_resolution,
                 });
 
-                graph_compute_pass({
+                ({ tAtlas_depth: t_depth } = graph_compute_pass({
                     graph,
                     shader: shader_lpv_atlas_write_depth,
                     bindings: {
@@ -369,7 +376,7 @@ export class GPUProbeAtlas {
                         Math.ceil(g_buffer_resolution[1] / 16),
                         1
                     ]
-                });
+                }));
             }
 
             {
@@ -380,7 +387,7 @@ export class GPUProbeAtlas {
                 ];
 
                 // Depth
-                graph_lpv_paint_border_depth({
+                t_depth = graph_lpv_paint_border_depth({
                     graph,
                     atlas: t_depth,
                     settings: gr_settings,
@@ -389,7 +396,7 @@ export class GPUProbeAtlas {
                 });
 
                 // Radiance
-                graph_compute_pass({
+                ({ tAtlas: t_radiance } = graph_compute_pass({
                     graph,
                     shader: shader_lpv_atlas_paint_borders_radiance,
                     group_count,
@@ -397,7 +404,7 @@ export class GPUProbeAtlas {
                         settings: gr_settings,
                         tAtlas: t_radiance,
                     }
-                });
+                }));
             }
 
             // perform convolution to compute irradiance
@@ -405,6 +412,7 @@ export class GPUProbeAtlas {
                 graph,
                 atlas: this,
                 scene,
+                atlas_radiance: t_radiance,
                 probe_index_offset: start_index,
                 probe_update_count: update_count,
                 g_buffer_resolution,

package/src/shade/renderer/global_illumination/probe/octahedral/border/graph_lpv_paint_border_depth.d.ts

@@ -6,6 +6,7 @@
  * @param {number} atlas resource texture
  * @param {number} probe_resolution
  * @param {number} update_count
+ * @returns {number} the atlas after the border paint
  */
-export function graph_lpv_paint_border_depth({ graph, settings, atlas, probe_resolution, update_count, }: FrameGraph): void;
+export function graph_lpv_paint_border_depth({ graph, settings, atlas, probe_resolution, update_count, }: FrameGraph): number;
 //# sourceMappingURL=graph_lpv_paint_border_depth.d.ts.map

package/src/shade/renderer/global_illumination/probe/octahedral/border/graph_lpv_paint_border_depth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_lpv_paint_border_depth.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/border/graph_lpv_paint_border_depth.js"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH,4HA+DC"}
+{"version":3,"file":"graph_lpv_paint_border_depth.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/border/graph_lpv_paint_border_depth.js"],"names":[],"mappings":"AAQA;;;;;;;;;GASG;AACH,uHAFa,MAAM,CAmElB"}

package/src/shade/renderer/global_illumination/probe/octahedral/border/graph_lpv_paint_border_depth.js

@@ -14,6 +14,7 @@ import { shader_lpv_atlas_paint_borders_depth } from "./shader_lpv_atlas_paint_b
  * @param {number} atlas resource texture
  * @param {number} probe_resolution
  * @param {number} update_count
+ * @returns {number} the atlas after the border paint
  */
 export function graph_lpv_paint_border_depth({
                                                  graph,
@@ -68,7 +69,7 @@ export function graph_lpv_paint_border_depth({
     ));
 
     // write out
-    graph_compute_pass({
+    const { tAtlas } = graph_compute_pass({
         graph,
         shader: shader_lpv_atlas_paint_borders_depth,
         bindings: {
@@ -78,4 +79,6 @@ export function graph_lpv_paint_border_depth({
         },
         group_count: [group_count, 1, 1]
     });
+
+    return tAtlas;
 }

package/src/shade/renderer/global_illumination/probe/octahedral/convolve/graph_lvp_atlas_to_sh.d.ts

@@ -3,10 +3,11 @@
  * @param {FrameGraph} graph
  * @param {GPUProbeAtlas} atlas
  * @param {GPUSceneContext} scene
+ * @param {number} atlas_radiance resource texture, the version of the radiance atlas to convolve
  * @param {number} probe_index_offset
  * @param {number} probe_update_count
  * @param {number[]} g_buffer_resolution In texels
  * @returns {number} buffer resource with SH3-encoded texels
  */
-export function graph_lvp_atlas_to_sh({ graph, atlas, scene, probe_index_offset, probe_update_count, g_buffer_resolution, }: FrameGraph): number;
+export function graph_lvp_atlas_to_sh({ graph, atlas, scene, atlas_radiance, probe_index_offset, probe_update_count, g_buffer_resolution, }: FrameGraph): number;
 //# sourceMappingURL=graph_lvp_atlas_to_sh.d.ts.map

package/src/shade/renderer/global_illumination/probe/octahedral/convolve/graph_lvp_atlas_to_sh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_lvp_atlas_to_sh.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/convolve/graph_lvp_atlas_to_sh.js"],"names":[],"mappings":"AAqHA;;;;;;;;;GASG;AACH,0IAFa,MAAM,CA8DlB"}
+{"version":3,"file":"graph_lvp_atlas_to_sh.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/convolve/graph_lvp_atlas_to_sh.js"],"names":[],"mappings":"AAqHA;;;;;;;;;;GAUG;AACH,0JAFa,MAAM,CAuElB"}

package/src/shade/renderer/global_illumination/probe/octahedral/convolve/graph_lvp_atlas_to_sh.js

@@ -120,6 +120,7 @@ const shader = ComputeShader.from({
  * @param {FrameGraph} graph
  * @param {GPUProbeAtlas} atlas
  * @param {GPUSceneContext} scene
+ * @param {number} atlas_radiance resource texture, the version of the radiance atlas to convolve
  * @param {number} probe_index_offset
  * @param {number} probe_update_count
  * @param {number[]} g_buffer_resolution In texels
@@ -129,6 +130,7 @@ export function graph_lvp_atlas_to_sh({
                                           graph,
                                           atlas,
                                           scene,
+                                          atlas_radiance,
                                           probe_index_offset,
                                           probe_update_count,
                                           g_buffer_resolution,
@@ -163,7 +165,7 @@ export function graph_lvp_atlas_to_sh({
             bindings: {
                 settings,
                 coefficients: output,
-                tAtlas_radiance: atlas.texture_radiance.obtainView(),
+                tAtlas_radiance: resources.get(data.atlas_radiance).obtainView(),
             },
             thread_count_x: g_buffer_resolution[0],
             thread_count_y: g_buffer_resolution[1],
@@ -184,5 +186,13 @@ export function graph_lvp_atlas_to_sh({
 
     pass_data.output = r_sh_buffer;
 
+    /*
+     Declared rather than reached for through the captured `atlas`. Binding the object left the
+     graph with no edge from the passes that fill the atlas to this one, so culling was free to
+     elide them — they survive today only because they write an imported resource — and neither
+     `validate()` nor the DOT/JSON topology export could see the dependency at all.
+    */
+    pass_data.atlas_radiance = pass.read(atlas_radiance);
+
     return r_sh_buffer;
 }

package/src/shade/renderer/global_illumination/probe/octahedral/graph_lpv_shade.d.ts

@@ -8,6 +8,6 @@
  * @param {number} atlas_radiance
  */
 export function graph_lpv_shade({ graph, atlas_radiance, g_buffer_albedo, g_buffer_emissive, g_buffer_normals, g_buffer_pbr, g_buffer_position, g_buffer_indirect, probe_index_offset, probe_update_count, random_seed, resolution, atlas, scene, }: FrameGraph): {
-    radiance: FrameGraph;
+    radiance: any;
 };
 //# sourceMappingURL=graph_lpv_shade.d.ts.map

package/src/shade/renderer/global_illumination/probe/octahedral/graph_lpv_shade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_lpv_shade.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/graph_lpv_shade.js"],"names":[],"mappings":"AA4UA;;;;;;;;GAQG;AACH;;EAwEC"}
+{"version":3,"file":"graph_lpv_shade.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/global_illumination/probe/octahedral/graph_lpv_shade.js"],"names":[],"mappings":"AA4UA;;;;;;;;GAQG;AACH;;EA0EC"}

package/src/shade/renderer/global_illumination/probe/octahedral/graph_lpv_shade.js

@@ -362,7 +362,7 @@ export function graph_lpv_shade({
     const lights = scene.lights;
     const geometries = scene.geometries;
 
-    graph_compute_pass({
+    const { tAtlas_radiance: atlas_radiance_written } = graph_compute_pass({
         graph,
         shader,
         group_count: [
@@ -409,6 +409,8 @@ export function graph_lpv_shade({
     });
 
     return {
-        radiance: atlas_radiance
+        // the version this pass produced. Handing back the one we were given makes every later
+        // reader a superseded read of an atlas this pass has already filled.
+        radiance: atlas_radiance_written
     };
 }

package/src/shade/renderer/global_illumination/sharc/SpatialHashRadianceCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpatialHashRadianceCache.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/global_illumination/sharc/SpatialHashRadianceCache.js"],"names":[],"mappings":"AAaA;IAkDI;;;;OAIG;IACH,8CAFW,MAAM,EAkBhB;IA1DD,qCAEC;IASD,mCAEC;IAQD,mBAEC;IAQD,6BAIC;IARD,0BAEC;IAiCD;;;;;;;;OAQG;IACH,gHAqGC;IAED,gBAEC;IAED,gBAEC;IAED,cAiBC;IAGD,gBAUC;IAED;;;OAqBC;IAED;;;OAGG;IACH,+BAYC;;CACJ"}
+{"version":3,"file":"SpatialHashRadianceCache.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/global_illumination/sharc/SpatialHashRadianceCache.js"],"names":[],"mappings":"AAaA;IAkDI;;;;OAIG;IACH,8CAFW,MAAM,EAkBhB;IA1DD,qCAEC;IASD,mCAEC;IAQD,mBAEC;IAQD,6BAIC;IARD,0BAEC;IAiCD;;;;;;;;OAQG;IACH,gHAyGC;IAED,gBAEC;IAED,gBAEC;IAED,cAiBC;IAGD,gBAUC;IAED;;;OAqBC;IAED;;;OAGG;IACH,+BAYC;;CACJ"}

package/src/shade/renderer/global_illumination/sharc/SpatialHashRadianceCache.js

@@ -134,7 +134,11 @@ export class SpatialHashRadianceCache {
                 sceneScale: scene_scale,
                 capacity,
                 frame: frame_index,
-                cameraPosition: camera.camera.transform.position.toArray()
+                cameraPosition: [
+                    camera.camera.transform.translation_x,
+                    camera.camera.transform.translation_y,
+                    camera.camera.transform.translation_z
+                ]
             };
 
             // run a compute shader to update the hash table

package/src/shade/renderer/light/cluster/cull/graph_cull_lights.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_cull_lights.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/light/cluster/cull/graph_cull_lights.js"],"names":[],"mappings":"AAqKA;;;;;;GAMG;AACH,uFAkBC"}
+{"version":3,"file":"graph_cull_lights.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/light/cluster/cull/graph_cull_lights.js"],"names":[],"mappings":"AAiLA;;;;;;GAMG;AACH,uFA8BC"}

package/src/shade/renderer/light/cluster/cull/graph_cull_lights.js

@@ -1,3 +1,4 @@
+import { graph_import_buffer } from "../../../shader/graph/graph_import_buffer.js";
 import { BufferResourceDescriptor } from "../../../../device/graph/BufferResourceDescriptor.js";
 import { u32 } from "../../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
 import {
@@ -44,11 +45,12 @@ function clusterable_light_count(lights) {
 /**
  *
  * @param {GPULightCollection} lights
- * @param {GPUCameraContext} camera
+ * @param {number} camera graph handle of the camera uniform
+ * @param {number} light_data graph handle of the light database buffer
  * @param {FrameGraph} graph
  * @return {number}
  */
-function graph_cull_lights_frustum({ lights, camera, graph }) {
+function graph_cull_lights_frustum({ lights, camera, light_data, graph }) {
     /**
      *
      * @param data
@@ -58,6 +60,8 @@ function graph_cull_lights_frustum({ lights, camera, graph }) {
     function execute(data, resources, context) {
 
         const output = resources.get(data.output);
+        const camera_buffer = resources.get(data.camera);
+        const light_buffer = resources.get(data.light_data);
 
         // Per-thread dispatch — one thread per (page, in_page_slot)
         // pair, sized to the table's currently allocated capacity.
@@ -72,8 +76,8 @@ function graph_cull_lights_frustum({ lights, camera, graph }) {
         shader_cull_point_lights_frustum.dispatchThreads({
             encoder: context.encoder,
             bindings: {
-                camera: camera.buffer,
-                light_data: lights.buffer_data,
+                camera: camera_buffer,
+                light_data: light_buffer,
                 output,
             },
             thread_count_x: point_thread_count,
@@ -82,8 +86,8 @@ function graph_cull_lights_frustum({ lights, camera, graph }) {
         shader_cull_spot_lights_frustum.dispatchThreads({
             encoder: context.encoder,
             bindings: {
-                camera: camera.buffer,
-                light_data: lights.buffer_data,
+                camera: camera_buffer,
+                light_data: light_buffer,
                 output,
             },
             thread_count_x: spot_thread_count,
@@ -95,6 +99,8 @@ function graph_cull_lights_frustum({ lights, camera, graph }) {
 
     const pass = graph.add("cull lights / frustum", data, execute);
 
+    data.camera = pass.read(camera);
+    data.light_data = pass.read(light_data);
     data.output = pass.create("list", OUTPUT_DESCRIPTOR);
 
     return data.output;
@@ -105,7 +111,8 @@ function graph_cull_lights_frustum({ lights, camera, graph }) {
  *
  * @param {number} list
  * @param {GPULightCollection} lights
- * @param {GPUCameraContext} camera
+ * @param {number} camera graph handle of the camera uniform
+ * @param {number} light_data graph handle of the light database buffer
  * @param {FrameGraph} graph
  * @param {number} hzb
  * @return {number}
@@ -114,6 +121,7 @@ function graph_cull_lights_hzb({
                                    list,
                                    lights,
                                    camera,
+                                   light_data,
                                    graph,
                                    hzb
                                }) {
@@ -128,6 +136,8 @@ function graph_cull_lights_hzb({
         const input = resources.get(data.input);
         const output = resources.get(data.output);
         const hzb = resources.get(data.hzb);
+        const camera_buffer = resources.get(data.camera);
+        const light_buffer = resources.get(data.light_data);
 
         const candidate_count = clusterable_light_count(lights);
 
@@ -142,9 +152,9 @@ function graph_cull_lights_hzb({
             encoder: context.encoder,
             bindings: {
                 texture_hzb: hzb,
-                camera: camera.buffer,
+                camera: camera_buffer,
                 input,
-                light_data: lights.buffer_data,
+                light_data: light_buffer,
                 output,
             },
             thread_count_x: candidate_count,
@@ -158,6 +168,8 @@ function graph_cull_lights_hzb({
 
     data.input = pass.read(list);
     data.hzb = pass.read(hzb);
+    data.camera = pass.read(camera);
+    data.light_data = pass.read(light_data);
     data.output = pass.create("output", OUTPUT_DESCRIPTOR);
 
     return data.output;
@@ -179,12 +191,24 @@ export function graph_cull_lights({
 
     // TODO cull useless lights where radius is <= 0 or total luma is <= 0
 
-    let culled = graph_cull_lights_frustum({ lights, camera, graph });
+    /*
+     Imported once and threaded, rather than reached for through the captured `camera` and `lights`
+     inside each execute. A pass binding a buffer off a captured object is a reader the graph cannot
+     see: culling, ordering and `validate()` all reason about declared handles only, and the DOT and
+     JSON exports and the profiler's topology show the pass with no inputs at all. Once per call
+     rather than once per pass, because two imports of one buffer are two entries the graph cannot
+     tell apart — see `graph_particles.js`, which states the same rule.
+    */
+    const gr_camera = graph_import_buffer(graph, camera.buffer.buffer, "Camera/current");
+    const gr_light_data = graph_import_buffer(graph, lights.buffer_data, "lights/database");
+
+    let culled = graph_cull_lights_frustum({ lights, camera: gr_camera, light_data: gr_light_data, graph });
 
     return graph_cull_lights_hzb({
         list: culled,
         lights,
-        camera,
+        camera: gr_camera,
+        light_data: gr_light_data,
         graph,
         hzb,
     });

package/src/shade/renderer/loader/gltf/tiny-gltf.d.ts

@@ -13,7 +13,7 @@ export class TinyGltf {
      * @readonly
      * @type {TextureFormat}
      */
-    static readonly "__#222@#UNCOMPRESSED_TARGET": TextureFormat;
+    static readonly "__#225@#UNCOMPRESSED_TARGET": TextureFormat;
     /**
      * @param {AssetManager} assetManager
      * @param {AssetRequestScope} [scope]