@woosh/meep-engine 3.58.0 → 3.59.0

package/src/shade/renderer/geometry/virtual/runtime/cut/shader_vgeo_cut_collect.js

@@ -6,16 +6,13 @@ import { COLLECTION_U32_STRUCT_READ } from "../../../../gpu_primitive/COLLECTION
 import { COLLECTION_U32_STRUCT_WRITE } from "../../../../gpu_primitive/COLLECTION_U32_STRUCT_WRITE.js";
 import { ComputeShader } from "../../../../shader/ComputeShader.js";
 import { GEOMETRY_METADATA_STRUCT } from "../../../GEOMETRY_METADATA_STRUCT.js";
-import { chunk_mat3_singular_values } from "../../../../shader/chunk/geometry/mat3/chunk_mat3_singular_values.js";
 import { chunk_mat4_inverse } from "../../../../shader/chunk/geometry/mat4/chunk_mat4_inverse.js";
 import { chunk_scene_database_access } from "../../../../scene/chunk_scene_database_access.js";
 import { ShaderResourceSetDescriptor } from "../../../../shader/resource/ShaderResourceSetDescriptor.js";
 import { VGEO_CUT_STAT } from "../layout/VGEO_CUT_STAT.js";
 import { VGEO_GEOMETRY_ROW_NONE } from "../layout/VGEO_GEOMETRY_ROW_NONE.js";
-import { VGEO_GEOMETRY_ROW_OFFSET } from "../layout/VGEO_GEOMETRY_ROW_OFFSET.js";
-import { VGEO_GEOMETRY_ROW_WORDS } from "../layout/VGEO_GEOMETRY_ROW_WORDS.js";
 import { VGEO_INSTANCE_OFFSET } from "../layout/VGEO_INSTANCE_OFFSET.js";
-import { VGEO_INSTANCE_WORDS } from "../layout/VGEO_INSTANCE_WORDS.js";
+import { chunk_vgeo_cut_instance } from "./chunk_vgeo_cut_instance.js";
 import { VGEO_CUT_PARAMS_STRUCT } from "./VGEO_CUT_PARAMS_STRUCT.js";
 import { VGEO_CUT_WORKGROUP_SIZE } from "./VGEO_CUT_WORKGROUP_SIZE.js";
 
@@ -61,12 +58,6 @@ const body = CodeChunk.from(
     //language=WGSL
     `
 const VG_GEOMETRY_ROW_NONE = ${VGEO_GEOMETRY_ROW_NONE}u;
-const VG_INSTANCE_WORDS = ${VGEO_INSTANCE_WORDS}u;
-const VG_GEOMETRY_ROW_WORDS = ${VGEO_GEOMETRY_ROW_WORDS}u;
-
-fn vg_store(base: u32, field: u32, value: f32) {
-    instances[base + field] = bitcast<u32>(value);
-}
 
 /**
  * One frustum plane out of a row combination of the object-space view-projection, normalized so a
@@ -137,10 +128,6 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
 
     let node = scene_read_node(&scene_database, mesh.node);
 
-    let linear = mat3x3<f32>(
-        node.global[0].xyz, node.global[1].xyz, node.global[2].xyz
-    );
-
     /*
      In perspective, error and distance are both object-space, so a **uniform** scale cancels out of
      r_e * k / d exactly and needs no term at all. A non-uniform one does not, and the correction is
@@ -153,34 +140,10 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
      becomes world units by the largest stretch, and the correction is sigma_max alone. The weight
      picks between them without a branch, and at w = 1 the expression is today's x / y exactly.
      */
-    let stretch = mat3_singular_values(linear);
-
-    if (!(abs(determinant(linear)) > 0.0) || !(stretch.y > 0.0)) {
-        /*
-         A singular transform — an instance scaled to zero in some direction. mat4_inverse says so
-         by dividing by a zero determinant, and the NaN that comes back makes **every** comparison
-         in vg_project and the frustum test fail open, so one zero-scaled instance draws its whole
-         resident set. It covers no pixels, so dropping it is also the right picture.
-
-         **The determinant is the test, and sigma_min alone was not.** This guard used to be
-         !(sigma_min > 0) on its own, and the closed form's own doc offered sigma_min as a
-         degeneracy test — true in exact arithmetic, false in f32. An axis-aligned flatten makes
-         MtM exactly diagonal and takes the exact branch, which does return zero. A ROTATED one
-         takes the trigonometric branch, where sigma_min is a difference of nearly equal numbers
-         with an absolute error of about sqrt(eps_f32) * sigma_max — so it came back near 1e-4
-         rather than 0, and thirty-six of forty rotated zero-scale instances passed this line with
-         a NaN eye and a projection scale of 6.2e10 behind it (REVIEW_LEDGER M3, re-review
-         2026-09-12). The determinant does not have that problem: a flattened instance has one
-         exactly-zero column at every rotation, and every term of the expansion carries a factor
-         from it. It is also, exactly, the number mat4_inverse divides by two lines below.
-
-         sigma_min is kept beside it because it is not redundant: a matrix that is merely very
-         close to singular has a non-zero determinant and can still report sigma_min as zero, and
-         the ratio below would then be an infinity rather than a correction.
-
-         Both written as !(x > 0) rather than x <= 0 so that a NaN — which compares false against
-         everything — is caught rather than passed through.
-         */
+    let stretch = vg_instance_stretch(node.global);
+
+    // a transform that flattens the instance, which vg_instance_stretch answers with zero
+    if (!(stretch.y > 0.0)) {
         atomicAdd(
             &feedback[params.stats_base + ${VGEO_CUT_STAT.INSTANCES_DROPPED}u], 1u
         );
@@ -188,16 +151,15 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
         return;
     }
 
-    let slot = atomicAdd(&claim_widths.count, 1u);
+    /*
+     Bounded like every other append in the cut. As the seam is wired this cannot fire — one
+     instance record per element of input_meshes, and both collections are sized from the same
+     limit — but the invariant lives a call away and the buffer is created here, so the check
+     belongs here too.
+     */
+    let base = vg_instance_record(mesh_index, geometry_row, params.instance_capacity);
 
-    if (slot >= params.instance_capacity) {
-        /*
-         Bounded like every other append in the cut. As the seam is wired this cannot fire — one
-         instance record per element of input_meshes, and both collections are sized from the same
-         limit — but the invariant lives a call away and the buffer is created here, so the check
-         belongs here too. Dropping the instance is the safe direction: a cut run without a claim
-         slice draws every page once per parent that reaches it.
-         */
+    if (base == VG_INSTANCE_RECORD_NONE) {
         atomicAdd(
             &feedback[params.stats_base + ${VGEO_CUT_STAT.INSTANCES_DROPPED}u], 1u
         );
@@ -205,8 +167,6 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
         return;
     }
 
-    let base = slot * VG_INSTANCE_WORDS;
-
     let to_object = mat4_inverse(node.global);
 
     // the camera's position in this instance's object space, out of the camera's own world transform
@@ -252,26 +212,10 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
     vg_store_plane(base, 2u, row_w, row_y, 1.0);
     vg_store_plane(base, 3u, row_w, row_y, -1.0);
     vg_store_plane(base, 4u, row_w, row_z, -1.0);
-
-    let geometry_base = geometry_row * VG_GEOMETRY_ROW_WORDS;
-
-    let ordinal_capacity = vg_geometries[
-        geometry_base + ${VGEO_GEOMETRY_ROW_OFFSET.ORDINAL_CAPACITY}u
-    ];
-
-    instances[base + ${VGEO_INSTANCE_OFFSET.MESH_INDEX}u] = mesh_index;
-    instances[base + ${VGEO_INSTANCE_OFFSET.ROOT_PAGE_ROW}u] =
-        vg_geometries[geometry_base + ${VGEO_GEOMETRY_ROW_OFFSET.ROOT_PAGE_ROW}u];
-    instances[base + ${VGEO_INSTANCE_OFFSET.LOOKUP_WORD_OFFSET}u] =
-        vg_geometries[geometry_base + ${VGEO_GEOMETRY_ROW_OFFSET.LOOKUP_WORD_OFFSET}u];
-    instances[base + ${VGEO_INSTANCE_OFFSET.ORDINAL_CAPACITY}u] = ordinal_capacity;
-    instances[base + ${VGEO_INSTANCE_OFFSET.CLAIM_BASE}u] = 0u;
-
-    claim_widths.elements[slot] = ordinal_capacity;
 }
 `, [
     chunk_scene_database_access,
-    chunk_mat3_singular_values,
+    chunk_vgeo_cut_instance,
     chunk_mat4_inverse,
 ]);
 

package/src/shade/renderer/geometry/virtual/runtime/cut/shader_vgeo_cut_traverse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_vgeo_cut_traverse.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/geometry/virtual/runtime/cut/shader_vgeo_cut_traverse.js"],"names":[],"mappings":"AAu4BA,qDAIG;8BAx4B2B,qCAAqC"}
+{"version":3,"file":"shader_vgeo_cut_traverse.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/geometry/virtual/runtime/cut/shader_vgeo_cut_traverse.js"],"names":[],"mappings":"AA+IA,qDAIG;8BAhJ2B,qCAAqC"}