@flighthq/bitmaptext 0.2.1-next.841.373388f → 0.3.0-next.1032.e2b99fc

package/dist/bitmapText.d.ts

@@ -1,13 +1,12 @@
-import type { BitmapText, BitmapTextAlign, BitmapTextData, BitmapTextOptions, BitmapTextRuntime, GlyphSource, QuadBatch, Rectangle } from '@flighthq/types';
+import type { BitmapText, BitmapTextAlign, BitmapTextData, BitmapTextOptions, BitmapTextPage, BitmapTextRuntime, GlyphSource, Rectangle } from '@flighthq/types/contract';
 export declare function computeBitmapTextLocalBoundsRectangle(out: Rectangle, source: Readonly<BitmapText>): void;
 export declare function createBitmapText(glyphSource: GlyphSource | null, options?: Readonly<BitmapTextOptions>): BitmapText;
 export declare function createBitmapTextData(data?: Readonly<Partial<BitmapTextData>>): BitmapTextData;
 export declare function createBitmapTextRuntime(): BitmapTextRuntime;
 export declare function getBitmapTextBounds(source: Readonly<BitmapText>): Rectangle;
-export declare function getBitmapTextQuadBatches(source: Readonly<BitmapText>): QuadBatch[];
+export declare function getBitmapTextPages(source: Readonly<BitmapText>): readonly BitmapTextPage[];
 export declare function reserveBitmapText(target: BitmapText, glyphCapacity: number): void;
 export declare function setBitmapTextAlign(target: BitmapText, align: BitmapTextAlign): void;
-export declare function setBitmapTextColor(target: BitmapText, color: number): void;
 export declare function setBitmapTextGlyphSource(target: BitmapText, glyphSource: GlyphSource | null): void;
 export declare function setBitmapTextLetterSpacing(target: BitmapText, letterSpacing: number): void;
 export declare function setBitmapTextLineHeight(target: BitmapText, lineHeight: number): void;

package/dist/bitmapText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bitmapText.d.ts","sourceRoot":"","sources":["../src/bitmapText.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EAGX,SAAS,EACT,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,wBAAgB,qCAAqC,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAWxG;AAQD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAenH;AAED,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,cAAc,CAU7F;AAED,wBAAgB,uBAAuB,IAAI,iBAAiB,CAK3D;AAID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,CAI3E;AAID,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,EAAE,CAElF;AAKD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAGjF;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI,CAEnF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAE1E;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAElG;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAE1F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAEpF;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAExE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEzF"}
+{"version":3,"file":"bitmapText.d.ts","sourceRoot":"","sources":["../src/bitmapText.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,WAAW,EAGX,SAAS,EACV,MAAM,0BAA0B,CAAC;AASlC,wBAAgB,qCAAqC,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAWxG;AASD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAanH;AAED,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,cAAc,CAS7F;AAED,wBAAgB,uBAAuB,IAAI,iBAAiB,CAK3D;AAID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,CAI3E;AAID,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,cAAc,EAAE,CAE1F;AAKD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAMjF;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI,CAEnF;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAElG;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAE1F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAEpF;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAExE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEzF"}

package/dist/bitmapText.js

@@ -1,11 +1,10 @@
-import { copyRectangle, createRectangle } from '@flighthq/geometry';
-import { addNodeChild } from '@flighthq/node';
-import { createNode2D, createNode2DRuntime, getNode2DRuntime } from '@flighthq/scene2d';
-import { createQuadBatch, reserveQuadBatch } from '@flighthq/sprite';
-import { createTextureAtlas } from '@flighthq/textureatlas';
-import { BitmapTextKind } from '@flighthq/types';
-// White (`0xRRGGBBAA` all-ones) — the untinted default; the backing batch stays material-free at this value.
-const BITMAP_TEXT_DEFAULT_COLOR = 0xffffffff;
+import { copyRectangle, createRectangle, reserveFloat32Array, reserveUint16Array } from '@flighthq/geometry/contract';
+import { createNode2D, createNode2DRuntime, getNode2DRuntime } from '@flighthq/scene2d/contract';
+import { createTextureAtlas } from '@flighthq/textureatlas/contract';
+import { BitmapTextKind } from '@flighthq/types/contract';
+// Two floats (x, y) per glyph quad — the vector2 (translation-only) transform stride the BitmapText
+// renderer reads. Kept internal so callers never hand-write i*2.
+const BITMAP_TEXT_TRANSFORM_STRIDE = 2;
 // Writes the laid-out text extent (cached by `updateBitmapText`) into `out`, or a zero rectangle when
 // the text has not been laid out yet. Alias-safe: `out` may be the cached rectangle.
 export function computeBitmapTextLocalBoundsRectangle(out, source) {
@@ -21,27 +20,25 @@ export function computeBitmapTextLocalBoundsRectangle(out, source) {
     copyRectangle(out, bounds);
 }
 // Allocates a BitmapText display node bound to `glyphSource` for both layout AND pixels. The
-// `GlyphSource` seam now pairs its glyph geometry (rects, advances, kerning, metrics) with the
-// backing atlas image(s) those rects sample (`getGlyphAtlasImage(page)`), so no separate image is
-// supplied. The node owns one backing QuadBatch child per glyph-atlas page; a single-page source
-// yields exactly one (page 0), created eagerly here. Call `updateBitmapText` to lay out the current
-// `text`, which sets each page batch's atlas image and grows the set for a multi-page source.
+// `GlyphSource` seam pairs its glyph geometry (rects, advances, kerning, metrics) with the backing atlas
+// image(s) those rects sample (`getGlyphAtlasImage(page)`), so no separate image is supplied. The node
+// owns one `BitmapTextPage` per glyph-atlas page — a single-page source yields exactly one (page 0),
+// created eagerly here — and draws them itself through the registered BitmapText renderer. Call
+// `updateBitmapText` to lay out the current `text`, which binds each page's atlas image and grows the set
+// for a multi-page source.
 export function createBitmapText(glyphSource, options) {
     const bitmapText = createNode2D(BitmapTextKind, undefined, createBitmapTextData, createBitmapTextRuntime);
     const data = bitmapText.data;
     data.glyphSource = glyphSource;
     if (options !== undefined)
         applyBitmapTextOptions(data, options);
-    const quadBatch = createQuadBatch({ data: { atlas: createTextureAtlas() } });
     const runtime = getNode2DRuntime(bitmapText);
-    runtime.quadBatches.push(quadBatch);
-    addNodeChild(bitmapText, quadBatch);
+    runtime.pages.push(createBitmapTextPage());
     return bitmapText;
 }
 export function createBitmapTextData(data) {
     return {
         align: data?.align ?? 'left',
-        color: data?.color ?? BITMAP_TEXT_DEFAULT_COLOR,
         glyphSource: data?.glyphSource ?? null,
         letterSpacing: data?.letterSpacing ?? 0,
         lineHeight: data?.lineHeight ?? 1,
@@ -52,7 +49,7 @@ export function createBitmapTextData(data) {
 export function createBitmapTextRuntime() {
     const runtime = createNode2DRuntime(defaultMethods);
     runtime.localBoundsRectangle = null;
-    runtime.quadBatches = [];
+    runtime.pages = [];
     return runtime;
 }
 // Allocates a fresh Rectangle holding the laid-out text extent. Use
@@ -62,26 +59,25 @@ export function getBitmapTextBounds(source) {
     computeBitmapTextLocalBoundsRectangle(out, source);
     return out;
 }
-// The backing QuadBatches the node lays glyph quads into — the renderable children, one per
-// glyph-atlas page in page order. A single-page source yields exactly one; empty before construction.
-export function getBitmapTextQuadBatches(source) {
-    return getNode2DRuntime(source).quadBatches;
+// The glyph-quad pages the node draws — one per glyph-atlas page in page order. A single-page source
+// yields exactly one; the array is never empty after construction.
+export function getBitmapTextPages(source) {
+    return getNode2DRuntime(source).pages;
 }
-// Grows each backing page QuadBatch to hold at least `glyphCapacity` glyph quads without reallocating
-// during layout. Optional — `updateBitmapText` auto-grows — but avoids incremental reallocation for
-// large strings. Reserving every page's batch over-allocates for multi-page text but never under-sizes.
+// Grows each page's quad arrays to hold at least `glyphCapacity` glyph quads without reallocating during
+// layout. Optional — `updateBitmapText` auto-grows — but avoids incremental reallocation for large
+// strings. Reserving every page over-allocates for multi-page text but never under-sizes.
 export function reserveBitmapText(target, glyphCapacity) {
     const runtime = getNode2DRuntime(target);
-    for (const quadBatch of runtime.quadBatches)
-        reserveQuadBatch(quadBatch, glyphCapacity);
+    for (const page of runtime.pages) {
+        page.ids = reserveUint16Array(page.ids, glyphCapacity);
+        page.transforms = reserveFloat32Array(page.transforms, glyphCapacity * BITMAP_TEXT_TRANSFORM_STRIDE);
+    }
 }
-// The setters below mutate node data only; call `updateBitmapText` afterward to re-lay-out the batch.
+// The setters below mutate node data only; call `updateBitmapText` afterward to re-lay-out the pages.
 export function setBitmapTextAlign(target, align) {
     target.data.align = align;
 }
-export function setBitmapTextColor(target, color) {
-    target.data.color = color;
-}
 export function setBitmapTextGlyphSource(target, glyphSource) {
     target.data.glyphSource = glyphSource;
 }
@@ -100,8 +96,6 @@ export function setBitmapTextWrapWidth(target, wrapWidth) {
 function applyBitmapTextOptions(data, options) {
     if (options.align !== undefined)
         data.align = options.align;
-    if (options.color !== undefined)
-        data.color = options.color;
     if (options.letterSpacing !== undefined)
         data.letterSpacing = options.letterSpacing;
     if (options.lineHeight !== undefined)
@@ -116,6 +110,10 @@ function copyLocalBoundsRectangle(out, source) {
     if (runtime.localBoundsRectangle !== null)
         copyRectangle(out, runtime.localBoundsRectangle);
 }
+// Allocates an empty page bound to a fresh atlas. Its image and regions are set by `updateBitmapText`.
+function createBitmapTextPage() {
+    return { atlas: createTextureAtlas(), ids: new Uint16Array(), instanceCount: 0, transforms: new Float32Array() };
+}
 const defaultMethods = {
     computeLocalBoundsRectangle: copyLocalBoundsRectangle,
 };

package/dist/bitmapText.js.map

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

package/dist/contract.d.ts

@@ -0,0 +1,3 @@
+export * from './bitmapText';
+export * from './updateBitmapText';
+//# sourceMappingURL=contract.d.ts.map

package/dist/contract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC"}

package/dist/contract.js

@@ -0,0 +1,3 @@
+export * from './bitmapText';
+export * from './updateBitmapText';
+//# sourceMappingURL=contract.js.map

package/dist/contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC"}

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-export * from './bitmapText';
-export * from './updateBitmapText';
+export { computeBitmapTextLocalBoundsRectangle, createBitmapText, getBitmapTextBounds, getBitmapTextPages, reserveBitmapText, setBitmapTextAlign, setBitmapTextGlyphSource, setBitmapTextLetterSpacing, setBitmapTextLineHeight, setBitmapTextText, setBitmapTextWrapWidth, updateBitmapText, } from './contract';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACrC,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,3 +1,2 @@
-export * from './bitmapText';
-export * from './updateBitmapText';
+export { computeBitmapTextLocalBoundsRectangle, createBitmapText, getBitmapTextBounds, getBitmapTextPages, reserveBitmapText, setBitmapTextAlign, setBitmapTextGlyphSource, setBitmapTextLetterSpacing, setBitmapTextLineHeight, setBitmapTextText, setBitmapTextWrapWidth, updateBitmapText, } from './contract';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACrC,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,YAAY,CAAC"}

package/dist/updateBitmapText.d.ts

@@ -1,3 +1,3 @@
-import type { BitmapText } from '@flighthq/types';
+import type { BitmapText } from '@flighthq/types/contract';
 export declare function updateBitmapText(bitmapText: BitmapText): void;
 //# sourceMappingURL=updateBitmapText.d.ts.map

package/dist/updateBitmapText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateBitmapText.d.ts","sourceRoot":"","sources":["../src/updateBitmapText.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,UAAU,EAQX,MAAM,iBAAiB,CAAC;AAiBzB,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CA4E7D"}
+{"version":3,"file":"updateBitmapText.d.ts","sourceRoot":"","sources":["../src/updateBitmapText.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,UAAU,EAOX,MAAM,0BAA0B,CAAC;AAgBlC,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CA2E7D"}

package/dist/updateBitmapText.js

@@ -1,35 +1,30 @@
-import { createColorTransformAdjustment } from '@flighthq/adjustments';
-import { createRectangle } from '@flighthq/geometry';
-import { createColorTransform } from '@flighthq/materials';
-import { addNodeChild, invalidateNodeLocalBounds } from '@flighthq/node';
-import { getNode2DRuntime, setNode2DColorAdjustments } from '@flighthq/scene2d';
-import { appendQuadBatchInstance, clearQuadBatch, createQuadBatch } from '@flighthq/sprite';
-import { addTextureAtlasRegion, createTextureAtlas } from '@flighthq/textureatlas';
-// White (`0xRRGGBBAA` all-ones) leaves the backing batch material-free — the untinted path.
-const BITMAP_TEXT_DEFAULT_COLOR = 0xffffffff;
+import { createRectangle, reserveFloat32Array, reserveUint16Array } from '@flighthq/geometry/contract';
+import { invalidateNodeLocalBounds } from '@flighthq/node/contract';
+import { getNode2DRuntime } from '@flighthq/scene2d/contract';
+import { createTexture, setTextureImage } from '@flighthq/texture/contract';
+import { addTextureAtlasRegion, createTextureAtlas } from '@flighthq/textureatlas/contract';
+const BITMAP_TEXT_TRANSFORM_STRIDE = 2;
 const CARRIAGE_RETURN = 0x0d;
 const SPACE = 0x20;
-// Lays out `bitmapText`'s current string and rewrites its backing QuadBatches: one quad per visible
-// glyph, partitioned by the glyph's atlas page into one QuadBatch per page, positioned by the glyph
-// source's advances and kerning, broken on explicit newlines and (when `wrapWidth` is set) at word
-// boundaries, stacked by the metric line advance, and aligned per line. Each page batch's atlas image
-// is bound from `getGlyphAtlasImage(page)` and its regions rebuilt from that page's encountered glyph
-// rects each call, so a dynamic glyph source whose rects shift between layouts stays correct. A
-// single-page source produces exactly one batch (page 0). A page whose `getGlyphAtlasImage` returns
-// null cannot be sampled, so its glyphs are skipped. Missing glyphs (`getGlyphEntry` → null) are
-// omitted entirely — no quad and no advance — since a null entry carries no advance to honor. Bounds
-// span every drawn glyph across all pages.
+// Lays out `bitmapText`'s current string and rewrites its `BitmapTextPage` quads: one quad per visible
+// glyph, partitioned by the glyph's atlas page into one page's quads, positioned by the glyph source's
+// advances and kerning, broken on explicit newlines and (when `wrapWidth` is set) at word boundaries,
+// stacked by the metric line advance, and aligned per line. Each page's atlas Texture is bound from
+// `getGlyphAtlasImage(page)` and its regions rebuilt from that page's encountered glyph rects each call,
+// so a dynamic glyph source whose rects shift between layouts stays correct. A single-page source produces
+// exactly one page (page 0). A page whose `getGlyphAtlasImage` returns null cannot be sampled, so its
+// glyphs are skipped. Missing glyphs (`getGlyphEntry` → null) are omitted entirely — no quad and no
+// advance. Bounds span every drawn glyph across all pages. Tint is the node's own color-adjustment stack,
+// not touched here.
 export function updateBitmapText(bitmapText) {
     const data = bitmapText.data;
     const runtime = getNode2DRuntime(bitmapText);
     const bounds = ensureBoundsRectangle(runtime);
-    // Clear and recolor every existing page batch; pages with glyphs this layout are refilled below,
-    // pages that fall silent stay as empty children drawing nothing.
-    for (const quadBatch of runtime.quadBatches) {
-        clearQuadBatch(quadBatch);
-        if (quadBatch.data.atlas !== null)
-            quadBatch.data.atlas.regions.length = 0;
-        applyBitmapTextColor(quadBatch, data.color);
+    // Clear every existing page; pages with glyphs this layout are refilled below, pages that fall silent
+    // stay as empty pages drawing nothing.
+    for (const page of runtime.pages) {
+        page.instanceCount = 0;
+        page.atlas.regions.length = 0;
     }
     const glyphSource = data.glyphSource;
     if (glyphSource === null || data.text.length === 0) {
@@ -65,18 +60,18 @@ export function updateBitmapText(bitmapText) {
             const word = line.words[wi];
             for (const glyph of word.glyphs) {
                 const entry = glyph.entry;
-                const page = ensureBitmapTextPageBatch(bitmapText, runtime, glyphSource, data.color, pages, entry.page);
-                if (page === null)
+                const context = ensureBitmapTextPage(runtime, glyphSource, pages, entry.page);
+                if (context === null)
                     continue;
                 const quadX = penX + glyph.penWithinWord + entry.bearingX;
                 const quadY = baselineY - entry.bearingY;
-                let regionId = page.regionByCodepoint.get(glyph.codepoint);
+                let regionId = context.regionByCodepoint.get(glyph.codepoint);
                 if (regionId === undefined) {
-                    addTextureAtlasRegion(page.atlas, entry.x, entry.y, entry.width, entry.height);
-                    regionId = page.atlas.regions.length - 1;
-                    page.regionByCodepoint.set(glyph.codepoint, regionId);
+                    addTextureAtlasRegion(context.page.atlas, entry.x, entry.y, entry.width, entry.height);
+                    regionId = context.page.atlas.regions.length - 1;
+                    context.regionByCodepoint.set(glyph.codepoint, regionId);
                 }
-                appendQuadBatchInstance(page.quadBatch, regionId, quadX, quadY);
+                appendBitmapTextPageQuad(context.page, regionId, quadX, quadY);
                 if (quadX < minX)
                     minX = quadX;
                 if (quadY < minY)
@@ -100,22 +95,21 @@ export function updateBitmapText(bitmapText) {
     }
     invalidateNodeLocalBounds(bitmapText);
 }
-// Sets (or clears) the backing batch's node-level color transform from a packed-RGBA color, as a
-// single-entry color-adjustment stack on the batch's runtime slot. White clears it. Every glyph of the
-// batch shares this one tint (whole-batch, not per-glyph), so it resolves to one value and folds into the
-// glyph draw as a single whole-batch color-transform uniform.
-function applyBitmapTextColor(quadBatch, color) {
-    if (color === BITMAP_TEXT_DEFAULT_COLOR) {
-        setNode2DColorAdjustments(quadBatch, null);
-        return;
+// Appends one glyph quad (region id + vector2 pen position) to `page`, auto-growing its arrays. The
+// page-local twin of `appendQuadBatchInstance`, over plain owned arrays rather than a QuadBatch node.
+function appendBitmapTextPageQuad(page, id, x, y) {
+    const index = page.instanceCount;
+    const capacity = Math.min(page.ids.length, (page.transforms.length / BITMAP_TEXT_TRANSFORM_STRIDE) | 0);
+    if (index >= capacity) {
+        const next = Math.max(index + 1, capacity * 2, 8);
+        page.ids = reserveUint16Array(page.ids, next);
+        page.transforms = reserveFloat32Array(page.transforms, next * BITMAP_TEXT_TRANSFORM_STRIDE);
     }
-    const colorTransform = createColorTransform({
-        redMultiplier: ((color >>> 24) & 0xff) / 255,
-        greenMultiplier: ((color >>> 16) & 0xff) / 255,
-        blueMultiplier: ((color >>> 8) & 0xff) / 255,
-        alphaMultiplier: (color & 0xff) / 255,
-    });
-    setNode2DColorAdjustments(quadBatch, [createColorTransformAdjustment(colorTransform)]);
+    page.ids[index] = id;
+    const o = index * BITMAP_TEXT_TRANSFORM_STRIDE;
+    page.transforms[o] = x;
+    page.transforms[o + 1] = y;
+    page.instanceCount = index + 1;
 }
 // Measures one paragraph (a newline-free run) into words separated by whitespace gaps. Intra-word
 // kerning and letter spacing are baked into each glyph's `penWithinWord` and the word width; kerning
@@ -161,30 +155,34 @@ function buildBitmapTextWords(glyphSource, paragraph, letterSpacing) {
     flush();
     return tokens;
 }
-// Ensures a backing QuadBatch exists for glyph-atlas `page` (page-indexed in `runtime.quadBatches`,
-// growing and parenting fresh batches as needed) and binds it to that page's atlas image, returning
-// the per-layout page context (batch + atlas + region cache). Returns null when the page has no atlas
-// image to sample — its glyphs are then skipped. Newly grown gap pages get an empty batch bound to
-// their own image; the common single-page source touches only page 0 (created by `createBitmapText`).
-function ensureBitmapTextPageBatch(bitmapText, runtime, glyphSource, color, pages, page) {
+// Ensures a `BitmapTextPage` exists for glyph-atlas `page` (page-indexed in `runtime.pages`, growing fresh
+// pages as needed) and binds it to that page's atlas image, returning the per-layout page context (page +
+// region cache). Returns null when the page has no atlas image to sample — its glyphs are then skipped.
+function ensureBitmapTextPage(runtime, glyphSource, pages, page) {
     const cached = pages.get(page);
     if (cached !== undefined)
         return cached;
     const image = glyphSource.getGlyphAtlasImage(page);
     if (image === null)
         return null;
-    while (runtime.quadBatches.length <= page) {
-        const created = createQuadBatch({ data: { atlas: createTextureAtlas() } });
-        applyBitmapTextColor(created, color);
-        runtime.quadBatches.push(created);
-        addNodeChild(bitmapText, created);
+    while (runtime.pages.length <= page) {
+        runtime.pages.push({
+            atlas: createTextureAtlas(),
+            ids: new Uint16Array(),
+            instanceCount: 0,
+            transforms: new Float32Array(),
+        });
+    }
+    const pageData = runtime.pages[page];
+    if (pageData.atlas.texture === null) {
+        pageData.atlas.texture = createTexture({ storage: { dimension: '2d', image } });
+    }
+    else {
+        setTextureImage(pageData.atlas.texture, image);
     }
-    const quadBatch = runtime.quadBatches[page];
-    const atlas = quadBatch.data.atlas;
-    atlas.image = image;
-    const pageBatch = { atlas, quadBatch, regionByCodepoint: new Map() };
-    pages.set(page, pageBatch);
-    return pageBatch;
+    const context = { page: pageData, regionByCodepoint: new Map() };
+    pages.set(page, context);
+    return context;
 }
 function ensureBoundsRectangle(runtime) {
     if (runtime.localBoundsRectangle === null)

package/dist/updateBitmapText.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/bitmaptext",
-  "version": "0.2.1-next.841.373388f",
+  "version": "0.3.0-next.1032.e2b99fc",
   "repository": {
     "type": "git",
     "url": "https://github.com/flighthq/flight.git",
@@ -13,6 +13,10 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
+    },
+    "./contract": {
+      "types": "./dist/contract.d.ts",
+      "default": "./dist/contract.js"
     }
   },
   "files": [
@@ -32,14 +36,12 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/adjustments": "0.2.1-next.841.373388f",
-    "@flighthq/scene2d": "0.2.1-next.841.373388f",
-    "@flighthq/geometry": "0.2.1-next.841.373388f",
-    "@flighthq/materials": "0.2.1-next.841.373388f",
-    "@flighthq/node": "0.2.1-next.841.373388f",
-    "@flighthq/sprite": "0.2.1-next.841.373388f",
-    "@flighthq/textureatlas": "0.2.1-next.841.373388f",
-    "@flighthq/types": "0.2.1-next.841.373388f"
+    "@flighthq/scene2d": "0.3.0-next.1032.e2b99fc",
+    "@flighthq/geometry": "0.3.0-next.1032.e2b99fc",
+    "@flighthq/node": "0.3.0-next.1032.e2b99fc",
+    "@flighthq/texture": "0.3.0-next.1032.e2b99fc",
+    "@flighthq/textureatlas": "0.3.0-next.1032.e2b99fc",
+    "@flighthq/types": "0.3.0-next.1032.e2b99fc"
   },
   "devDependencies": {
     "@flighthq/glyphatlas": "*",

package/src/bitmapText.test.ts

@@ -1,8 +1,7 @@
-import { createRectangle } from '@flighthq/geometry';
-import { getNode2DRuntime } from '@flighthq/scene2d';
-import { getQuadBatchCapacity } from '@flighthq/sprite';
-import type { BitmapTextRuntime, GlyphEntry, GlyphSource, ImageResource } from '@flighthq/types';
-import { BitmapTextKind } from '@flighthq/types';
+import { createRectangle } from '@flighthq/geometry/contract';
+import { getNode2DRuntime } from '@flighthq/scene2d/contract';
+import type { BitmapTextRuntime, GlyphEntry, GlyphSource, ImageResource } from '@flighthq/types/contract';
+import { BitmapTextKind } from '@flighthq/types/contract';
 import { describe, expect, it } from 'vitest';
 
 import {
@@ -11,10 +10,9 @@ import {
   createBitmapTextData,
   createBitmapTextRuntime,
   getBitmapTextBounds,
-  getBitmapTextQuadBatches,
+  getBitmapTextPages,
   reserveBitmapText,
   setBitmapTextAlign,
-  setBitmapTextColor,
   setBitmapTextGlyphSource,
   setBitmapTextLetterSpacing,
   setBitmapTextLineHeight,
@@ -73,25 +71,23 @@ describe('computeBitmapTextLocalBoundsRectangle', () => {
 });
 
 describe('createBitmapText', () => {
-  it('creates a BitmapText node with a backing QuadBatch child', () => {
+  it('creates a BitmapText leaf owning one page and no child nodes', () => {
     const text = createBitmapText(createTestGlyphSource());
     expect(text.kind).toBe(BitmapTextKind);
-    const batches = getBitmapTextQuadBatches(text);
-    expect(batches).toHaveLength(1);
-    expect(getNode2DRuntime(text).children).toContain(batches[0]);
+    expect(getBitmapTextPages(text)).toHaveLength(1);
+    const children = getNode2DRuntime(text).children;
+    expect(children == null || children.length === 0).toBe(true);
   });
 
   it('applies construction options to node data', () => {
     const text = createBitmapText(createTestGlyphSource(), {
       align: 'center',
-      color: 0xff0000ff,
       letterSpacing: 2,
       lineHeight: 1.5,
       text: 'Hi',
       wrapWidth: 120,
     });
     expect(text.data.align).toBe('center');
-    expect(text.data.color).toBe(0xff0000ff);
     expect(text.data.letterSpacing).toBe(2);
     expect(text.data.lineHeight).toBe(1.5);
     expect(text.data.text).toBe('Hi');
@@ -106,10 +102,9 @@ describe('createBitmapText', () => {
 });
 
 describe('createBitmapTextData', () => {
-  it('defaults to left-aligned white empty unwrapped text', () => {
+  it('defaults to left-aligned empty unwrapped text', () => {
     const data = createBitmapTextData();
     expect(data.align).toBe('left');
-    expect(data.color).toBe(0xffffffff);
     expect(data.glyphSource).toBeNull();
     expect(data.letterSpacing).toBe(0);
     expect(data.lineHeight).toBe(1);
@@ -126,10 +121,10 @@ describe('createBitmapTextData', () => {
 });
 
 describe('createBitmapTextRuntime', () => {
-  it('starts with null bounds and no page batches', () => {
+  it('starts with null bounds and no pages', () => {
     const runtime = createBitmapTextRuntime();
     expect(runtime.localBoundsRectangle).toBeNull();
-    expect(runtime.quadBatches).toEqual([]);
+    expect(runtime.pages).toEqual([]);
   });
 });
 
@@ -145,20 +140,22 @@ describe('getBitmapTextBounds', () => {
   });
 });
 
-describe('getBitmapTextQuadBatches', () => {
-  it('returns the backing batches in page order, matching the node children', () => {
+describe('getBitmapTextPages', () => {
+  it('returns the owned pages in page order', () => {
     const text = createBitmapText(createTestGlyphSource());
-    const batches = getBitmapTextQuadBatches(text);
-    expect(batches).toHaveLength(1);
-    expect(batches[0]).toBe(getNode2DRuntime(text).children![0]);
+    const pages = getBitmapTextPages(text);
+    expect(pages).toHaveLength(1);
+    expect(pages[0].instanceCount).toBe(0);
   });
 });
 
 describe('reserveBitmapText', () => {
-  it('grows the backing quad batch capacity', () => {
+  it('grows each page quad-array capacity', () => {
     const text = createBitmapText(createTestGlyphSource());
     reserveBitmapText(text, 64);
-    expect(getQuadBatchCapacity(getBitmapTextQuadBatches(text)[0]!)).toBeGreaterThanOrEqual(64);
+    const page = getBitmapTextPages(text)[0];
+    expect(page.ids.length).toBeGreaterThanOrEqual(64);
+    expect(page.transforms.length).toBeGreaterThanOrEqual(128);
   });
 });
 
@@ -170,14 +167,6 @@ describe('setBitmapTextAlign', () => {
   });
 });
 
-describe('setBitmapTextColor', () => {
-  it('mutates the color field', () => {
-    const text = createBitmapText(createTestGlyphSource());
-    setBitmapTextColor(text, 0x00ff00ff);
-    expect(text.data.color).toBe(0x00ff00ff);
-  });
-});
-
 describe('setBitmapTextGlyphSource', () => {
   it('rebinds the glyph source', () => {
     const text = createBitmapText(createTestGlyphSource());

package/src/updateBitmapText.test.ts

@@ -3,12 +3,11 @@ import {
   createGlyphSourceFromGlyphAtlas,
   createStubGlyphRasterizerBackend,
   setGlyphRasterizerBackend,
-} from '@flighthq/glyphatlas';
-import { getNode2DColorAdjustments } from '@flighthq/scene2d';
-import type { ColorTransformAdjustment, GlyphEntry, GlyphSource, ImageResource } from '@flighthq/types';
+} from '@flighthq/glyphatlas/contract';
+import type { GlyphEntry, GlyphSource, ImageResource } from '@flighthq/types/contract';
 import { describe, expect, it } from 'vitest';
 
-import { createBitmapText, getBitmapTextBounds, getBitmapTextQuadBatches, setBitmapTextColor } from './bitmapText';
+import { createBitmapText, getBitmapTextBounds, getBitmapTextPages } from './bitmapText';
 import { updateBitmapText } from './updateBitmapText';
 
 // A deterministic single-page glyph source: every visible glyph is 6x8 with advance 10 and bearingY 8
@@ -59,9 +58,9 @@ describe('updateBitmapText', () => {
       const atlas = createGlyphAtlas({ fontFamily: 'unavailable', fontSize: 24, height: 256, width: 256 });
       const text = createBitmapText(createGlyphSourceFromGlyphAtlas(atlas), { text: 'Hi' });
       updateBitmapText(text);
-      const batches = getBitmapTextQuadBatches(text);
-      expect(batches.length).toBeGreaterThan(0);
-      expect(batches[0]!.data.instanceCount).toBe(2);
+      const pages = getBitmapTextPages(text);
+      expect(pages.length).toBeGreaterThan(0);
+      expect(pages[0]!.instanceCount).toBe(2);
     } finally {
       setGlyphRasterizerBackend(null);
     }
@@ -70,63 +69,63 @@ describe('updateBitmapText', () => {
   it('places each glyph at its cumulative advance, applying kerning', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AB' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.instanceCount).toBe(2);
-    expect(data.transforms[0]).toBe(0); // A.x
-    expect(data.transforms[1]).toBe(0); // A.y
-    expect(data.transforms[2]).toBe(8); // B.x = 10 (advance) - 2 (kerning)
-    expect(data.transforms[3]).toBe(0); // B.y
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.instanceCount).toBe(2);
+    expect(page.transforms[0]).toBe(0); // A.x
+    expect(page.transforms[1]).toBe(0); // A.y
+    expect(page.transforms[2]).toBe(8); // B.x = 10 (advance) - 2 (kerning)
+    expect(page.transforms[3]).toBe(0); // B.y
   });
 
   it('builds one atlas region per distinct glyph and references it by id', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AB' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.atlas!.regions).toHaveLength(2);
-    expect(data.ids[0]).toBe(0);
-    expect(data.ids[1]).toBe(1);
-    expect(data.atlas!.regions[0].x).toBe(0); // A rect
-    expect(data.atlas!.regions[1].x).toBe(6); // B rect
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.atlas.regions).toHaveLength(2);
+    expect(page.ids[0]).toBe(0);
+    expect(page.ids[1]).toBe(1);
+    expect(page.atlas.regions[0].x).toBe(0); // A rect
+    expect(page.atlas.regions[1].x).toBe(6); // B rect
   });
 
   it('reuses one region for repeated codepoints', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AA' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.instanceCount).toBe(2);
-    expect(data.atlas!.regions).toHaveLength(1);
-    expect(data.ids[0]).toBe(0);
-    expect(data.ids[1]).toBe(0);
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.instanceCount).toBe(2);
+    expect(page.atlas.regions).toHaveLength(1);
+    expect(page.ids[0]).toBe(0);
+    expect(page.ids[1]).toBe(0);
   });
 
   it('starts a new line at the metric line advance on an explicit newline', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'A\nB' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.instanceCount).toBe(2);
-    expect(data.transforms[0]).toBe(0); // line 0 A.x
-    expect(data.transforms[1]).toBe(0); // line 0 A.y
-    expect(data.transforms[2]).toBe(0); // line 1 B.x
-    expect(data.transforms[3]).toBe(10); // line 1 B.y = 1 * (8 + 2 + 0)
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.instanceCount).toBe(2);
+    expect(page.transforms[0]).toBe(0); // line 0 A.x
+    expect(page.transforms[1]).toBe(0); // line 0 A.y
+    expect(page.transforms[2]).toBe(0); // line 1 B.x
+    expect(page.transforms[3]).toBe(10); // line 1 B.y = 1 * (8 + 2 + 0)
   });
 
   it('scales the line advance by lineHeight', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'A\nB', lineHeight: 2 });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.transforms[3]).toBe(20); // 2 * (8 + 2 + 0)
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.transforms[3]).toBe(20); // 2 * (8 + 2 + 0)
   });
 
   it('word-wraps at a word boundary when the width is exceeded', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AA AA', wrapWidth: 30 });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.instanceCount).toBe(4);
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.instanceCount).toBe(4);
     let firstLine = 0;
     let secondLine = 0;
-    for (let i = 0; i < data.instanceCount; i++) {
-      if (data.transforms[i * 2 + 1] === 0) firstLine++;
-      else if (data.transforms[i * 2 + 1] === 10) secondLine++;
+    for (let i = 0; i < page.instanceCount; i++) {
+      if (page.transforms[i * 2 + 1] === 0) firstLine++;
+      else if (page.transforms[i * 2 + 1] === 10) secondLine++;
     }
     expect(firstLine).toBe(2);
     expect(secondLine).toBe(2);
@@ -135,62 +134,62 @@ describe('updateBitmapText', () => {
   it('keeps words on one line and honors space advance when no wrap is set', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AA AA' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.instanceCount).toBe(4);
-    for (let i = 0; i < data.instanceCount; i++) expect(data.transforms[i * 2 + 1]).toBe(0);
-    expect(data.transforms[4]).toBe(25); // third glyph: word1 width 20 + space 5
-    expect(data.transforms[6]).toBe(35);
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.instanceCount).toBe(4);
+    for (let i = 0; i < page.instanceCount; i++) expect(page.transforms[i * 2 + 1]).toBe(0);
+    expect(page.transforms[4]).toBe(25); // third glyph: word1 width 20 + space 5
+    expect(page.transforms[6]).toBe(35);
   });
 
   it('offsets a line for center alignment', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AB', wrapWidth: 100, align: 'center' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.transforms[0]).toBe(41); // (100 - 18) / 2
-    expect(data.transforms[2]).toBe(49); // 41 + 8
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.transforms[0]).toBe(41); // (100 - 18) / 2
+    expect(page.transforms[2]).toBe(49); // 41 + 8
   });
 
   it('offsets a line for right alignment', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AB', wrapWidth: 100, align: 'right' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.transforms[0]).toBe(82); // 100 - 18
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.transforms[0]).toBe(82); // 100 - 18
   });
 
   it('stretches inter-word gaps for justify on non-final lines', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AA AA AA', wrapWidth: 50, align: 'justify' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
+    const page = getBitmapTextPages(text)[0]!;
     // Line 0 = "AA AA" justified to 50: gap 5 grows by (50 - 45) / 1 = 5, so word 2 starts at 30.
-    expect(data.transforms[4]).toBe(30);
-    expect(data.transforms[6]).toBe(40);
+    expect(page.transforms[4]).toBe(30);
+    expect(page.transforms[6]).toBe(40);
     // Line 1 = trailing "AA" (paragraph end) stays left.
     const line1 = [];
-    for (let i = 0; i < data.instanceCount; i++)
-      if (data.transforms[i * 2 + 1] === 10) line1.push(data.transforms[i * 2]);
+    for (let i = 0; i < page.instanceCount; i++)
+      if (page.transforms[i * 2 + 1] === 10) line1.push(page.transforms[i * 2]);
     expect(line1).toEqual([0, 10]);
   });
 
   it('omits a missing glyph with no quad and no advance', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'A?B' });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.instanceCount).toBe(2);
-    expect(data.transforms[0]).toBe(0); // A
-    expect(data.transforms[2]).toBe(8); // B placed as if '?' were absent (10 - 2 kerning)
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.instanceCount).toBe(2);
+    expect(page.transforms[0]).toBe(0); // A
+    expect(page.transforms[2]).toBe(8); // B placed as if '?' were absent (10 - 2 kerning)
   });
 
   it('adds letterSpacing after each glyph advance', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: 'AB', letterSpacing: 1 });
     updateBitmapText(text);
-    const data = getBitmapTextQuadBatches(text)[0]!.data;
-    expect(data.transforms[2]).toBe(9); // 10 + 1 (spacing) - 2 (kerning)
+    const page = getBitmapTextPages(text)[0]!;
+    expect(page.transforms[2]).toBe(9); // 10 + 1 (spacing) - 2 (kerning)
   });
 
-  it('lays out an empty string as an empty batch without throwing', () => {
+  it('lays out an empty string as an empty page without throwing', () => {
     const text = createBitmapText(createTestGlyphSource(), { text: '' });
     expect(() => updateBitmapText(text)).not.toThrow();
-    expect(getBitmapTextQuadBatches(text)[0]!.data.instanceCount).toBe(0);
+    expect(getBitmapTextPages(text)[0]!.instanceCount).toBe(0);
     const bounds = getBitmapTextBounds(text);
     expect(bounds.width).toBe(0);
     expect(bounds.height).toBe(0);
@@ -206,47 +205,32 @@ describe('updateBitmapText', () => {
     expect(bounds.height).toBe(8);
   });
 
-  it('sets a whole-batch color-transform tint only for non-white colors', () => {
-    const text = createBitmapText(createTestGlyphSource(), { text: 'AB' });
-    updateBitmapText(text);
-    expect(getNode2DColorAdjustments(getBitmapTextQuadBatches(text)[0]!)).toBeNull();
-    setBitmapTextColor(text, 0xff0000ff);
-    updateBitmapText(text);
-    // One color-transform adjustment on the batch's runtime slot — a single whole-batch tint, not per-glyph.
-    const adjustments = getNode2DColorAdjustments(getBitmapTextQuadBatches(text)[0]!);
-    expect(adjustments).not.toBeNull();
-    expect(adjustments!).toHaveLength(1);
-    const colorTransform = (adjustments![0] as ColorTransformAdjustment).colorTransform;
-    expect(colorTransform.redMultiplier).toBe(1);
-    expect(colorTransform.greenMultiplier).toBe(0);
-  });
-
-  it('produces exactly one batch bound to the page-0 image for a single-page source', () => {
+  it('produces exactly one page bound to the page-0 image for a single-page source', () => {
     const source = createTestGlyphSource();
     const text = createBitmapText(source, { text: 'AB' });
     updateBitmapText(text);
-    const batches = getBitmapTextQuadBatches(text);
-    expect(batches).toHaveLength(1);
-    expect(batches[0].data.instanceCount).toBe(2);
-    expect(batches[0].data.atlas!.image).toBe(source.getGlyphAtlasImage(0));
+    const pages = getBitmapTextPages(text);
+    expect(pages).toHaveLength(1);
+    expect(pages[0].instanceCount).toBe(2);
+    expect(pages[0].atlas.texture?.storage.image).toBe(source.getGlyphAtlasImage(0));
   });
 
-  it('partitions glyphs into one QuadBatch per page, each bound to its own page image', () => {
+  it('partitions glyphs into one page per glyph-atlas page, each bound to its own page image', () => {
     const { source, page0Image, page1Image } = createTwoPageGlyphSource();
     const text = createBitmapText(source, { text: 'AB' });
     updateBitmapText(text);
-    const batches = getBitmapTextQuadBatches(text);
-    expect(batches).toHaveLength(2);
+    const pages = getBitmapTextPages(text);
+    expect(pages).toHaveLength(2);
 
     // Page 0 holds 'A' only, sampling page0Image; page 1 holds 'B' only, sampling page1Image.
-    const page0 = batches[0].data;
-    const page1 = batches[1].data;
+    const page0 = pages[0];
+    const page1 = pages[1];
     expect(page0.instanceCount).toBe(1);
     expect(page1.instanceCount).toBe(1);
-    expect(page0.atlas!.image).toBe(page0Image);
-    expect(page1.atlas!.image).toBe(page1Image);
-    expect(page0.atlas!.regions[0].x).toBe(0); // A's rect on page 0
-    expect(page1.atlas!.regions[0].x).toBe(3); // B's rect on page 1
+    expect(page0.atlas.texture?.storage.image).toBe(page0Image);
+    expect(page1.atlas.texture?.storage.image).toBe(page1Image);
+    expect(page0.atlas.regions[0].x).toBe(0); // A's rect on page 0
+    expect(page1.atlas.regions[0].x).toBe(3); // B's rect on page 1
     expect(page0.transforms[0]).toBe(0); // A at pen origin
     expect(page1.transforms[0]).toBe(10); // B after A's advance (no kerning)
   });