@aardworx/wombat.rendering 0.8.0 → 0.9.0

package/dist/runtime/textureAtlas/packer.d.ts

@@ -0,0 +1,50 @@
+import { Box2i, V2i } from "@aardworx/wombat.base";
+/**
+ * Immutable 2D atlas. Generic over `K` (entry key — anything that's a
+ * valid `Map` key works; we recommend strings or numbers).
+ */
+export declare class TexturePacking<K> {
+    readonly size: V2i;
+    readonly allowRotate: boolean;
+    private readonly free;
+    /** Used rects keyed on the user's K. */
+    readonly used: ReadonlyMap<K, Box2i>;
+    private constructor();
+    static empty<K>(size: V2i, allowRotate?: boolean): TexturePacking<K>;
+    static create<K>(size: V2i, allowRotate?: boolean): TexturePacking<K>;
+    get count(): number;
+    get isEmpty(): boolean;
+    /** All free MaxRects. */
+    get freeRects(): Iterable<Box2i>;
+    get occupancy(): number;
+    /**
+     * Try to insert one entry. Returns the new packing on success, or
+     * `null` if no free rect (with optional rotation) can accommodate
+     * `size`.
+     *
+     * If `id` is already present:
+     *   - same size → returns `this` (no-op).
+     *   - different size → removes then re-adds.
+     */
+    tryAdd(id: K, size: V2i): TexturePacking<K> | null;
+    /** Atomic batch insert: returns null if any element would not fit. */
+    tryAdd(many: Iterable<readonly [K, V2i]>): TexturePacking<K> | null;
+    private tryAddOne;
+    /** Remove `id` (no-op if absent). */
+    remove(id: K): TexturePacking<K>;
+}
+export declare const empty: <K>(size: V2i) => TexturePacking<K>;
+export declare const isEmpty: <K>(p: TexturePacking<K>) => boolean;
+export declare const count: <K>(p: TexturePacking<K>) => number;
+export declare const occupancy: <K>(p: TexturePacking<K>) => number;
+export declare const tryAdd: <K>(id: K, size: V2i, p: TexturePacking<K>) => TexturePacking<K> | null;
+/** Sort-then-tryAdd helper. Sorting by descending max-extent matches the F# heuristic. */
+export declare const tryAddMany: <K>(elements: Iterable<readonly [K, V2i]>, p: TexturePacking<K>) => TexturePacking<K> | null;
+export declare const tryOfArray: <K>(size: V2i, elements: ReadonlyArray<readonly [K, V2i]>) => TexturePacking<K> | null;
+/**
+ * Build an optimal-square packing for the given elements, doubling
+ * the side until everything fits then binary-searching down. Mirrors
+ * F#'s `TexturePacking.square`.
+ */
+export declare const square: <K>(elements: ReadonlyArray<readonly [K, V2i]>) => TexturePacking<K>;
+//# sourceMappingURL=packer.d.ts.map

package/dist/runtime/textureAtlas/packer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"packer.d.ts","sourceRoot":"","sources":["../../../src/runtime/textureAtlas/packer.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAS,KAAK,EAAO,GAAG,EAAE,MAAM,uBAAuB,CAAC;AA6K/D;;;GAGG;AACH,qBAAa,cAAc,CAAC,CAAC;aAET,IAAI,EAAE,GAAG;aACT,WAAW,EAAE,OAAO;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,wCAAwC;aACxB,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC;IAL7C,OAAO;IAQP,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,GAAE,OAAc,GAAG,cAAc,CAAC,CAAC,CAAC;IAS1E,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,GAAE,OAAc,GAAG,cAAc,CAAC,CAAC,CAAC;IAI3E,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,yBAAyB;IACzB,IAAI,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE/B;IAED,IAAI,SAAS,IAAI,MAAM,CAQtB;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI;IAClD,sEAAsE;IACtE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI;IAanE,OAAO,CAAC,SAAS;IAiEjB,qCAAqC;IACrC,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;CAyBjC;AAID,eAAO,MAAM,KAAK,GAAI,CAAC,EAAE,MAAM,GAAG,KAAG,cAAc,CAAC,CAAC,CAAkC,CAAC;AACxF,eAAO,MAAM,OAAO,GAAI,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,KAAG,OAAoB,CAAC;AACvE,eAAO,MAAM,KAAK,GAAI,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,KAAG,MAAiB,CAAC;AAClE,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,KAAG,MAAqB,CAAC;AAC1E,eAAO,MAAM,MAAM,GAAI,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,KAAG,cAAc,CAAC,CAAC,CAAC,GAAG,IACnE,CAAC;AAErB,0FAA0F;AAC1F,eAAO,MAAM,UAAU,GAAI,CAAC,EAC1B,UAAU,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EACrC,GAAG,cAAc,CAAC,CAAC,CAAC,KACnB,cAAc,CAAC,CAAC,CAAC,GAAG,IAItB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,EAC1B,MAAM,GAAG,EACT,UAAU,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KACzC,cAAc,CAAC,CAAC,CAAC,GAAG,IAA4C,CAAC;AAEpE;;;;GAIG;AACH,eAAO,MAAM,MAAM,GAAI,CAAC,EAAE,UAAU,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KAAG,cAAc,CAAC,CAAC,CA+BtF,CAAC"}

package/dist/runtime/textureAtlas/packer.js

@@ -0,0 +1,390 @@
+// TexturePacking — incremental immutable MaxRects-style 2D rectangle
+// packer over `BvhTree2d`.
+//
+// Port of `Aardvark.Geometry.TexturePacking<'a>` from
+// `aardvark.base/src/Aardvark.Geometry/TexturePacking.fs`. Algorithm:
+//   - Atlas is described by a set of free MaxRects (contained in a
+//     `BvhTree2d` keyed on the rect itself for O(log N) queries).
+//   - tryAdd picks the free rect with the smallest waste that fits the
+//     incoming size (with optional 90° rotation), splits the chosen
+//     rect into the placed sub-rect plus residual MaxRects.
+//   - Remove restores a sub-rect and merges with adjacent free rects
+//     using the F# `merge` routine, which incrementally maintains
+//     non-overlapping MaxRects covering the released region + neighbours.
+//
+// The wombat port keys the BVH on `Box2i` value-objects. We use a
+// stable string key (`"minX,minY,maxX,maxY"`) so identical rectangles
+// share a Map slot — Box2i instances themselves are reference types in
+// JS and would not collide otherwise.
+import { Box2d, Box2i, V2d, V2i } from "@aardworx/wombat.base";
+import { BvhTree2d } from "./bvhTree2d.js";
+// ─── Box2i helpers (mirroring the F# helpers in this module) ───────
+const boxKey = (b) => {
+    const mn = b.min, mx = b.max;
+    return `${mn.x},${mn.y},${mx.x},${mx.y}`;
+};
+const sizeOf = (b) => {
+    const mn = b.min, mx = b.max;
+    return new V2i(mx.x - mn.x + 1, mx.y - mn.y + 1);
+};
+const isValid2i = (b) => {
+    const mn = b.min, mx = b.max;
+    return mn.x <= mx.x && mn.y <= mx.y;
+};
+const intersects2i = (a, b) => {
+    const amin = a.min, amax = a.max, bmin = b.min, bmax = b.max;
+    return amin.x <= bmax.x && amax.x >= bmin.x && amin.y <= bmax.y && amax.y >= bmin.y;
+};
+const intersectsTouching2i = (a, b) => {
+    // Mirror F# `intersects` inside `maxRects`: a 1-unit halo so adjacent
+    // rectangles count as overlapping (used to detect contact).
+    const amin = a.min, amax = a.max, bmin = b.min, bmax = b.max;
+    return amin.x <= bmax.x + 1 && amax.x >= bmin.x - 1 && amin.y <= bmax.y + 1 && amax.y >= bmin.y - 1;
+};
+const contains2i = (outer, inner) => {
+    const omin = outer.min, omax = outer.max, imin = inner.min, imax = inner.max;
+    return omin.x <= imin.x && omin.y <= imin.y && omax.x >= imax.x && omax.y >= imax.y;
+};
+const equals2i = (a, b) => {
+    const amin = a.min, amax = a.max, bmin = b.min, bmax = b.max;
+    return amin.x === bmin.x && amin.y === bmin.y && amax.x === bmax.x && amax.y === bmax.y;
+};
+const mkBox = (minX, minY, maxX, maxY) => new Box2i(minX, minY, maxX, maxY);
+// `createBox`: half-pixel padded Box2d for BVH key. Exact mirror of
+// F#'s `createBox`.
+const createBox = (b) => {
+    const mn = b.min, mx = b.max;
+    return Box2d.fromMinMax(new V2d(mn.x - 0.5, mn.y - 0.5), new V2d(mx.x + 0.5, mx.y + 0.5));
+};
+// Subtract `b` from `a` (the placed rect from a free rect) and produce
+// up to four residual MaxRects strips. Mirrors F#'s `split`.
+const splitRects = (a, b) => {
+    const cands = [
+        mkBox(b.max.x + 1, a.min.y, a.max.x, a.max.y),
+        mkBox(a.min.x, a.min.y, b.min.x - 1, a.max.y),
+        mkBox(a.min.x, b.max.y + 1, a.max.x, a.max.y),
+        mkBox(a.min.x, a.min.y, a.max.x, b.min.y - 1),
+    ];
+    return cands.filter(isValid2i);
+};
+// MaxRects union/cleanup. Direct port of F#'s `maxRects`.
+const maxRectsCombine = (a, b) => {
+    if (intersectsTouching2i(a, b)) {
+        if (contains2i(a, b))
+            return [a];
+        if (contains2i(b, a))
+            return [b];
+        const ax0 = a.min.x, ax1 = a.max.x, ay0 = a.min.y, ay1 = a.max.y;
+        const bx0 = b.min.x, bx1 = b.max.x, by0 = b.min.y, by1 = b.max.y;
+        // RangeX of a contains RangeX of b: ax0<=bx0 && ax1>=bx1
+        const abx = ax0 <= bx0 && ax1 >= bx1;
+        const bax = bx0 <= ax0 && bx1 >= ax1;
+        const aby = ay0 <= by0 && ay1 >= by1;
+        const bay = by0 <= ay0 && by1 >= ay1;
+        if (abx && bax) {
+            // identical X — Y-union
+            return [mkBox(ax0, Math.min(ay0, by0), ax1, Math.max(ay1, by1))];
+        }
+        if (aby && bay) {
+            return [mkBox(Math.min(ax0, bx0), ay0, Math.max(ax1, bx1), ay1)];
+        }
+        if (abx) {
+            return [mkBox(bx0, Math.min(ay0, by0), bx1, Math.max(ay1, by1)), a];
+        }
+        if (bax) {
+            return [mkBox(ax0, Math.min(ay0, by0), ax1, Math.max(ay1, by1)), b];
+        }
+        if (aby) {
+            return [mkBox(Math.min(ax0, bx0), by0, Math.max(ax1, bx1), by1), a];
+        }
+        if (bay) {
+            return [mkBox(Math.min(ax0, bx0), ay0, Math.max(ax1, bx1), ay1), b];
+        }
+        // Cross case: produce the two orthogonal strips of each rect's
+        // overlap with the other, plus both originals; filter invalid.
+        const out = [
+            mkBox(Math.min(ax0, bx0), Math.max(ay0, by0), Math.max(ax1, bx1), Math.min(ay1, by1)),
+            mkBox(Math.max(ax0, bx0), Math.min(ay0, by0), Math.min(ax1, bx1), Math.max(ay1, by1)),
+            a,
+            b,
+        ];
+        return out.filter(isValid2i);
+    }
+    return [a, b];
+};
+// Merge a freshly-released rect `n` with already-known adjacent free
+// rects, producing the new MaxRects covering the union. Direct port
+// of F#'s `merge`.
+const merge = (n, boxes) => {
+    const boxArr = [...boxes];
+    if (boxArr.length === 0)
+        return [n];
+    let free = BvhTree2d.empty();
+    const addOne = (b) => {
+        const q = mkBox(b.min.x - 1, b.min.y - 1, b.max.x + 1, b.max.y + 1);
+        const touching = [];
+        for (const [, val] of free.getIntersecting(createBox(q))) {
+            if (intersectsTouching2i(val, q))
+                touching.push(val);
+        }
+        if (touching.length === 0) {
+            free = free.add(boxKey(b), createBox(b), b);
+            return;
+        }
+        for (const o of touching) {
+            free = free.remove(boxKey(o));
+            for (const r of maxRectsCombine(o, b)) {
+                // skip if any existing free rect already contains r
+                let contained = false;
+                for (const [, val] of free.getContaining(createBox(r))) {
+                    if (contains2i(val, r)) {
+                        contained = true;
+                        break;
+                    }
+                }
+                if (!contained) {
+                    // remove any free rect r contains
+                    const containedKeys = [];
+                    for (const [k, val] of free.getContained(createBox(r))) {
+                        if (contains2i(r, val))
+                            containedKeys.push(k);
+                        void val;
+                    }
+                    for (const k of containedKeys)
+                        free = free.remove(k);
+                    free = free.add(boxKey(r), createBox(r), r);
+                }
+            }
+        }
+    };
+    addOne(n);
+    for (const b of boxArr)
+        addOne(b);
+    return [...free.toSeq()].map(([, , v]) => v);
+};
+// Add a free rect into the tree iff no existing rect already contains
+// it. Mirror of F#'s `addFree`.
+const addFree = (b, free) => {
+    if (!isValid2i(b))
+        return free;
+    let containing = false;
+    for (const [, v] of free.getContaining(createBox(b))) {
+        if (contains2i(v, b)) {
+            containing = true;
+            break;
+        }
+    }
+    if (containing)
+        return free;
+    return free.add(boxKey(b), createBox(b), b);
+};
+/**
+ * Immutable 2D atlas. Generic over `K` (entry key — anything that's a
+ * valid `Map` key works; we recommend strings or numbers).
+ */
+export class TexturePacking {
+    size;
+    allowRotate;
+    free;
+    used;
+    constructor(size, allowRotate, free, 
+    /** Used rects keyed on the user's K. */
+    used) {
+        this.size = size;
+        this.allowRotate = allowRotate;
+        this.free = free;
+        this.used = used;
+    }
+    static empty(size, allowRotate = true) {
+        if (size.x <= 0 || size.y <= 0) {
+            return new TexturePacking(new V2i(0, 0), allowRotate, BvhTree2d.empty(), new Map());
+        }
+        const bb = mkBox(0, 0, size.x - 1, size.y - 1);
+        const tree = BvhTree2d.empty().add(boxKey(bb), createBox(bb), bb);
+        return new TexturePacking(size, allowRotate, tree, new Map());
+    }
+    static create(size, allowRotate = true) {
+        return TexturePacking.empty(size, allowRotate);
+    }
+    get count() {
+        return this.used.size;
+    }
+    get isEmpty() {
+        return this.used.size === 0;
+    }
+    /** All free MaxRects. */
+    get freeRects() {
+        return [...this.free.toSeq()].map(([, , v]) => v);
+    }
+    get occupancy() {
+        let area = 0;
+        for (const [, b] of this.used) {
+            const s = sizeOf(b);
+            area += s.x * s.y;
+        }
+        const total = this.size.x * this.size.y;
+        return total > 0 ? area / total : 0;
+    }
+    tryAdd(a, b) {
+        if (b === undefined) {
+            let cur = this;
+            for (const [id, sz] of a) {
+                if (cur === null)
+                    return null;
+                cur = cur.tryAddOne(id, sz);
+            }
+            return cur;
+        }
+        return this.tryAddOne(a, b);
+    }
+    tryAddOne(id, size) {
+        if (size.x <= 0 || size.y <= 0)
+            return this;
+        const ex = this.used.get(id);
+        if (ex !== undefined) {
+            const s = sizeOf(ex);
+            if (s.x === size.x && s.y === size.y)
+                return this;
+            const removed = this.remove(id);
+            return removed.tryAddOne(id, size);
+        }
+        // Score each free rect; pick the smallest waste that fits.
+        let best;
+        for (const [, , rect] of this.free.toSeq()) {
+            const sh = sizeOf(rect);
+            const f0 = sh.x >= size.x && sh.y >= size.y;
+            const f1 = this.allowRotate ? sh.x >= size.y && sh.y >= size.x : false;
+            const w0 = (sh.x - size.x) * (sh.y - size.y);
+            const w1 = (sh.x - size.y) * (sh.y - size.x);
+            let cand;
+            if (f0 && f1) {
+                if (w0 < w1)
+                    cand = { score: w0, upright: true };
+                else
+                    cand = { score: w1, upright: false };
+            }
+            else if (f0)
+                cand = { score: w0, upright: true };
+            else if (f1)
+                cand = { score: w1, upright: false };
+            if (cand !== undefined && (best === undefined || cand.score < best.score)) {
+                best = { rect, upright: cand.upright, score: cand.score };
+            }
+        }
+        if (best === undefined)
+            return null;
+        const placedSize = best.upright ? size : new V2i(size.y, size.x);
+        const fitting = best.rect;
+        // Two slabs left of `fitting` after placement: right strip + top
+        // strip. Mirror F# layout.
+        const r0 = mkBox(fitting.min.x + placedSize.x, fitting.min.y, fitting.max.x, fitting.max.y);
+        const r1 = mkBox(fitting.min.x, fitting.min.y + placedSize.y, fitting.max.x, fitting.max.y);
+        const rect = mkBox(fitting.min.x, fitting.min.y, fitting.min.x + placedSize.x - 1, fitting.min.y + placedSize.y - 1);
+        let free = this.free.remove(boxKey(fitting));
+        free = addFree(r0, free);
+        free = addFree(r1, free);
+        // For every other free rect intersecting `rect`, replace with
+        // `splitRects(other, rect)`.
+        const intersecting = [];
+        for (const [, , v] of free.toSeq()) {
+            if (intersects2i(v, rect))
+                intersecting.push([boxKey(v), v]);
+        }
+        for (const [k, other] of intersecting) {
+            free = free.remove(k);
+            for (const p of splitRects(other, rect))
+                free = addFree(p, free);
+        }
+        const newUsed = new Map(this.used);
+        newUsed.set(id, rect);
+        return new TexturePacking(this.size, this.allowRotate, free, newUsed);
+    }
+    /** Remove `id` (no-op if absent). */
+    remove(id) {
+        const rect = this.used.get(id);
+        if (rect === undefined)
+            return this;
+        const newUsed = new Map(this.used);
+        newUsed.delete(id);
+        const qi = mkBox(rect.min.x - 1, rect.min.y - 1, rect.max.x + 1, rect.max.y + 1);
+        const adjacent = [];
+        for (const [, , v] of [...this.free.getIntersecting(createBox(qi))].map(([k, vv]) => [k, vv, vv])) {
+            if (v.min.x === qi.max.x ||
+                v.max.x === qi.min.x ||
+                v.min.y === qi.max.y ||
+                v.max.y === qi.min.y) {
+                adjacent.push(v);
+            }
+        }
+        let free = this.free;
+        for (const a of adjacent)
+            free = free.remove(boxKey(a));
+        for (const m of merge(rect, adjacent))
+            free = addFree(m, free);
+        return new TexturePacking(this.size, this.allowRotate, free, newUsed);
+    }
+}
+// ─── Module-level helpers (matching the F# `module TexturePacking`) ─
+export const empty = (size) => TexturePacking.empty(size);
+export const isEmpty = (p) => p.isEmpty;
+export const count = (p) => p.count;
+export const occupancy = (p) => p.occupancy;
+export const tryAdd = (id, size, p) => p.tryAdd(id, size);
+/** Sort-then-tryAdd helper. Sorting by descending max-extent matches the F# heuristic. */
+export const tryAddMany = (elements, p) => {
+    const arr = [...elements];
+    arr.sort((a, b) => Math.max(b[1].x, b[1].y) - Math.max(a[1].x, a[1].y));
+    return p.tryAdd(arr);
+};
+export const tryOfArray = (size, elements) => tryAddMany(elements, empty(size));
+/**
+ * Build an optimal-square packing for the given elements, doubling
+ * the side until everything fits then binary-searching down. Mirrors
+ * F#'s `TexturePacking.square`.
+ */
+export const square = (elements) => {
+    const arr = [...elements];
+    arr.sort((a, b) => Math.max(b[1].x, b[1].y) - Math.max(a[1].x, a[1].y));
+    if (arr.length === 0)
+        return empty(new V2i(0, 0));
+    if (arr.length === 1) {
+        const [id, sz] = arr[0];
+        const s = Math.max(sz.x, sz.y);
+        return empty(new V2i(s, s)).tryAdd(id, sz);
+    }
+    let area = 0;
+    for (const [, sz] of arr)
+        area += sz.x * sz.y;
+    let lo = Math.floor(Math.sqrt(area));
+    let hi = nextPow2(lo);
+    let best = tryOfArray(new V2i(hi, hi), arr);
+    while (best === null) {
+        lo = hi;
+        hi = hi * 2;
+        best = tryOfArray(new V2i(hi, hi), arr);
+    }
+    let bestPacking = best;
+    while (hi > lo + 1) {
+        const m = (hi + lo) >> 1;
+        const p = tryOfArray(new V2i(m, m), arr);
+        if (p !== null) {
+            bestPacking = p;
+            hi = m;
+        }
+        else {
+            lo = m;
+        }
+    }
+    return bestPacking;
+};
+function nextPow2(n) {
+    if (n <= 1)
+        return 1;
+    let p = 1;
+    while (p < n)
+        p *= 2;
+    return p;
+}
+// silence unused-helper warning at export-time tooling
+void equals2i;
+//# sourceMappingURL=packer.js.map

package/dist/runtime/textureAtlas/packer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"packer.js","sourceRoot":"","sources":["../../../src/runtime/textureAtlas/packer.ts"],"names":[],"mappings":"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"}

package/dist/window/loop.d.ts

@@ -13,6 +13,20 @@ export interface RunFrameOptions {
      * behavior.
      */
     readonly onAfterFrame?: () => void;
+    /**
+     * Frame pacer. When provided, runFrame awaits this promise after
+     * each frame's eval and BEFORE invoking `onAfterFrame` / scheduling
+     * the next rAF. Caps the JS encode rate to whatever the pacer
+     * resolves at — typically `() => device.queue.onSubmittedWorkDone()`
+     * to keep the GPU queue at depth 1 instead of letting submit-
+     * returns-immediately balloon the queue under load.
+     *
+     * Without a pacer, JS happily encodes 60 frames/s into a GPU that's
+     * actually running at 10 fps — the compositor then drops frames
+     * silently and the perceived rate has nothing to do with rAF rate.
+     * Always supply a pacer for continuous-redraw scenes.
+     */
+    readonly pacer?: () => Promise<void>;
 }
 export type FrameCallback = (token: AdaptiveToken, info: FrameInfo) => void;
 export interface FrameInfo {

package/dist/window/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/window/loop.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAQ,aAAa,EAAe,MAAM,2BAA2B,CAAC;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,iEAAiE;IACjE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;CACpC;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;AAE5E,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CACtB,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,aAAa,EACpB,IAAI,GAAE,eAAoB,GACzB;IAAE,IAAI,IAAI,IAAI,CAAA;CAAE,CAqElB"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/window/loop.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAQ,aAAa,EAAe,MAAM,2BAA2B,CAAC;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,iEAAiE;IACjE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IACnC;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;AAE5E,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CACtB,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,aAAa,EACpB,IAAI,GAAE,eAAoB,GACzB;IAAE,IAAI,IAAI,IAAI,CAAA;CAAE,CAiFlB"}

package/dist/window/loop.js

@@ -47,6 +47,17 @@ export function runFrame(attachment, frame, opts = {}) {
         frameNo++;
         return frameNo;
     });
+    const finalizeFrame = () => {
+        if (stopped)
+            return;
+        if (opts.onAfterFrame !== undefined) {
+            transact(opts.onAfterFrame);
+        }
+        if (opts.maxFrames !== undefined && frameNo >= opts.maxFrames) {
+            stopped = true;
+            sub.dispose();
+        }
+    };
     const tick = () => {
         if (stopped)
             return;
@@ -62,12 +73,14 @@ export function runFrame(attachment, frame, opts = {}) {
         // Inside the eval the same mark would race the
         // `outOfDate=false` reset and animation would stall after one
         // frame.
-        if (opts.onAfterFrame !== undefined) {
-            transact(opts.onAfterFrame);
+        if (opts.pacer !== undefined) {
+            opts.pacer().then(finalizeFrame, (e) => {
+                stopped = true;
+                console.error("runFrame: pacer rejected", e);
+            });
         }
-        if (opts.maxFrames !== undefined && frameNo >= opts.maxFrames) {
-            stopped = true;
-            sub.dispose();
+        else {
+            finalizeFrame();
         }
     };
     const sub = renderAval.addMarkingCallback(() => {

package/dist/window/loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/window/loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/window/loop.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,iEAAiE;AACjE,gEAAgE;AAChE,oEAAoE;AACpE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,0DAA0D;AAC1D,iCAAiC;AACjC,+DAA+D;AAC/D,6DAA6D;AAC7D,4DAA4D;AAC5D,iEAAiE;AACjE,iCAAiC;AACjC,6DAA6D;AAC7D,gEAAgE;AAChE,iEAAiE;AACjE,kEAAkE;AAClE,2CAA2C;AAC3C,gEAAgE;AAChE,wDAAwD;AACxD,EAAE;AACF,oEAAoE;AAGpE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAwC3D,MAAM,UAAU,QAAQ,CACtB,UAA4B,EAC5B,KAAoB,EACpB,OAAwB,EAAE;IAE1B,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACjC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,mEAAmE;IACnE,kEAAkE;IAClE,+DAA+D;IAC/D,MAAM,UAAU,GAAiB,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACrD,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,GAAG,GAAG,QAAQ,CAAC;QAC7B,QAAQ,GAAG,GAAG,CAAC;QACf,UAAU,CAAC,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACrE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;YACtD,MAAM,CAAC,CAAC;QACV,CAAC;QACD,OAAO,EAAE,CAAC;QACV,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,GAAS,EAAE;QAC/B,IAAI,OAAO;YAAE,OAAO;QACpB,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACpC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC9D,OAAO,GAAG,IAAI,CAAC;YACf,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,GAAS,EAAE;QACtB,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,KAAK,CAAC;QAChB,6DAA6D;QAC7D,+DAA+D;QAC/D,+DAA+D;QAC/D,sBAAsB;QACtB,UAAU,CAAC,KAAK,EAAC,iBAAiB,CAAC,CAAC;QACpC,2DAA2D;QAC3D,mDAAmD;QACnD,yDAAyD;QACzD,+CAA+C;QAC/C,8DAA8D;QAC9D,SAAS;QACT,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;gBACrC,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,aAAa,EAAE,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,GAAG,GAAiB,UAExB,CAAC,kBAAkB,CAAC,GAAG,EAAE;QACzB,IAAI,OAAO,IAAI,OAAO;YAAE,OAAO;QAC/B,OAAO,GAAG,IAAI,CAAC;QACf,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,iEAAiE;IACjE,6DAA6D;IAC7D,OAAO,GAAG,IAAI,CAAC;IACf,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAEpC,OAAO;QACL,IAAI;YACF,OAAO,GAAG,IAAI,CAAC;YACf,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC5B,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aardworx/wombat.rendering",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "WebGPU rendering layer for the Wombat TypeScript stack \u2014 RenderObject/RenderTask/runtime + window glue, port of Aardvark.Rendering's lower layers on top of WebGPU and wombat.shader.",
   "license": "MIT",
   "author": "krauthaufen",
@@ -54,14 +54,15 @@
     "src"
   ],
   "dependencies": {
-    "@aardworx/wombat.adaptive": "^0.2.2",
+    "@aardworx/wombat.adaptive": "^0.2.3",
     "@aardworx/wombat.base": "^0.4.2",
-    "@aardworx/wombat.shader": "^0.5.0"
+    "@aardworx/wombat.shader": "^0.5.2"
   },
   "devDependencies": {
     "@webgpu/types": "^0.1.69"
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "private": false
 }

package/src/core/command.ts

@@ -9,9 +9,7 @@
 // AdaptiveResource update logic and run implicitly when a Render
 // command needs a dirty resource.
 
-import type { aval } from "@aardworx/wombat.adaptive";
 import type { ClearValues } from "./clear.js";
-import type { IFramebuffer } from "./framebuffer.js";
 import type { RenderTree } from "./renderTree.js";
 
 export interface BufferCopyRange {
@@ -37,14 +35,16 @@ export interface TextureCopy {
 export type CopySpec = BufferCopy | TextureCopy;
 
 /**
- * `Render` and `Clear` take an `aval<IFramebuffer>` for their output
- * so that swap-chain framebuffers (which produce a fresh
- * `GPUTextureView` every animation frame) flow through cleanly.
- * For static FBOs, wrap with `cval(...)` from `@aardworx/wombat.adaptive`
- * — the runtime evaluates the aval per frame.
+ * `Render` and `Clear` no longer carry their own framebuffer — the
+ * task is created against a fixed `FramebufferSignature`, and the
+ * concrete `IFramebuffer` is supplied at `run`/`encode` time. All
+ * Render/Clear commands in a task share that framebuffer; multi-
+ * framebuffer scenes compose multiple tasks at the call site.
+ *
+ * `Copy` and `Custom` are framebuffer-agnostic and unchanged.
  */
 export type Command =
-  | { readonly kind: "Render"; readonly output: aval<IFramebuffer>; readonly tree: RenderTree }
-  | { readonly kind: "Clear"; readonly output: aval<IFramebuffer>; readonly values: ClearValues }
+  | { readonly kind: "Render"; readonly tree: RenderTree }
+  | { readonly kind: "Clear"; readonly values: ClearValues }
   | { readonly kind: "Copy"; readonly copy: CopySpec }
   | { readonly kind: "Custom"; readonly encode: (cmd: GPUCommandEncoder) => void };