@drawcall/lod 0.3.0 → 0.5.0

package/dist/instanced/mirror.js

@@ -1,24 +1,20 @@
-import { StorageBufferAttribute } from "three/webgpu";
-/**
- * A storage attribute over a CPU chunk attribute's array, which the page pool reads it through, uploading what the app
- * marks changed in it: binding the app's own attribute through storage() would flag it as a storage attribute, which
- * three then pads (an RGB colour to four floats) and treats as one wherever else the app draws it.
- */
+import { StorageInstancedBufferAttribute } from "three/webgpu";
+// Storage attributes the GPU reads a Lod's CPU attributes through, uploading what the app marks changed in them, as
+// three uploads an InstancedMesh's: binding the app's own attribute through storage() would flag it as a storage
+// attribute, which three then pads (an RGB colour to four floats) and treats as one wherever else the app draws it. Each
+// takes and clears the source's update ranges, so an InstancedMesh also drawing the source uploads it whole.
+/** A CPU instanceMatrix's mirror, over the source's own array. */
 export class Mirror {
     source;
-    /** A matrix per item, or floats one by one, which three never pads. */
     attribute;
     /** The source's version it last took in. */
     version;
     constructor(source) {
         this.source = source;
-        this.attribute = new StorageBufferAttribute(source.array, source.itemSize === 16 ? 16 : 1);
+        this.attribute = new StorageInstancedBufferAttribute(source.array, 16);
         this.version = source.version;
     }
-    /**
-     * Take in the source's edits, whose array it shares: upload the ranges the app marked changed (all of it without any),
-     * which three would upload and clear were it drawing the source itself. Whether the source changed.
-     */
+    /** Take in the source's edits: the ranges the app marked changed, all of it without any. Whether it changed. */
     refresh() {
         const { source, attribute } = this;
         if (source.version === this.version)
@@ -34,4 +30,47 @@ export class Mirror {
         this.attribute.dispose();
     }
 }
+/** A CPU instanceColor's mirror: its RGB padded to the four floats a storage colour holds, in an array of its own. */
+export class ColorMirror {
+    source;
+    attribute;
+    version;
+    constructor(source) {
+        this.source = source;
+        this.attribute = new StorageInstancedBufferAttribute(new Float32Array(source.count * 4), 4);
+        this.copy(0, source.count);
+        this.version = source.version;
+    }
+    /** Take in the source's edits: the instances of the ranges the app marked changed, all without any. Whether it changed. */
+    refresh() {
+        const { source, attribute } = this;
+        if (source.version === this.version)
+            return false;
+        this.version = source.version;
+        const ranges = source.updateRanges.length > 0 ? source.updateRanges : [{ start: 0, count: source.array.length }];
+        for (const { start, count } of ranges) {
+            const first = Math.floor(start / 3);
+            const end = Math.min(Math.ceil((start + count) / 3), source.count);
+            this.copy(first, end);
+            attribute.addUpdateRange(first * 4, (end - first) * 4);
+        }
+        source.clearUpdateRanges();
+        attribute.needsUpdate = true;
+        return true;
+    }
+    dispose() {
+        this.attribute.dispose();
+    }
+    /** Copy instances `first` to `end` (exclusive) of the source, white's alpha padding them. */
+    copy(first, end) {
+        const from = this.source.array;
+        const to = this.attribute.array;
+        for (let i = first; i < end; i++) {
+            to[i * 4] = from[i * 3] ?? 0;
+            to[i * 4 + 1] = from[i * 3 + 1] ?? 0;
+            to[i * 4 + 2] = from[i * 3 + 2] ?? 0;
+            to[i * 4 + 3] = 1;
+        }
+    }
+}
 //# sourceMappingURL=mirror.js.map

package/dist/instanced/mirror.js.map

@@ -1 +1 @@
-{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/instanced/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAiC,MAAM,cAAc,CAAC;AAErF;;;;GAIG;AACH,MAAM,OAAO,MAAM;IAMI;IALrB,uEAAuE;IAC9D,SAAS,CAAyB;IAC3C,4CAA4C;IACpC,OAAO,CAAS;IAExB,YAAqB,MAAgC;QAAhC,WAAM,GAAN,MAAM,CAA0B;QACnD,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3F,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QACnC,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,YAAY;YAAE,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3F,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC3B,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF"}
+{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/instanced/mirror.ts"],"names":[],"mappings":"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"}

package/dist/instanced/raycast.d.ts

@@ -1,15 +1,12 @@
 import { Sphere, type Intersection, type Object3D, type Raycaster } from "three/webgpu";
-import type { InstancedLodChunk } from "./chunk.js";
 import type { Part } from "./meshes.js";
-/** A hit on an InstancedLod: `object` is the InstancedLod, `instanceId` the instance's index in `chunk`. */
-export interface InstancedLodIntersection extends Intersection {
-    instanceId: number;
-    chunk: InstancedLodChunk;
-}
-/** An InstancedLod's source level as a raycast meets it: its parts, and the sphere around every level in an instance's space. */
+/** A Lod's source level as a raycast meets it: its parts, and the sphere around every level in an instance's space. */
 export interface RaycastSource {
     readonly parts: readonly Part[];
     readonly rest: Sphere;
 }
-/** Hits on the instances of `chunks`, CPU chunks `lod` holds, of `source`'s meshes, each raycast where an instance stands. */
-export declare function raycastInstances(lod: Object3D, source: RaycastSource, chunks: Iterable<InstancedLodChunk>, raycaster: Raycaster, intersects: Intersection[]): void;
+/**
+ * Hits on the first `count` instances of `matrices`, `lod`'s, of `source`'s meshes, each raycast where an instance
+ * stands, with `instanceId` set as on an InstancedMesh's hits.
+ */
+export declare function raycastInstances(lod: Object3D, source: RaycastSource, matrices: ArrayLike<number>, count: number, raycaster: Raycaster, intersects: Intersection[]): void;

package/dist/instanced/raycast.js

@@ -6,28 +6,25 @@ const sphere = new Sphere();
 const instance = new Matrix4();
 const world = new Matrix4();
 const hits = [];
-/** Hits on the instances of `chunks`, CPU chunks `lod` holds, of `source`'s meshes, each raycast where an instance stands. */
-export function raycastInstances(lod, source, chunks, raycaster, intersects) {
+/**
+ * Hits on the first `count` instances of `matrices`, `lod`'s, of `source`'s meshes, each raycast where an instance
+ * stands, with `instanceId` set as on an InstancedMesh's hits.
+ */
+export function raycastInstances(lod, source, matrices, count, raycaster, intersects) {
     ray.copy(raycaster.ray).applyMatrix4(inverse.copy(lod.matrixWorld).invert());
     // A mesh of several material groups is a part per group: it is hit once. A mesh's parts share its placement.
     const meshes = new Map();
     for (const { template, placement } of source.parts)
-        if (template.layers.test(raycaster.layers))
-            meshes.set(template, placement);
-    for (const chunk of chunks) {
-        for (let index = 0; index < chunk.count; index++) {
-            instance.fromArray(chunk.instanceMatrix.array, (chunk.start + index) * 16);
-            sphere.center.copy(source.rest.center).applyMatrix4(instance);
-            sphere.radius = source.rest.radius * stretch(instance);
-            if (sphere.radius === 0 || !ray.intersectsSphere(sphere))
-                continue;
-            for (const [mesh, placement] of meshes) {
-                for (const hit of hitsAt(mesh, world.multiplyMatrices(lod.matrixWorld, instance).multiply(placement), raycaster)) {
-                    const found = Object.assign(hit, { object: lod, instanceId: index, chunk });
-                    intersects.push(found);
-                }
-            }
-        }
+        meshes.set(template, placement);
+    for (let index = 0; index < count; index++) {
+        instance.fromArray(matrices, index * 16);
+        sphere.center.copy(source.rest.center).applyMatrix4(instance);
+        sphere.radius = source.rest.radius * stretch(instance);
+        if (sphere.radius === 0 || !ray.intersectsSphere(sphere))
+            continue;
+        for (const [mesh, placement] of meshes)
+            for (const hit of hitsAt(mesh, world.multiplyMatrices(lod.matrixWorld, instance).multiply(placement), raycaster))
+                intersects.push({ ...hit, object: lod, instanceId: index });
     }
 }
 /** `mesh`'s own raycast, as if it stood at `matrixWorld`. */

package/dist/instanced/raycast.js.map

@@ -1 +1 @@
-{"version":3,"file":"raycast.js","sourceRoot":"","sources":["../../src/instanced/raycast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAA+D,MAAM,cAAc,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAgBtC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;AACtB,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;AAC5B,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;AAC/B,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;AAC5B,MAAM,IAAI,GAAmB,EAAE,CAAC;AAEhC,8HAA8H;AAC9H,MAAM,UAAU,gBAAgB,CAC9B,GAAa,EACb,MAAqB,EACrB,MAAmC,EACnC,SAAoB,EACpB,UAA0B;IAE1B,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7E,6GAA6G;IAC7G,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;IACxC,KAAK,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,MAAM,CAAC,KAAK;QAAE,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAChI,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;YACjD,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3E,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAAE,SAAS;YACnE,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM,EAAE,CAAC;gBACvC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC;oBACjH,MAAM,KAAK,GAA6B,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;oBACtG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,6DAA6D;AAC7D,SAAS,MAAM,CAAC,IAAU,EAAE,WAAoB,EAAE,SAAoB;IACpE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC;IAC7B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAC/B,IAAI,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"raycast.js","sourceRoot":"","sources":["../../src/instanced/raycast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAA+D,MAAM,cAAc,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAStC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;AACtB,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;AAC5B,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;AAC/B,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;AAC5B,MAAM,IAAI,GAAmB,EAAE,CAAC;AAEhC;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAa,EAAE,MAAqB,EAAE,QAA2B,EAAE,KAAa,EAAE,SAAoB,EAAE,UAA0B;IACjK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7E,6GAA6G;IAC7G,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;IACxC,KAAK,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,MAAM,CAAC,KAAK;QAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACpF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3C,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAAE,SAAS;QACnE,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM;YACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;gBAAE,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAClL,CAAC;AACH,CAAC;AAED,6DAA6D;AAC7D,SAAS,MAAM,CAAC,IAAU,EAAE,WAAoB,EAAE,SAAoB;IACpE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC;IAC7B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAC/B,IAAI,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/instanced/rows.d.ts

@@ -1,16 +1,15 @@
 import { IndirectStorageBufferAttribute, StorageBufferAttribute } from "three/webgpu";
-/** vec4s per row of u32s and of f32s: what one InstancedLod sorts by for a camera, in two buffers (see `INTS_AT`). */
+/** vec4s of the row's u32s and of its f32s. */
 export declare const INT_ROW = 6;
 export declare const FLOAT_ROW = 12;
 /**
- * Where each vec4 of a row lies. Of its u32s (`INTS_AT`): `levels`, the level count, the coarsest level, the forced
- * level as `forcedWord` writes it, and whether the row is sorting (1) or waits as it last sorted (0); `masks`, the
- * levels that draw nothing, whether they fade (1 or 0), those loaded and those loaded before; `flags`, whether the
- * camera is orthographic, cullDistance is set and its survivors scale (1 or 0), and the row's draw count; `layout`,
- * slots per list and the row's first draw; `starts`, per level the first slot of its list, `UNLISTED` for none. Of its
- * f32s (`FLOATS_AT`): maxPixels of levels 0 to 3 and 4 to 7, the camera in its space (eye and pixels per unit of
- * subtense, or of size, ortho), one instance's source sphere, the arrival's progress, the reach of every level and its
- * sway, cullDistance's near and far, cullDistance's camera, and the frustum's six planes.
+ * Where each vec4 of the row lies. Of its u32s (`INTS_AT`): `levels`, the level count, the coarsest level and the forced
+ * level as `forcedWord` writes it; `masks`, the levels that draw nothing, whether they fade (1 or 0), those loaded and
+ * those loaded before; `flags`, whether the camera is orthographic, cullDistance is set and its survivors scale (1 or
+ * 0), and the draw count; `layout`, slots per list; `starts`, per level the first slot of its list, `UNLISTED` for none.
+ * Of its f32s (`FLOATS_AT`): maxPixels of levels 0 to 3 and 4 to 7, the camera in the Lod's space (eye and pixels per
+ * unit of subtense, or of size, ortho), one instance's source sphere, the arrival's progress, the reach of every level
+ * and its sway, cullDistance's near and far, cullDistance's camera, and the frustum's six planes.
  */
 export declare const INTS_AT: {
     readonly levels: 0;
@@ -28,12 +27,10 @@ export declare const FLOATS_AT: {
     readonly cullEye: 5;
     readonly planes: 6;
 };
-/** The forced level as a row's u32 holds it: one more, so that 0 is none (-1). */
+/** The forced level as the row holds it: one more, so that 0 is none (-1). */
 export declare const forcedWord: (forced: number) => number;
 /** The start of a level without a list. */
 export declare const UNLISTED = 4294967295;
-/** Counts kept per row: one per level. */
-export declare const COUNTS_PER_ROW = 8;
 /** Bytes per indirect draw, including the unused final word of a non-indexed draw. */
 export declare const DRAW_BYTES = 20;
 /** One indirect draw: a level's mesh, drawing `count` indices (or vertices) from `start`. */
@@ -43,66 +40,18 @@ export interface IndirectDraw {
     start: number;
     indexed: boolean;
 }
-/** One camera's buffers, the rows it holds values for, and those due to sort. */
-export interface CameraBuffers {
-    /** Its rows' u32s and f32s. */
-    words: StorageBufferAttribute;
-    floats: StorageBufferAttribute;
-    /** Its lists: per slot, the pool index it draws and its signed fade. */
-    indices: StorageBufferAttribute;
-    fades: StorageBufferAttribute;
-    /** Its indirect draws, five words each, in the order of the rows' draws. */
-    args: IndirectStorageBufferAttribute;
-    /** Whether its words go up whole with the next sort, as after a layout: no range of them is marked then. */
-    whole: boolean;
-    readonly held: Set<number>;
-    readonly due: Set<number>;
-    /** The InstancedLods drawing for the camera. */
-    users: number;
-}
-/** The rows of every InstancedLod of a LodGpu, where their lists and draws lie, and the buffers every camera shares. */
-export declare class RowLayout {
-    private readonly rows;
-    private readonly free;
-    private slots;
-    private drawCount;
-    /** Every row's draws, from its first (see `drawWords`). */
-    draws: StorageBufferAttribute;
-    /** Per row and level, how many instances it holds for the camera sorting: the indirect pass clears them. */
-    counts: StorageBufferAttribute;
-    /** Whether the rows changed since they were laid out. */
-    private moved;
-    /** How many rows there are, freed ones included. */
-    get length(): number;
-    /** A row for an InstancedLod whose levels of `listed`, a mask, list up to `listSize` instances each. */
-    register(listed: number, listSize: number): number;
-    /** Free `row`: its InstancedLod is disposed. */
-    unregister(row: number): void;
-    /** `row` draws `draws` too, after those it has; where they start among its draws. */
-    appendDraws(row: number, draws: readonly IndirectDraw[]): number;
-    /** Byte offset of `row`'s first draw in a camera's args. */
-    argsOffset(row: number): number;
-    /**
-     * Lay every row's lists and draws out anew if they moved, with every camera's buffers fitted to them: each gets
-     * fresh args, as a row's old place holds another's words, and every row it holds is due to sort at its new place.
-     */
-    layOut(cameras: Iterable<CameraBuffers>): void;
-    /** Write `row`'s layout and draw count into `buffers`' words. */
-    place(buffers: CameraBuffers, row: number): void;
-    /** A camera's buffers, sized to the layout. */
-    makeBuffers(): CameraBuffers;
-    dispose(): void;
-    private rowAt;
-    /** Grow `buffers` to the layout, keeping what its rows hold, with fresh args. */
-    private fit;
-}
-/** Set `row`'s sorting bit in `buffers` to `sorting`, uploaded with the camera's next sort. */
-export declare function setSorting(buffers: CameraBuffers, row: number, sorting: number): void;
-/** `count` of `buffers`' words from `at` changed: they go up with the camera's next sort. */
-export declare function markWords(buffers: CameraBuffers, at: number, count: number): void;
-export declare function disposeBuffers({ words, floats, indices, fades, args }: CameraBuffers): void;
-/** A camera's rows, as the u32s and the f32s its buffers hold. */
-export declare const wordsOf: ({ words }: CameraBuffers) => Uint32Array<ArrayBufferLike>;
-export declare const floatsOf: ({ floats }: CameraBuffers) => Float32Array<ArrayBufferLike>;
 /** The words of `draws` as the indirect pass reads them: level, count, start and whether indexed, per draw. */
 export declare function drawWords(draws: readonly IndirectDraw[]): StorageBufferAttribute;
+/**
+ * Where the blocks start among the u32s: four per block, its first instance, its range's end and start, and its range's
+ * item of live counts, NO_LIVE_COUNT for none (see `LodCluster.liveCount`).
+ */
+export declare const BLOCKS_AT: number;
+export declare const NO_LIVE_COUNT = 4294967295;
+/** The row's u32s and room for `blocks` blocks, one at least. */
+export declare const wordsBuffer: (blocks: number) => StorageBufferAttribute;
+export declare const floatsBuffer: () => StorageBufferAttribute;
+/** Per level, how many instances its list holds for the camera sorting: the indirect pass clears them. */
+export declare const countsBuffer: () => StorageBufferAttribute;
+/** Indirect draws only the GPU writes, zero until a sort writes them: nothing draws before a sort. */
+export declare const argsBuffer: (draws: number) => IndirectStorageBufferAttribute;

package/dist/instanced/rows.js

@@ -1,209 +1,44 @@
 import { IndirectStorageBufferAttribute, StorageBufferAttribute } from "three/webgpu";
 import { MAX_LEVELS } from "../levels/draw.js";
-// Where every InstancedLod of a LodGpu lies in a camera's buffers: its row of what it sorts by, its lists and its
-// indirect draws. A row's place follows from the rows before it: once a row was registered, freed or given draws, the
-// next use lays every row out anew (see `RowLayout.layOut`).
-/** vec4s per row of u32s and of f32s: what one InstancedLod sorts by for a camera, in two buffers (see `INTS_AT`). */
+// What a Lod sorts by for one camera, as the sort passes read it (see update.ts): its row, of u32s and of f32s, and
+// after the row's u32s, in their buffer, the blocks of instances it sorts.
+/** vec4s of the row's u32s and of its f32s. */
 export const INT_ROW = 6;
 export const FLOAT_ROW = 12;
 /**
- * Where each vec4 of a row lies. Of its u32s (`INTS_AT`): `levels`, the level count, the coarsest level, the forced
- * level as `forcedWord` writes it, and whether the row is sorting (1) or waits as it last sorted (0); `masks`, the
- * levels that draw nothing, whether they fade (1 or 0), those loaded and those loaded before; `flags`, whether the
- * camera is orthographic, cullDistance is set and its survivors scale (1 or 0), and the row's draw count; `layout`,
- * slots per list and the row's first draw; `starts`, per level the first slot of its list, `UNLISTED` for none. Of its
- * f32s (`FLOATS_AT`): maxPixels of levels 0 to 3 and 4 to 7, the camera in its space (eye and pixels per unit of
- * subtense, or of size, ortho), one instance's source sphere, the arrival's progress, the reach of every level and its
- * sway, cullDistance's near and far, cullDistance's camera, and the frustum's six planes.
+ * Where each vec4 of the row lies. Of its u32s (`INTS_AT`): `levels`, the level count, the coarsest level and the forced
+ * level as `forcedWord` writes it; `masks`, the levels that draw nothing, whether they fade (1 or 0), those loaded and
+ * those loaded before; `flags`, whether the camera is orthographic, cullDistance is set and its survivors scale (1 or
+ * 0), and the draw count; `layout`, slots per list; `starts`, per level the first slot of its list, `UNLISTED` for none.
+ * Of its f32s (`FLOATS_AT`): maxPixels of levels 0 to 3 and 4 to 7, the camera in the Lod's space (eye and pixels per
+ * unit of subtense, or of size, ortho), one instance's source sphere, the arrival's progress, the reach of every level
+ * and its sway, cullDistance's near and far, cullDistance's camera, and the frustum's six planes.
  */
 export const INTS_AT = { levels: 0, masks: 1, flags: 2, layout: 3, starts: 4 };
 export const FLOATS_AT = { low: 0, high: 1, eye: 2, source: 3, values: 4, cullEye: 5, planes: 6 };
-/** The u32 of the sorting bit, in a row's u32s. */
-const SORTING_AT = INTS_AT.levels * 4 + 3;
-/** The forced level as a row's u32 holds it: one more, so that 0 is none (-1). */
+/** The forced level as the row holds it: one more, so that 0 is none (-1). */
 export const forcedWord = (forced) => forced + 1;
 /** The start of a level without a list. */
 export const UNLISTED = 0xffffffff;
-/** Counts kept per row: one per level. */
-export const COUNTS_PER_ROW = MAX_LEVELS;
 /** Bytes per indirect draw, including the unused final word of a non-indexed draw. */
 export const DRAW_BYTES = 20;
-/** The rows of every InstancedLod of a LodGpu, where their lists and draws lie, and the buffers every camera shares. */
-export class RowLayout {
-    rows = [];
-    free = [];
-    slots = 0;
-    drawCount = 0;
-    /** Every row's draws, from its first (see `drawWords`). */
-    draws = drawWords([]);
-    /** Per row and level, how many instances it holds for the camera sorting: the indirect pass clears them. */
-    counts = countsBuffer(0);
-    /** Whether the rows changed since they were laid out. */
-    moved = false;
-    /** How many rows there are, freed ones included. */
-    get length() {
-        return this.rows.length;
-    }
-    /** A row for an InstancedLod whose levels of `listed`, a mask, list up to `listSize` instances each. */
-    register(listed, listSize) {
-        const row = this.free.pop() ?? this.rows.length;
-        this.rows[row] = { listed, listSize, draws: [], listBase: 0, drawBase: 0 };
-        this.moved = true;
-        return row;
-    }
-    /** Free `row`: its InstancedLod is disposed. */
-    unregister(row) {
-        this.rows[row] = null;
-        this.free.push(row);
-        this.moved = true;
-    }
-    /** `row` draws `draws` too, after those it has; where they start among its draws. */
-    appendDraws(row, draws) {
-        const { draws: own } = this.rowAt(row);
-        const first = own.length;
-        own.push(...draws);
-        this.moved = true;
-        return first;
-    }
-    /** Byte offset of `row`'s first draw in a camera's args. */
-    argsOffset(row) {
-        return this.rowAt(row).drawBase * DRAW_BYTES;
-    }
-    /**
-     * Lay every row's lists and draws out anew if they moved, with every camera's buffers fitted to them: each gets
-     * fresh args, as a row's old place holds another's words, and every row it holds is due to sort at its new place.
-     */
-    layOut(cameras) {
-        if (!this.moved)
-            return;
-        this.moved = false;
-        let slots = 0;
-        const all = [];
-        for (const row of this.rows) {
-            if (!row)
-                continue;
-            row.listBase = slots;
-            row.drawBase = all.length;
-            slots += countBits(row.listed) * row.listSize;
-            all.push(...row.draws);
-        }
-        this.slots = slots;
-        this.drawCount = all.length;
-        this.draws.dispose();
-        this.draws = drawWords(all);
-        if (this.counts.count < this.rows.length * COUNTS_PER_ROW) {
-            this.counts.dispose();
-            this.counts = countsBuffer(this.rows.length);
-        }
-        for (const buffers of cameras) {
-            this.fit(buffers);
-            // Every row of it moved: the whole buffer goes up.
-            buffers.words.clearUpdateRanges();
-            buffers.words.needsUpdate = true;
-            buffers.whole = true;
-            for (const row of buffers.held) {
-                this.place(buffers, row);
-                setSorting(buffers, row, 1);
-                buffers.due.add(row);
-            }
-        }
-    }
-    /** Write `row`'s layout and draw count into `buffers`' words. */
-    place(buffers, row) {
-        const { listBase, listSize, listed, drawBase, draws } = this.rowAt(row);
-        const words = wordsOf(buffers);
-        const base = row * INT_ROW * 4;
-        words[base + INTS_AT.flags * 4 + 3] = draws.length;
-        words.set([listSize, drawBase, 0, 0], base + INTS_AT.layout * 4);
-        let next = listBase;
-        for (let level = 0; level < COUNTS_PER_ROW; level++) {
-            const on = (listed & (1 << level)) !== 0;
-            words[base + INTS_AT.starts * 4 + level] = on ? next : UNLISTED;
-            if (on)
-                next += listSize;
-        }
-    }
-    /** A camera's buffers, sized to the layout. */
-    makeBuffers() {
-        return {
-            words: wordsBuffer(this.rows.length),
-            floats: floatsBuffer(this.rows.length),
-            indices: new StorageBufferAttribute(new Uint32Array(Math.max(this.slots, 1)), 1),
-            fades: new StorageBufferAttribute(new Float32Array(Math.max(this.slots, 1)), 1),
-            args: argsBuffer(this.drawCount),
-            whole: false,
-            held: new Set(),
-            due: new Set(),
-            users: 0,
-        };
-    }
-    dispose() {
-        this.draws.dispose();
-        this.counts.dispose();
-    }
-    rowAt(row) {
-        const found = this.rows[row];
-        if (!found)
-            throw new Error(`LodGpu: row ${row} holds no InstancedLod`);
-        return found;
-    }
-    /** Grow `buffers` to the layout, keeping what its rows hold, with fresh args. */
-    fit(buffers) {
-        if (buffers.words.count < this.rows.length * INT_ROW) {
-            const words = wordsBuffer(this.rows.length);
-            const floats = floatsBuffer(this.rows.length);
-            new Uint32Array(words.array.buffer).set(wordsOf(buffers));
-            new Float32Array(floats.array.buffer).set(floatsOf(buffers));
-            buffers.words.dispose();
-            buffers.floats.dispose();
-            buffers.words = words;
-            buffers.floats = floats;
-        }
-        if (buffers.indices.count < this.slots) {
-            buffers.indices.dispose();
-            buffers.fades.dispose();
-            buffers.indices = new StorageBufferAttribute(new Uint32Array(this.slots), 1);
-            buffers.fades = new StorageBufferAttribute(new Float32Array(this.slots), 1);
-        }
-        buffers.args.dispose();
-        buffers.args = argsBuffer(this.drawCount);
-    }
-}
-/** Set `row`'s sorting bit in `buffers` to `sorting`, uploaded with the camera's next sort. */
-export function setSorting(buffers, row, sorting) {
-    const at = row * INT_ROW * 4 + SORTING_AT;
-    wordsOf(buffers)[at] = sorting;
-    markWords(buffers, at, 1);
-}
-/** `count` of `buffers`' words from `at` changed: they go up with the camera's next sort. */
-export function markWords(buffers, at, count) {
-    if (!buffers.whole)
-        buffers.words.addUpdateRange(at, count);
-    buffers.words.needsUpdate = true;
-}
-export function disposeBuffers({ words, floats, indices, fades, args }) {
-    for (const attribute of [words, floats, indices, fades, args])
-        attribute.dispose();
-}
-/** A camera's rows, as the u32s and the f32s its buffers hold. */
-export const wordsOf = ({ words }) => new Uint32Array(words.array.buffer);
-export const floatsOf = ({ floats }) => new Float32Array(floats.array.buffer);
 /** The words of `draws` as the indirect pass reads them: level, count, start and whether indexed, per draw. */
 export function drawWords(draws) {
     const values = new Uint32Array(Math.max(draws.length, 1) * 4);
     draws.forEach((draw, i) => values.set([draw.level, draw.count, draw.start, Number(draw.indexed)], i * 4));
     return new StorageBufferAttribute(values, 4);
 }
-/** Set bits of `mask`. */
-function countBits(mask) {
-    let count = 0;
-    for (let bits = mask; bits !== 0; bits &= bits - 1)
-        count++;
-    return count;
-}
-const wordsBuffer = (rows) => new StorageBufferAttribute(new Uint32Array(Math.max(rows, 1) * INT_ROW * 4), 4);
-const floatsBuffer = (rows) => new StorageBufferAttribute(new Float32Array(Math.max(rows, 1) * FLOAT_ROW * 4), 4);
-const countsBuffer = (rows) => new StorageBufferAttribute(new Uint32Array(Math.max(rows, 1) * COUNTS_PER_ROW), 1);
-/** Indirect draws only the GPU writes, zero until a sort writes them: a row draws nothing before it sorted. */
-const argsBuffer = (draws) => new IndirectStorageBufferAttribute(new Uint32Array(Math.max(draws, 1) * (DRAW_BYTES / 4)), 1);
+/**
+ * Where the blocks start among the u32s: four per block, its first instance, its range's end and start, and its range's
+ * item of live counts, NO_LIVE_COUNT for none (see `LodCluster.liveCount`).
+ */
+export const BLOCKS_AT = INT_ROW * 4;
+export const NO_LIVE_COUNT = 0xffffffff;
+/** The row's u32s and room for `blocks` blocks, one at least. */
+export const wordsBuffer = (blocks) => new StorageBufferAttribute(new Uint32Array(BLOCKS_AT + Math.max(blocks, 1) * 4), 4);
+export const floatsBuffer = () => new StorageBufferAttribute(new Float32Array(FLOAT_ROW * 4), 4);
+/** Per level, how many instances its list holds for the camera sorting: the indirect pass clears them. */
+export const countsBuffer = () => new StorageBufferAttribute(new Uint32Array(MAX_LEVELS), 1);
+/** Indirect draws only the GPU writes, zero until a sort writes them: nothing draws before a sort. */
+export const argsBuffer = (draws) => new IndirectStorageBufferAttribute(new Uint32Array(Math.max(draws, 1) * (DRAW_BYTES / 4)), 1);
 //# sourceMappingURL=rows.js.map

package/dist/instanced/rows.js.map

@@ -1 +1 @@
-{"version":3,"file":"rows.js","sourceRoot":"","sources":["../../src/instanced/rows.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rows.js","sourceRoot":"","sources":["../../src/instanced/rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,oHAAoH;AACpH,2EAA2E;AAE3E,+CAA+C;AAC/C,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC;AACzB,MAAM,CAAC,MAAM,SAAS,GAAG,EAAE,CAAC;AAE5B;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAW,CAAC;AACxF,MAAM,CAAC,MAAM,SAAS,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAW,CAAC;AAE3G,8EAA8E;AAC9E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AAEzD,2CAA2C;AAC3C,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;AAEnC,sFAAsF;AACtF,MAAM,CAAC,MAAM,UAAU,GAAG,EAAE,CAAC;AAU7B,+GAA+G;AAC/G,MAAM,UAAU,SAAS,CAAC,KAA8B;IACtD,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC1G,OAAO,IAAI,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,GAAG,CAAC,CAAC;AACrC,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAC;AAExC,iEAAiE;AACjE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,sBAAsB,CAAC,IAAI,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACnI,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,IAAI,sBAAsB,CAAC,IAAI,YAAY,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACjG,0GAA0G;AAC1G,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,IAAI,sBAAsB,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7F,sGAAsG;AACtG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,8BAA8B,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}

package/dist/instanced/shape.d.ts

@@ -1,6 +1,6 @@
 import { Sphere } from "three/webgpu";
 import type { LodLevel } from "../levels/index.js";
-/** One instance of an InstancedLod as its levels measure it, in its own space: what heights, bounds and fades are measured by. */
+/** One instance of a Lod as its levels measure it, in its own space: what heights, bounds and fades are measured by. */
 export declare class InstanceShape {
     /** The source's sphere, which heights are measured by. */
     readonly source: Sphere;
@@ -10,6 +10,8 @@ export declare class InstanceShape {
     readonly ownRadius: number;
     /** The source's radius padded for sway, where fades and shadow casters are cut off (see `wind`). */
     fadeRadius: number;
+    /** The diagonal of every level's box: how much a cluster's box shows of its instances' scale. */
+    readonly extent: number;
     /** Every level's box. */
     private readonly envelope;
     /** How far levels sway beyond `rest`, relative to it. */

package/dist/instanced/shape.js

@@ -1,6 +1,6 @@
-import { Box3, Sphere } from "three/webgpu";
+import { Box3, Sphere, Vector3 } from "three/webgpu";
 import { levelBox, measureLevels } from "../levels/bounds.js";
-/** One instance of an InstancedLod as its levels measure it, in its own space: what heights, bounds and fades are measured by. */
+/** One instance of a Lod as its levels measure it, in its own space: what heights, bounds and fades are measured by. */
 export class InstanceShape {
     /** The source's sphere, which heights are measured by. */
     source = new Sphere();
@@ -10,6 +10,8 @@ export class InstanceShape {
     ownRadius = 0;
     /** The source's radius padded for sway, where fades and shadow casters are cut off (see `wind`). */
     fadeRadius = 0;
+    /** The diagonal of every level's box: how much a cluster's box shows of its instances' scale. */
+    extent = 0;
     /** Every level's box. */
     envelope = new Box3();
     /** How far levels sway beyond `rest`, relative to it. */
@@ -18,7 +20,7 @@ export class InstanceShape {
     constructor(inputs) {
         if (inputs.length === 0)
             return;
-        const { own, placed } = measureLevels(inputs, "InstancedLod");
+        const { own, placed } = measureLevels(inputs, "Lod");
         this.ownRadius = own.radius;
         this.source.copy(placed);
         this.rest.copy(placed);
@@ -28,6 +30,7 @@ export class InstanceShape {
         // Metadata includes unloaded levels, so later arrivals cannot pass the envelope.
         if (this.envelope.isEmpty())
             return;
+        this.extent = this.envelope.getSize(new Vector3()).length();
         const { center } = this.rest;
         const { min, max } = this.envelope;
         this.rest.radius = Math.max(this.rest.radius, Math.hypot(Math.max(Math.abs(min.x - center.x), Math.abs(max.x - center.x)), Math.max(Math.abs(min.y - center.y), Math.abs(max.y - center.y)), Math.max(Math.abs(min.z - center.z), Math.abs(max.z - center.z))));