three-text 0.2.15 → 0.2.17

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * three-text v0.2.15
+ * three-text v0.2.17
  * Copyright (C) 2025 Countertype LLC
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -193,7 +193,7 @@ var FitnessClass;
     FitnessClass[FitnessClass["LOOSE"] = 2] = "LOOSE";
     FitnessClass[FitnessClass["VERY_LOOSE"] = 3] = "VERY_LOOSE";
 })(FitnessClass || (FitnessClass = {}));
-// ActiveNodeList maintains all currently viable breakpoints as we scan through the text.
+// ActiveNodeList maintains all currently viable breakpoints as we scan through the text
 // Each node represents a potential break with accumulated demerits (total "cost" from start)
 //
 // Demerits = cumulative penalty score from text start to this break, calculated as:
@@ -335,9 +335,9 @@ class LineBreak {
     // Converts text into items (boxes, glues, penalties) for line breaking
     // The measureText function should return widths that include any letter spacing
     static itemizeText(text, measureText, // function to measure text width
-    hyphenate = false, language = 'en-us', availablePatterns, lefthyphenmin = DEFAULT_LEFT_HYPHEN_MIN, righthyphenmin = DEFAULT_RIGHT_HYPHEN_MIN, context) {
+    measureTextWidths, hyphenate = false, language = 'en-us', availablePatterns, lefthyphenmin = DEFAULT_LEFT_HYPHEN_MIN, righthyphenmin = DEFAULT_RIGHT_HYPHEN_MIN, context) {
         const items = [];
-        items.push(...this.itemizeParagraph(text, measureText, hyphenate, language, availablePatterns, lefthyphenmin, righthyphenmin, context));
+        items.push(...this.itemizeParagraph(text, measureText, measureTextWidths, hyphenate, language, availablePatterns, lefthyphenmin, righthyphenmin, context));
         // Final glue and penalty to end the paragraph
         // Use infinite stretch to fill the last line
         items.push({
@@ -442,9 +442,10 @@ class LineBreak {
         return (this.isCJClosingPunctuation(char) || this.isCJOpeningPunctuation(char));
     }
     // CJK (Chinese/Japanese/Korean) character-level itemization with inter-character glue
-    static itemizeCJKText(text, measureText, context, startOffset = 0, glueParams) {
+    static itemizeCJKText(text, measureText, measureTextWidths, context, startOffset = 0, glueParams) {
         const items = [];
         const chars = Array.from(text);
+        const widths = measureTextWidths ? measureTextWidths(text) : null;
         let textPosition = startOffset;
         // Inter-character glue parameters
         let glueWidth;
@@ -465,7 +466,7 @@ class LineBreak {
             const char = chars[i];
             const nextChar = i < chars.length - 1 ? chars[i + 1] : null;
             if (/\s/.test(char)) {
-                const width = measureText(char);
+                const width = widths ? (widths[i] ?? measureText(char)) : measureText(char);
                 items.push({
                     type: ItemType.GLUE,
                     width,
@@ -479,7 +480,7 @@ class LineBreak {
             }
             items.push({
                 type: ItemType.BOX,
-                width: measureText(char),
+                width: widths ? (widths[i] ?? measureText(char)) : measureText(char),
                 text: char,
                 originIndex: textPosition
             });
@@ -510,15 +511,21 @@ class LineBreak {
         }
         return items;
     }
-    static itemizeParagraph(text, measureText, hyphenate, language, availablePatterns, lefthyphenmin, righthyphenmin, context) {
+    static itemizeParagraph(text, measureText, measureTextWidths, hyphenate, language, availablePatterns, lefthyphenmin, righthyphenmin, context) {
         const items = [];
         const chars = Array.from(text);
-        // Calculate CJK glue parameters once for consistency across all segments
-        const baseCharWidth = measureText('字');
-        const cjkGlueParams = {
-            width: 0,
-            stretch: baseCharWidth * 0.04,
-            shrink: baseCharWidth * 0.04
+        // Calculate CJK glue parameters lazily and once for consistency across all segments
+        let cjkGlueParams;
+        const getCjkGlueParams = () => {
+            if (!cjkGlueParams) {
+                const baseCharWidth = measureText('字');
+                cjkGlueParams = {
+                    width: 0,
+                    stretch: baseCharWidth * 0.04,
+                    shrink: baseCharWidth * 0.04
+                };
+            }
+            return cjkGlueParams;
         };
         let buffer = '';
         let bufferStart = 0;
@@ -528,7 +535,7 @@ class LineBreak {
             if (buffer.length === 0)
                 return;
             if (bufferScript === 'cjk') {
-                const cjkItems = this.itemizeCJKText(buffer, measureText, context, bufferStart, cjkGlueParams);
+                const cjkItems = this.itemizeCJKText(buffer, measureText, measureTextWidths, context, bufferStart, getCjkGlueParams());
                 items.push(...cjkItems);
             }
             else {
@@ -721,7 +728,7 @@ class LineBreak {
             align: options.align || 'left',
             hyphenate: options.hyphenate || false
         });
-        const { text, width, align = 'left', direction = 'ltr', hyphenate = false, language = 'en-us', respectExistingBreaks = true, measureText, hyphenationPatterns, unitsPerEm, letterSpacing = 0, tolerance = DEFAULT_TOLERANCE, pretolerance = DEFAULT_PRETOLERANCE, emergencyStretch = DEFAULT_EMERGENCY_STRETCH, autoEmergencyStretch, lefthyphenmin = DEFAULT_LEFT_HYPHEN_MIN, righthyphenmin = DEFAULT_RIGHT_HYPHEN_MIN, linepenalty = DEFAULT_LINE_PENALTY, adjdemerits = DEFAULT_FITNESS_DIFF_DEMERITS, hyphenpenalty = DEFAULT_HYPHEN_PENALTY, exhyphenpenalty = DEFAULT_EX_HYPHEN_PENALTY, doublehyphendemerits = DEFAULT_DOUBLE_HYPHEN_DEMERITS, looseness = 0, disableShortLineDetection = false, shortLineThreshold = SHORT_LINE_WIDTH_THRESHOLD } = options;
+        const { text, width, align = 'left', direction = 'ltr', hyphenate = false, language = 'en-us', respectExistingBreaks = true, measureText, measureTextWidths, hyphenationPatterns, unitsPerEm, letterSpacing = 0, tolerance = DEFAULT_TOLERANCE, pretolerance = DEFAULT_PRETOLERANCE, emergencyStretch = DEFAULT_EMERGENCY_STRETCH, autoEmergencyStretch, lefthyphenmin = DEFAULT_LEFT_HYPHEN_MIN, righthyphenmin = DEFAULT_RIGHT_HYPHEN_MIN, linepenalty = DEFAULT_LINE_PENALTY, adjdemerits = DEFAULT_FITNESS_DIFF_DEMERITS, hyphenpenalty = DEFAULT_HYPHEN_PENALTY, exhyphenpenalty = DEFAULT_EX_HYPHEN_PENALTY, doublehyphendemerits = DEFAULT_DOUBLE_HYPHEN_DEMERITS, looseness = 0, disableShortLineDetection = false, shortLineThreshold = SHORT_LINE_WIDTH_THRESHOLD } = options;
         // Handle multiple paragraphs by processing each independently
         if (respectExistingBreaks && text.includes('\n')) {
             const paragraphs = text.split('\n');
@@ -784,9 +791,9 @@ class LineBreak {
             exHyphenPenalty: exhyphenpenalty,
             currentAlign: align,
             unitsPerEm,
-            // measureText() includes trailing letter spacing after the final glyph of a token.
+            // measureText() includes trailing letter spacing after the final glyph of a token
             // Shaping applies letter spacing only between glyphs, so we subtract one
-            // trailing letterSpacingFU per line segment (see computeAdjustmentRatio/createLines).
+            // trailing letterSpacingFU per line segment (see computeAdjustmentRatio/createLines)
             letterSpacingFU: unitsPerEm ? letterSpacing * unitsPerEm : 0
         };
         if (!width || width === Infinity) {
@@ -805,7 +812,7 @@ class LineBreak {
             ];
         }
         // Itemize without hyphenation first (TeX approach: only compute if needed)
-        const allItems = LineBreak.itemizeText(text, measureText, false, language, hyphenationPatterns, lefthyphenmin, righthyphenmin, context);
+        const allItems = LineBreak.itemizeText(text, measureText, measureTextWidths, false, language, hyphenationPatterns, lefthyphenmin, righthyphenmin, context);
         if (allItems.length === 0) {
             return [];
         }
@@ -824,7 +831,7 @@ class LineBreak {
             let breaks = LineBreak.findBreakpoints(currentItems, width, pretolerance, looseness, false, 0, context);
             // Second pass: with hyphenation if first pass failed
             if (breaks.length === 0 && useHyphenation) {
-                const itemsWithHyphenation = LineBreak.itemizeText(text, measureText, true, language, hyphenationPatterns, lefthyphenmin, righthyphenmin, context);
+                const itemsWithHyphenation = LineBreak.itemizeText(text, measureText, measureTextWidths, true, language, hyphenationPatterns, lefthyphenmin, righthyphenmin, context);
                 currentItems = itemsWithHyphenation;
                 breaks = LineBreak.findBreakpoints(currentItems, width, tolerance, looseness, false, 0, context);
             }
@@ -1138,9 +1145,9 @@ class LineBreak {
                     ? items[lineEnd].width
                     : items[lineEnd].preBreakWidth;
         }
-        // Correct for trailing letter spacing at the end of the line segment.
+        // Correct for trailing letter spacing at the end of the line segment
         // Our token measurement includes letter spacing after the final glyph;
-        // shaping does not add letter spacing after the final glyph in a line.
+        // shaping does not add letter spacing after the final glyph in a line
         if (context?.letterSpacingFU && totalWidth !== 0) {
             totalWidth -= context.letterSpacingFU;
         }
@@ -1306,7 +1313,7 @@ class LineBreak {
                 }
             }
             const lineText = lineTextParts.join('');
-            // Correct for trailing letter spacing at the end of the line.
+            // Correct for trailing letter spacing at the end of the line
             if (context?.letterSpacingFU && naturalWidth !== 0) {
                 naturalWidth -= context.letterSpacingFU;
             }
@@ -1363,7 +1370,7 @@ class LineBreak {
                 finalNaturalWidth += item.width;
             }
             const finalLineText = finalLineTextParts.join('');
-            // Correct for trailing letter spacing at the end of the final line.
+            // Correct for trailing letter spacing at the end of the final line
             if (context?.letterSpacingFU && finalNaturalWidth !== 0) {
                 finalNaturalWidth -= context.letterSpacingFU;
             }
@@ -1400,12 +1407,21 @@ class LineBreak {
     }
 }
 
+// Memoize conversion per feature-object identity to avoid rebuilding the same
+// comma-separated string on every HarfBuzz shape call
+const featureStringCache = new WeakMap();
 // Convert feature objects to HarfBuzz comma-separated format
 function convertFontFeaturesToString(features) {
     if (!features || Object.keys(features).length === 0) {
         return undefined;
     }
+    const cached = featureStringCache.get(features);
+    if (cached !== undefined) {
+        return cached ?? undefined;
+    }
     const featureStrings = [];
+    // Preserve insertion order of the input object
+    // (The public API/tests expect this to be stable and predictable)
     for (const [tag, value] of Object.entries(features)) {
         if (!/^[a-zA-Z0-9]{4}$/.test(tag)) {
             logger.warn(`Invalid OpenType feature tag: "${tag}". Tags must be exactly 4 alphanumeric characters.`);
@@ -1424,10 +1440,63 @@ function convertFontFeaturesToString(features) {
             logger.warn(`Invalid value for feature "${tag}": ${value}. Expected boolean or positive number.`);
         }
     }
-    return featureStrings.length > 0 ? featureStrings.join(',') : undefined;
+    const result = featureStrings.length > 0 ? featureStrings.join(',') : undefined;
+    featureStringCache.set(features, result ?? null);
+    return result;
 }
 
 class TextMeasurer {
+    // Shape once and return per-codepoint widths aligned with Array.from(text)
+    // Groups glyph advances by HarfBuzz cluster (cl)
+    // Includes trailing per-glyph letter spacing like measureTextWidth
+    static measureTextWidths(loadedFont, text, letterSpacing = 0) {
+        const chars = Array.from(text);
+        if (chars.length === 0)
+            return [];
+        // HarfBuzz clusters are UTF-16 code unit indices
+        const startToCharIndex = new Map();
+        let codeUnitIndex = 0;
+        for (let i = 0; i < chars.length; i++) {
+            startToCharIndex.set(codeUnitIndex, i);
+            codeUnitIndex += chars[i].length;
+        }
+        const widths = new Array(chars.length).fill(0);
+        const buffer = loadedFont.hb.createBuffer();
+        try {
+            buffer.addText(text);
+            buffer.guessSegmentProperties();
+            const featuresString = convertFontFeaturesToString(loadedFont.fontFeatures);
+            loadedFont.hb.shape(loadedFont.font, buffer, featuresString);
+            const glyphInfos = buffer.json(loadedFont.font);
+            const letterSpacingInFontUnits = letterSpacing * loadedFont.upem;
+            for (let i = 0; i < glyphInfos.length; i++) {
+                const glyph = glyphInfos[i];
+                const cl = glyph.cl ?? 0;
+                let charIndex = startToCharIndex.get(cl);
+                // Fallback if cl lands mid-codepoint
+                if (charIndex === undefined) {
+                    // Find the closest start <= cl
+                    for (let back = cl; back >= 0; back--) {
+                        const candidate = startToCharIndex.get(back);
+                        if (candidate !== undefined) {
+                            charIndex = candidate;
+                            break;
+                        }
+                    }
+                }
+                if (charIndex === undefined)
+                    continue;
+                widths[charIndex] += glyph.ax;
+                if (letterSpacingInFontUnits !== 0) {
+                    widths[charIndex] += letterSpacingInFontUnits;
+                }
+            }
+            return widths;
+        }
+        finally {
+            buffer.destroy();
+        }
+    }
     static measureTextWidth(loadedFont, text, letterSpacing = 0) {
         const buffer = loadedFont.hb.createBuffer();
         buffer.addText(text);
@@ -1484,7 +1553,8 @@ class TextLayout {
                 unitsPerEm: this.loadedFont.upem,
                 letterSpacing,
                 measureText: (textToMeasure) => TextMeasurer.measureTextWidth(this.loadedFont, textToMeasure, letterSpacing // Letter spacing included in width measurements
-                )
+                ),
+                measureTextWidths: (textToMeasure) => TextMeasurer.measureTextWidths(this.loadedFont, textToMeasure, letterSpacing)
             });
         }
         else {
@@ -1506,6 +1576,15 @@ class TextLayout {
         return { lines };
     }
     applyAlignment(vertices, options) {
+        const { offset, adjustedBounds } = this.computeAlignmentOffset(options);
+        if (offset !== 0) {
+            for (let i = 0; i < vertices.length; i += 3) {
+                vertices[i] += offset;
+            }
+        }
+        return { offset, adjustedBounds };
+    }
+    computeAlignmentOffset(options) {
         const { width, align, planeBounds } = options;
         let offset = 0;
         const adjustedBounds = {
@@ -1517,17 +1596,13 @@ class TextLayout {
             if (align === 'center') {
                 offset = (width - lineWidth) / 2 - planeBounds.min.x;
             }
-            else if (align === 'right') {
+            else {
                 offset = width - planeBounds.max.x;
             }
-            if (offset !== 0) {
-                // Translate vertices
-                for (let i = 0; i < vertices.length; i += 3) {
-                    vertices[i] += offset;
-                }
-                adjustedBounds.min.x += offset;
-                adjustedBounds.max.x += offset;
-            }
+        }
+        if (offset !== 0) {
+            adjustedBounds.min.x += offset;
+            adjustedBounds.max.x += offset;
         }
         return { offset, adjustedBounds };
     }
@@ -2622,7 +2697,7 @@ var n;function t(a,b){return a.b===b.b&&a.a===b.a}function u(a,b){return a.b<b.b
 var libtess_minExports = libtess_min.exports;
 
 class Tessellator {
-    process(paths, removeOverlaps = true, isCFF = false) {
+    process(paths, removeOverlaps = true, isCFF = false, needsExtrusionContours = true) {
         if (paths.length === 0) {
             return { triangles: { vertices: [], indices: [] }, contours: [] };
         }
@@ -2631,66 +2706,124 @@ class Tessellator {
             return { triangles: { vertices: [], indices: [] }, contours: [] };
         }
         logger.log(`Tessellator: removeOverlaps=${removeOverlaps}, processing ${valid.length} paths`);
-        return this.tessellate(valid, removeOverlaps, isCFF);
-    }
-    tessellate(paths, removeOverlaps, isCFF) {
-        // TTF fonts have opposite winding from tessellator expectations
-        const normalizedPaths = !isCFF && !removeOverlaps
-            ? paths.map((p) => this.reverseWinding(p))
-            : paths;
-        let contours = this.pathsToContours(normalizedPaths);
+        return this.tessellate(valid, removeOverlaps, isCFF, needsExtrusionContours);
+    }
+    tessellate(paths, removeOverlaps, isCFF, needsExtrusionContours) {
+        // libtess expects CCW winding; TTF outer contours are CW
+        const needsWindingReversal = !isCFF && !removeOverlaps;
+        let originalContours;
+        let tessContours;
+        if (needsWindingReversal) {
+            tessContours = this.pathsToContours(paths, true);
+            if (removeOverlaps || needsExtrusionContours) {
+                originalContours = this.pathsToContours(paths);
+            }
+        }
+        else {
+            originalContours = this.pathsToContours(paths);
+            tessContours = originalContours;
+        }
+        let extrusionContours = needsExtrusionContours
+            ? originalContours ?? this.pathsToContours(paths)
+            : [];
         if (removeOverlaps) {
             logger.log('Two-pass: boundary extraction then triangulation');
-            // Extract boundaries to remove overlaps
             perfLogger.start('Tessellator.boundaryPass', {
-                contourCount: contours.length
+                contourCount: tessContours.length
             });
-            const boundaryResult = this.performTessellation(contours, 'boundary');
+            const boundaryResult = this.performTessellation(originalContours, 'boundary');
             perfLogger.end('Tessellator.boundaryPass');
             if (!boundaryResult) {
                 logger.warn('libtess returned empty result from boundary pass');
                 return { triangles: { vertices: [], indices: [] }, contours: [] };
             }
-            // Convert boundary elements back to contours
-            contours = this.boundaryToContours(boundaryResult);
-            logger.log(`Boundary pass created ${contours.length} contours. Starting triangulation pass.`);
+            // Boundary pass normalizes winding (outer CCW, holes CW)
+            tessContours = this.boundaryToContours(boundaryResult);
+            if (needsExtrusionContours) {
+                extrusionContours = tessContours;
+            }
+            logger.log(`Boundary pass created ${tessContours.length} contours. Starting triangulation pass.`);
         }
         else {
             logger.log(`Single-pass triangulation for ${isCFF ? 'CFF' : 'TTF'}`);
+            // TTF contours may have inconsistent winding; check if we need normalization
+            if (needsExtrusionContours && !isCFF) {
+                const needsNormalization = this.needsWindingNormalization(extrusionContours);
+                if (needsNormalization) {
+                    logger.log('Complex topology detected, running boundary pass for winding normalization');
+                    perfLogger.start('Tessellator.windingNormalization', {
+                        contourCount: extrusionContours.length
+                    });
+                    const boundaryResult = this.performTessellation(extrusionContours, 'boundary');
+                    perfLogger.end('Tessellator.windingNormalization');
+                    if (boundaryResult) {
+                        extrusionContours = this.boundaryToContours(boundaryResult);
+                    }
+                }
+                else {
+                    logger.log('Simple topology, skipping winding normalization');
+                }
+            }
         }
-        // Triangulate the contours
         perfLogger.start('Tessellator.triangulationPass', {
-            contourCount: contours.length
+            contourCount: tessContours.length
         });
-        const triangleResult = this.performTessellation(contours, 'triangles');
+        const triangleResult = this.performTessellation(tessContours, 'triangles');
         perfLogger.end('Tessellator.triangulationPass');
         if (!triangleResult) {
             const warning = removeOverlaps
                 ? 'libtess returned empty result from triangulation pass'
                 : 'libtess returned empty result from single-pass triangulation';
             logger.warn(warning);
-            return { triangles: { vertices: [], indices: [] }, contours };
+            return { triangles: { vertices: [], indices: [] }, contours: extrusionContours };
         }
         return {
             triangles: {
                 vertices: triangleResult.vertices,
                 indices: triangleResult.indices || []
             },
-            contours
+            contours: extrusionContours
         };
     }
-    pathsToContours(paths) {
-        return paths.map((path) => {
-            const contour = [];
-            for (const point of path.points) {
-                contour.push(point.x, point.y);
+    pathsToContours(paths, reversePoints = false) {
+        const contours = new Array(paths.length);
+        for (let p = 0; p < paths.length; p++) {
+            const points = paths[p].points;
+            const pointCount = points.length;
+            // Clipper-style paths can be explicitly closed by repeating the first point at the end
+            // Normalize to a single closing vertex for stable side wall generation
+            const isClosed = pointCount > 1 &&
+                points[0].x === points[pointCount - 1].x &&
+                points[0].y === points[pointCount - 1].y;
+            const end = isClosed ? pointCount - 1 : pointCount;
+            // +1 to append a closing vertex
+            const contour = new Array((end + 1) * 2);
+            let i = 0;
+            if (reversePoints) {
+                for (let k = end - 1; k >= 0; k--) {
+                    const pt = points[k];
+                    contour[i++] = pt.x;
+                    contour[i++] = pt.y;
+                }
             }
-            return contour;
-        });
+            else {
+                for (let k = 0; k < end; k++) {
+                    const pt = points[k];
+                    contour[i++] = pt.x;
+                    contour[i++] = pt.y;
+                }
+            }
+            // Some glyphs omit closePath, leaving gaps in extruded side walls
+            if (i >= 2) {
+                contour[i++] = contour[0];
+                contour[i++] = contour[1];
+            }
+            contours[p] = contour;
+        }
+        return contours;
     }
     performTessellation(contours, mode) {
         const tess = new libtess_minExports.GluTesselator();
-        // Set winding rule to NON-ZERO
         tess.gluTessProperty(libtess_minExports.gluEnum.GLU_TESS_WINDING_RULE, libtess_minExports.windingRule.GLU_TESS_WINDING_NONZERO);
         const vertices = [];
         const indices = [];
@@ -2713,7 +2846,7 @@ class Tessellator {
             });
             tess.gluTessCallback(libtess_minExports.gluEnum.GLU_TESS_END, () => {
                 if (currentContour.length > 0) {
-                    contourIndices.push([...currentContour]);
+                    contourIndices.push(currentContour);
                 }
             });
         }
@@ -2758,7 +2891,6 @@ class Tessellator {
                 const vertIdx = idx * 2;
                 contour.push(boundaryResult.vertices[vertIdx], boundaryResult.vertices[vertIdx + 1]);
             }
-            // Ensure contour is closed for side wall generation
             if (contour.length > 2) {
                 if (contour[0] !== contour[contour.length - 2] ||
                     contour[1] !== contour[contour.length - 1]) {
@@ -2769,11 +2901,45 @@ class Tessellator {
         }
         return contours;
     }
-    reverseWinding(path) {
-        return {
-            ...path,
-            points: [...path.points].reverse()
-        };
+    // Check if contours need winding normalization via boundary pass
+    // Returns false if topology is simple enough to skip the expensive pass
+    needsWindingNormalization(contours) {
+        if (contours.length === 0)
+            return false;
+        // Heuristic 1: Single contour never needs normalization
+        if (contours.length === 1)
+            return false;
+        // Heuristic 2: All same winding = all outers, no holes
+        // Compute signed areas
+        let firstSign = null;
+        for (const contour of contours) {
+            const area = this.signedArea(contour);
+            const sign = area >= 0 ? 1 : -1;
+            if (firstSign === null) {
+                firstSign = sign;
+            }
+            else if (sign !== firstSign) {
+                // Mixed winding detected → might have holes or complex topology
+                return true;
+            }
+        }
+        // All same winding → simple topology, no normalization needed
+        return false;
+    }
+    // Compute signed area (CCW = positive, CW = negative)
+    signedArea(contour) {
+        let area = 0;
+        const len = contour.length;
+        if (len < 6)
+            return 0; // Need at least 3 points
+        for (let i = 0; i < len; i += 2) {
+            const x1 = contour[i];
+            const y1 = contour[i + 1];
+            const x2 = contour[(i + 2) % len];
+            const y2 = contour[(i + 3) % len];
+            area += x1 * y2 - x2 * y1;
+        }
+        return area / 2;
     }
 }
 
@@ -2783,12 +2949,11 @@ class Extruder {
         const points = geometry.triangles.vertices;
         const triangleIndices = geometry.triangles.indices;
         const numPoints = points.length / 2;
-        // Count side-wall segments (each segment emits 4 vertices + 6 indices)
+        // Count side-wall segments (4 vertices + 6 indices per segment)
         let sideSegments = 0;
         if (depth !== 0) {
             for (const contour of geometry.contours) {
-                // Each contour is a flat [x0,y0,x1,y1,...] array; side walls connect consecutive points
-                // Contours are expected to be closed (last point repeats first), so segments = (nPoints - 1)
+                // Contours are closed (last point repeats first)
                 const contourPoints = contour.length / 2;
                 if (contourPoints >= 2)
                     sideSegments += contourPoints - 1;
@@ -2804,7 +2969,7 @@ class Extruder {
             : triangleIndices.length * 2 + sideSegments * 6;
         const indices = new Uint32Array(indexCount);
         if (depth === 0) {
-            // Flat faces only
+            // Single-sided flat geometry at z=0
             let vPos = 0;
             for (let i = 0; i < points.length; i += 2) {
                 vertices[vPos] = points[i];
@@ -2815,42 +2980,44 @@ class Extruder {
                 normals[vPos + 2] = 1;
                 vPos += 3;
             }
+            // libtess outputs CCW, use as-is for +Z facing geometry
             for (let i = 0; i < triangleIndices.length; i++) {
                 indices[i] = triangleIndices[i];
             }
             return { vertices, normals, indices };
         }
-        // Front/back faces
+        // Extruded geometry: front at z=0, back at z=depth
         const minBackOffset = unitsPerEm * 0.000025;
         const backZ = depth <= minBackOffset ? minBackOffset : depth;
-        // Fill front vertices/normals (0..numPoints-1)
-        for (let p = 0, vi = 0; p < points.length; p += 2, vi++) {
-            const base = vi * 3;
-            vertices[base] = points[p];
-            vertices[base + 1] = points[p + 1];
-            vertices[base + 2] = 0;
-            normals[base] = 0;
-            normals[base + 1] = 0;
-            normals[base + 2] = 1;
-        }
-        // Fill back vertices/normals (numPoints..2*numPoints-1)
+        // Generate both caps in one pass
         for (let p = 0, vi = 0; p < points.length; p += 2, vi++) {
-            const base = (numPoints + vi) * 3;
-            vertices[base] = points[p];
-            vertices[base + 1] = points[p + 1];
-            vertices[base + 2] = backZ;
-            normals[base] = 0;
-            normals[base + 1] = 0;
-            normals[base + 2] = -1;
-        }
-        // Front indices
+            const x = points[p];
+            const y = points[p + 1];
+            // Cap at z=0
+            const base0 = vi * 3;
+            vertices[base0] = x;
+            vertices[base0 + 1] = y;
+            vertices[base0 + 2] = 0;
+            normals[base0] = 0;
+            normals[base0 + 1] = 0;
+            normals[base0 + 2] = -1;
+            // Cap at z=depth
+            const baseD = (numPoints + vi) * 3;
+            vertices[baseD] = x;
+            vertices[baseD + 1] = y;
+            vertices[baseD + 2] = backZ;
+            normals[baseD] = 0;
+            normals[baseD + 1] = 0;
+            normals[baseD + 2] = 1;
+        }
+        // libtess outputs CCW triangles (viewed from +Z)
+        // Z=0 cap faces -Z, reverse winding
         for (let i = 0; i < triangleIndices.length; i++) {
-            indices[i] = triangleIndices[i];
+            indices[i] = triangleIndices[triangleIndices.length - 1 - i];
         }
-        // Back indices (reverse winding + offset)
+        // Z=depth cap faces +Z, use original winding
         for (let i = 0; i < triangleIndices.length; i++) {
-            indices[triangleIndices.length + i] =
-                triangleIndices[triangleIndices.length - 1 - i] + numPoints;
+            indices[triangleIndices.length + i] = triangleIndices[i] + numPoints;
         }
         // Side walls
         let nextVertex = numPoints * 2;
@@ -2861,7 +3028,7 @@ class Extruder {
                 const p0y = contour[i + 1];
                 const p1x = contour[i + 2];
                 const p1y = contour[i + 3];
-                // Unit normal for the wall quad (per-edge)
+                // Perpendicular normal for this wall segment
                 const ex = p1x - p0x;
                 const ey = p1y - p0y;
                 const lenSq = ex * ex + ey * ey;
@@ -2874,7 +3041,7 @@ class Extruder {
                 }
                 const baseVertex = nextVertex;
                 const base = baseVertex * 3;
-                // 4 vertices (two at z=0, two at z=depth)
+                // Wall quad: front edge at z=0, back edge at z=depth
                 vertices[base] = p0x;
                 vertices[base + 1] = p0y;
                 vertices[base + 2] = 0;
@@ -2887,7 +3054,7 @@ class Extruder {
                 vertices[base + 9] = p1x;
                 vertices[base + 10] = p1y;
                 vertices[base + 11] = backZ;
-                // Normals (same for all 4 wall vertices)
+                // Wall normals point perpendicular to edge
                 normals[base] = nx;
                 normals[base + 1] = ny;
                 normals[base + 2] = 0;
@@ -2900,7 +3067,7 @@ class Extruder {
                 normals[base + 9] = nx;
                 normals[base + 10] = ny;
                 normals[base + 11] = 0;
-                // Indices (two triangles)
+                // Two triangles per wall segment
                 indices[idxPos++] = baseVertex;
                 indices[idxPos++] = baseVertex + 1;
                 indices[idxPos++] = baseVertex + 2;
@@ -3135,21 +3302,23 @@ class PathOptimizer {
             return path;
         }
         this.stats.originalPointCount += path.points.length;
-        let points = [...path.points];
+        // Most paths are already immutable after collection; avoid copying large point arrays
+        // The optimizers below never mutate the input `points` array
+        const points = path.points;
         if (points.length < 5) {
             return path;
         }
-        points = this.simplifyPathVW(points, this.config.areaThreshold);
-        if (points.length < 3) {
+        let optimized = this.simplifyPathVW(points, this.config.areaThreshold);
+        if (optimized.length < 3) {
             return path;
         }
-        points = this.removeColinearPoints(points, this.config.colinearThreshold);
-        if (points.length < 3) {
+        optimized = this.removeColinearPoints(optimized, this.config.colinearThreshold);
+        if (optimized.length < 3) {
             return path;
         }
         return {
             ...path,
-            points
+            points: optimized
         };
     }
     // Visvalingam-Whyatt algorithm
@@ -3603,7 +3772,7 @@ class GlyphContourCollector {
         if (this.currentGlyphPaths.length > 0) {
             this.collectedGlyphs.push({
                 glyphId: this.currentGlyphId,
-                paths: [...this.currentGlyphPaths],
+                paths: this.currentGlyphPaths,
                 bounds: {
                     min: {
                         x: this.currentGlyphBounds.min.x,
@@ -3655,11 +3824,10 @@ class GlyphContourCollector {
             return;
         }
         const flattenedPoints = this.polygonizer.polygonizeQuadratic(start, control, end);
-        for (const point of flattenedPoints) {
-            this.updateBounds(point);
-        }
         for (let i = 0; i < flattenedPoints.length; i++) {
-            this.currentPath.points.push(flattenedPoints[i]);
+            const pt = flattenedPoints[i];
+            this.updateBounds(pt);
+            this.currentPath.points.push(pt);
         }
         this.currentPoint = end;
     }
@@ -3679,11 +3847,10 @@ class GlyphContourCollector {
             return;
         }
         const flattenedPoints = this.polygonizer.polygonizeCubic(start, control1, control2, end);
-        for (const point of flattenedPoints) {
-            this.updateBounds(point);
-        }
         for (let i = 0; i < flattenedPoints.length; i++) {
-            this.currentPath.points.push(flattenedPoints[i]);
+            const pt = flattenedPoints[i];
+            this.updateBounds(pt);
+            this.currentPath.points.push(pt);
         }
         this.currentPoint = end;
     }
@@ -3873,6 +4040,7 @@ class GlyphGeometryBuilder {
     constructor(cache, loadedFont) {
         this.fontId = 'default';
         this.cacheKeyPrefix = 'default';
+        this.emptyGlyphs = new Set();
         this.cache = cache;
         this.loadedFont = loadedFont;
         this.tessellator = new Tessellator();
@@ -3926,63 +4094,34 @@ class GlyphGeometryBuilder {
     }
     // Build instanced geometry from glyph contours
     buildInstancedGeometry(clustersByLine, depth, removeOverlaps, isCFF, separateGlyphs = false, coloredTextIndices) {
-        perfLogger.start('GlyphGeometryBuilder.buildInstancedGeometry', {
-            lineCount: clustersByLine.length,
-            wordCount: clustersByLine.flat().length,
-            depth,
-            removeOverlaps
-        });
-        // Growable typed arrays; slice to final size at end
-        let vertexBuffer = new Float32Array(1024);
-        let normalBuffer = new Float32Array(1024);
-        let indexBuffer = new Uint32Array(1024);
-        let vertexPos = 0; // float index (multiple of 3)
-        let normalPos = 0; // float index (multiple of 3)
-        let indexPos = 0; // index count
-        const ensureFloatCapacity = (buffer, needed) => {
-            if (needed <= buffer.length)
-                return buffer;
-            let nextSize = buffer.length;
-            while (nextSize < needed)
-                nextSize *= 2;
-            const next = new Float32Array(nextSize);
-            next.set(buffer);
-            return next;
-        };
-        const ensureIndexCapacity = (buffer, needed) => {
-            if (needed <= buffer.length)
-                return buffer;
-            let nextSize = buffer.length;
-            while (nextSize < needed)
-                nextSize *= 2;
-            const next = new Uint32Array(nextSize);
-            next.set(buffer);
-            return next;
-        };
-        const appendGeometryToBuffers = (data, position, vertexOffset) => {
-            const v = data.vertices;
-            const n = data.normals;
-            const idx = data.indices;
-            // Grow buffers as needed
-            vertexBuffer = ensureFloatCapacity(vertexBuffer, vertexPos + v.length);
-            normalBuffer = ensureFloatCapacity(normalBuffer, normalPos + n.length);
-            indexBuffer = ensureIndexCapacity(indexBuffer, indexPos + idx.length);
-            // Vertices: translate by position
-            const px = position.x;
-            const py = position.y;
-            const pz = position.z;
-            for (let j = 0; j < v.length; j += 3) {
-                vertexBuffer[vertexPos++] = v[j] + px;
-                vertexBuffer[vertexPos++] = v[j + 1] + py;
-                vertexBuffer[vertexPos++] = v[j + 2] + pz;
-            }
-            // Normals: straight copy
-            normalBuffer.set(n, normalPos);
-            normalPos += n.length;
-            // Indices: copy with vertex offset
-            for (let j = 0; j < idx.length; j++) {
-                indexBuffer[indexPos++] = idx[j] + vertexOffset;
-            }
+        if (isLogEnabled) {
+            let wordCount = 0;
+            for (let i = 0; i < clustersByLine.length; i++) {
+                wordCount += clustersByLine[i].length;
+            }
+            perfLogger.start('GlyphGeometryBuilder.buildInstancedGeometry', {
+                lineCount: clustersByLine.length,
+                wordCount,
+                depth,
+                removeOverlaps
+            });
+        }
+        else {
+            perfLogger.start('GlyphGeometryBuilder.buildInstancedGeometry');
+        }
+        const tasks = [];
+        let totalVertexFloats = 0;
+        let totalNormalFloats = 0;
+        let totalIndexCount = 0;
+        let vertexCursor = 0; // vertex offset (not float offset)
+        const pushTask = (data, px, py, pz) => {
+            const vertexStart = vertexCursor;
+            tasks.push({ data, px, py, pz, vertexStart });
+            totalVertexFloats += data.vertices.length;
+            totalNormalFloats += data.normals.length;
+            totalIndexCount += data.indices.length;
+            vertexCursor += data.vertices.length / 3;
+            return vertexStart;
         };
         const glyphInfos = [];
         const planeBounds = {
@@ -3992,6 +4131,9 @@ class GlyphGeometryBuilder {
         for (let lineIndex = 0; lineIndex < clustersByLine.length; lineIndex++) {
             const line = clustersByLine[lineIndex];
             for (const cluster of line) {
+                const clusterX = cluster.position.x;
+                const clusterY = cluster.position.y;
+                const clusterZ = cluster.position.z;
                 const clusterGlyphContours = [];
                 for (const glyph of cluster.glyphs) {
                     clusterGlyphContours.push(this.getContoursForGlyph(glyph.g));
@@ -4032,7 +4174,7 @@ class GlyphGeometryBuilder {
                 // Use glyph-level caching when separateGlyphs is set or when cluster contains colored text
                 const forceSeparate = separateGlyphs || clusterHasColoredGlyphs;
                 // Iterate over the geometric groups identified by BoundaryClusterer
-                // logical groups (words) are now split into geometric sub-groups (e.g. "aa", "XX", "bb")
+                // logical groups (words) split into geometric sub-groups (e.g. "aa", "XX", "bb")
                 for (const groupIndices of boundaryGroups) {
                     const isOverlappingGroup = groupIndices.length > 1;
                     const shouldCluster = isOverlappingGroup && !forceSeparate;
@@ -4064,16 +4206,19 @@ class GlyphGeometryBuilder {
                         // Calculate the absolute position of this sub-cluster based on its first glyph
                         // (since the cached geometry is relative to that first glyph)
                         const firstGlyphInGroup = subClusterGlyphs[0];
-                        const groupPosition = new Vec3(cluster.position.x + (firstGlyphInGroup.x ?? 0), cluster.position.y + (firstGlyphInGroup.y ?? 0), cluster.position.z);
-                        const vertexOffset = vertexPos / 3;
-                        appendGeometryToBuffers(cachedCluster, groupPosition, vertexOffset);
+                        const groupPosX = clusterX + (firstGlyphInGroup.x ?? 0);
+                        const groupPosY = clusterY + (firstGlyphInGroup.y ?? 0);
+                        const groupPosZ = clusterZ;
+                        const vertexStart = pushTask(cachedCluster, groupPosX, groupPosY, groupPosZ);
                         const clusterVertexCount = cachedCluster.vertices.length / 3;
                         for (let i = 0; i < groupIndices.length; i++) {
                             const originalIndex = groupIndices[i];
                             const glyph = cluster.glyphs[originalIndex];
                             const glyphContours = clusterGlyphContours[originalIndex];
-                            const absoluteGlyphPosition = new Vec3(cluster.position.x + (glyph.x ?? 0), cluster.position.y + (glyph.y ?? 0), cluster.position.z);
-                            const glyphInfo = this.createGlyphInfo(glyph, vertexOffset, clusterVertexCount, absoluteGlyphPosition, glyphContours, depth);
+                            const glyphPosX = clusterX + (glyph.x ?? 0);
+                            const glyphPosY = clusterY + (glyph.y ?? 0);
+                            const glyphPosZ = clusterZ;
+                            const glyphInfo = this.createGlyphInfo(glyph, vertexStart, clusterVertexCount, glyphPosX, glyphPosY, glyphPosZ, glyphContours, depth);
                             glyphInfos.push(glyphInfo);
                             this.updatePlaneBounds(glyphInfo.bounds, planeBounds);
                         }
@@ -4083,24 +4228,26 @@ class GlyphGeometryBuilder {
                         for (const i of groupIndices) {
                             const glyph = cluster.glyphs[i];
                             const glyphContours = clusterGlyphContours[i];
-                            const glyphPosition = new Vec3(cluster.position.x + (glyph.x ?? 0), cluster.position.y + (glyph.y ?? 0), cluster.position.z);
+                            const glyphPosX = clusterX + (glyph.x ?? 0);
+                            const glyphPosY = clusterY + (glyph.y ?? 0);
+                            const glyphPosZ = clusterZ;
                             // Skip glyphs with no paths (spaces, zero-width characters, etc.)
                             if (glyphContours.paths.length === 0) {
-                                const glyphInfo = this.createGlyphInfo(glyph, 0, 0, glyphPosition, glyphContours, depth);
+                                const glyphInfo = this.createGlyphInfo(glyph, 0, 0, glyphPosX, glyphPosY, glyphPosZ, glyphContours, depth);
                                 glyphInfos.push(glyphInfo);
                                 continue;
                             }
-                            let cachedGlyph = this.cache.get(getGlyphCacheKey(this.cacheKeyPrefix, glyph.g, depth, removeOverlaps));
+                            const glyphCacheKey = getGlyphCacheKey(this.cacheKeyPrefix, glyph.g, depth, removeOverlaps);
+                            let cachedGlyph = this.cache.get(glyphCacheKey);
                             if (!cachedGlyph) {
                                 cachedGlyph = this.tessellateGlyph(glyphContours, depth, removeOverlaps, isCFF);
-                                this.cache.set(getGlyphCacheKey(this.cacheKeyPrefix, glyph.g, depth, removeOverlaps), cachedGlyph);
+                                this.cache.set(glyphCacheKey, cachedGlyph);
                             }
                             else {
                                 cachedGlyph.useCount++;
                             }
-                            const vertexOffset = vertexPos / 3;
-                            appendGeometryToBuffers(cachedGlyph, glyphPosition, vertexOffset);
-                            const glyphInfo = this.createGlyphInfo(glyph, vertexOffset, cachedGlyph.vertices.length / 3, glyphPosition, glyphContours, depth);
+                            const vertexStart = pushTask(cachedGlyph, glyphPosX, glyphPosY, glyphPosZ);
+                            const glyphInfo = this.createGlyphInfo(glyph, vertexStart, cachedGlyph.vertices.length / 3, glyphPosX, glyphPosY, glyphPosZ, glyphContours, depth);
                             glyphInfos.push(glyphInfo);
                             this.updatePlaneBounds(glyphInfo.bounds, planeBounds);
                         }
@@ -4108,10 +4255,33 @@ class GlyphGeometryBuilder {
                 }
             }
         }
-        // Slice to used lengths (avoid returning oversized buffers)
-        const vertexArray = vertexBuffer.slice(0, vertexPos);
-        const normalArray = normalBuffer.slice(0, normalPos);
-        const indexArray = indexBuffer.slice(0, indexPos);
+        // Allocate exact-sized buffers and fill once
+        const vertexArray = new Float32Array(totalVertexFloats);
+        const normalArray = new Float32Array(totalNormalFloats);
+        const indexArray = new Uint32Array(totalIndexCount);
+        let vertexPos = 0; // float index (multiple of 3)
+        let normalPos = 0; // float index (multiple of 3)
+        let indexPos = 0; // index count
+        for (let t = 0; t < tasks.length; t++) {
+            const task = tasks[t];
+            const v = task.data.vertices;
+            const n = task.data.normals;
+            const idx = task.data.indices;
+            const px = task.px;
+            const py = task.py;
+            const pz = task.pz;
+            for (let j = 0; j < v.length; j += 3) {
+                vertexArray[vertexPos++] = v[j] + px;
+                vertexArray[vertexPos++] = v[j + 1] + py;
+                vertexArray[vertexPos++] = v[j + 2] + pz;
+            }
+            normalArray.set(n, normalPos);
+            normalPos += n.length;
+            const vertexStart = task.vertexStart;
+            for (let j = 0; j < idx.length; j++) {
+                indexArray[indexPos++] = idx[j] + vertexStart;
+            }
+        }
         perfLogger.end('GlyphGeometryBuilder.buildInstancedGeometry');
         return {
             vertices: vertexArray,
@@ -4136,7 +4306,7 @@ class GlyphGeometryBuilder {
         const roundedDepth = Math.round(depth * 1000) / 1000;
         return `${this.cacheKeyPrefix}_${ids}_${roundedDepth}_${removeOverlaps}`;
     }
-    createGlyphInfo(glyph, vertexStart, vertexCount, position, contours, depth) {
+    createGlyphInfo(glyph, vertexStart, vertexCount, positionX, positionY, positionZ, contours, depth) {
         return {
             textIndex: glyph.absoluteTextIndex,
             lineIndex: glyph.lineIndex,
@@ -4144,19 +4314,30 @@ class GlyphGeometryBuilder {
             vertexCount,
             bounds: {
                 min: {
-                    x: contours.bounds.min.x + position.x,
-                    y: contours.bounds.min.y + position.y,
-                    z: position.z
+                    x: contours.bounds.min.x + positionX,
+                    y: contours.bounds.min.y + positionY,
+                    z: positionZ
                 },
                 max: {
-                    x: contours.bounds.max.x + position.x,
-                    y: contours.bounds.max.y + position.y,
-                    z: position.z + depth
+                    x: contours.bounds.max.x + positionX,
+                    y: contours.bounds.max.y + positionY,
+                    z: positionZ + depth
                 }
             }
         };
     }
     getContoursForGlyph(glyphId) {
+        // Fast path: skip HarfBuzz draw for known-empty glyphs (spaces, zero-width, etc)
+        if (this.emptyGlyphs.has(glyphId)) {
+            return {
+                glyphId,
+                paths: [],
+                bounds: {
+                    min: { x: 0, y: 0 },
+                    max: { x: 0, y: 0 }
+                }
+            };
+        }
         const key = `${this.cacheKeyPrefix}_${glyphId}`;
         const cached = this.contourCache.get(key);
         if (cached) {
@@ -4177,11 +4358,15 @@ class GlyphGeometryBuilder {
                 max: { x: 0, y: 0 }
             }
         };
+        // Mark glyph as empty for future fast-path
+        if (contours.paths.length === 0) {
+            this.emptyGlyphs.add(glyphId);
+        }
         this.contourCache.set(key, contours);
         return contours;
     }
     tessellateGlyphCluster(paths, depth, isCFF) {
-        const processedGeometry = this.tessellator.process(paths, true, isCFF);
+        const processedGeometry = this.tessellator.process(paths, true, isCFF, depth !== 0);
         return this.extrudeAndPackage(processedGeometry, depth);
     }
     extrudeAndPackage(processedGeometry, depth) {
@@ -4229,7 +4414,7 @@ class GlyphGeometryBuilder {
             glyphId: glyphContours.glyphId,
             pathCount: glyphContours.paths.length
         });
-        const processedGeometry = this.tessellator.process(glyphContours.paths, removeOverlaps, isCFF);
+        const processedGeometry = this.tessellator.process(glyphContours.paths, removeOverlaps, isCFF, depth !== 0);
         perfLogger.end('GlyphGeometryBuilder.tessellateGlyph');
         return this.extrudeAndPackage(processedGeometry, depth);
     }
@@ -4299,8 +4484,11 @@ class TextShaper {
         const clusters = [];
         let currentClusterGlyphs = [];
         let currentClusterText = '';
-        let clusterStartPosition = new Vec3();
-        let cursor = new Vec3(lineInfo.xOffset, -lineIndex * scaledLineHeight, 0);
+        let clusterStartX = 0;
+        let clusterStartY = 0;
+        let cursorX = lineInfo.xOffset;
+        let cursorY = -lineIndex * scaledLineHeight;
+        const cursorZ = 0;
         // Apply letter spacing after each glyph to match width measurements used during line breaking
         const letterSpacingFU = letterSpacing * this.loadedFont.upem;
         const spaceAdjustment = this.calculateSpaceAdjustment(lineInfo, align, letterSpacing);
@@ -4325,31 +4513,31 @@ class TextShaper {
                     clusters.push({
                         text: currentClusterText,
                         glyphs: currentClusterGlyphs,
-                        position: clusterStartPosition.clone()
+                        position: new Vec3(clusterStartX, clusterStartY, cursorZ)
                     });
                     currentClusterGlyphs = [];
                     currentClusterText = '';
                 }
             }
-            const absoluteGlyphPosition = cursor
-                .clone()
-                .add(new Vec3(glyph.dx, glyph.dy, 0));
+            const absoluteGlyphX = cursorX + glyph.dx;
+            const absoluteGlyphY = cursorY + glyph.dy;
             if (!isWhitespace) {
                 if (currentClusterGlyphs.length === 0) {
-                    clusterStartPosition.copy(absoluteGlyphPosition);
+                    clusterStartX = absoluteGlyphX;
+                    clusterStartY = absoluteGlyphY;
                 }
-                glyph.x = absoluteGlyphPosition.x - clusterStartPosition.x;
-                glyph.y = absoluteGlyphPosition.y - clusterStartPosition.y;
+                glyph.x = absoluteGlyphX - clusterStartX;
+                glyph.y = absoluteGlyphY - clusterStartY;
                 currentClusterGlyphs.push(glyph);
                 currentClusterText += lineInfo.text[glyph.cl];
             }
-            cursor.x += glyph.ax;
-            cursor.y += glyph.ay;
+            cursorX += glyph.ax;
+            cursorY += glyph.ay;
             if (letterSpacingFU !== 0 && i < glyphInfos.length - 1) {
-                cursor.x += letterSpacingFU;
+                cursorX += letterSpacingFU;
             }
             if (isWhitespace) {
-                cursor.x += spaceAdjustment;
+                cursorX += spaceAdjustment;
             }
             // CJK glue adjustment (must match exactly where LineBreak adds glue)
             if (cjkAdjustment !== 0 && i < glyphInfos.length - 1 && !isWhitespace) {
@@ -4370,7 +4558,7 @@ class TextShaper {
                         shouldApply = false;
                     }
                     if (shouldApply) {
-                        cursor.x += cjkAdjustment;
+                        cursorX += cjkAdjustment;
                     }
                 }
             }
@@ -4379,7 +4567,7 @@ class TextShaper {
             clusters.push({
                 text: currentClusterText,
                 glyphs: currentClusterGlyphs,
-                position: clusterStartPosition.clone()
+                position: new Vec3(clusterStartX, clusterStartY, cursorZ)
             });
         }
         return clusters;
@@ -5206,9 +5394,8 @@ class Text {
         const loadedFont = await Text.resolveFont(options);
         const text = new Text();
         text.setLoadedFont(loadedFont);
-        // Initial creation
-        const { font, maxCacheSizeMB, ...geometryOptions } = options;
-        const result = await text.createGeometry(geometryOptions);
+        // Pass full options so createGeometry honors maxCacheSizeMB etc
+        const result = await text.createGeometry(options);
         // Recursive update function
         const update = async (newOptions) => {
             // Merge options - preserve font from original options if not provided
@@ -5230,8 +5417,7 @@ class Text {
             }
             // Update closure options for next time
             options = mergedOptions;
-            const { font, maxCacheSizeMB, ...currentGeometryOptions } = options;
-            const newResult = await text.createGeometry(currentGeometryOptions);
+            const newResult = await text.createGeometry(options);
             return {
                 ...newResult,
                 getLoadedFont: () => text.getLoadedFont(),
@@ -5656,7 +5842,7 @@ class Text {
         if (!this.textLayout) {
             this.textLayout = new TextLayout(this.loadedFont);
         }
-        const alignmentResult = this.textLayout.applyAlignment(vertices, {
+        const alignmentResult = this.textLayout.computeAlignmentOffset({
             width,
             align,
             planeBounds
@@ -5665,9 +5851,19 @@ class Text {
         planeBounds.min.x = alignmentResult.adjustedBounds.min.x;
         planeBounds.max.x = alignmentResult.adjustedBounds.max.x;
         const finalScale = size / this.loadedFont.upem;
+        const offsetScaled = offset * finalScale;
         // Scale vertices only (normals are unit vectors, don't scale)
-        for (let i = 0; i < vertices.length; i++) {
-            vertices[i] *= finalScale;
+        if (offsetScaled === 0) {
+            for (let i = 0; i < vertices.length; i++) {
+                vertices[i] *= finalScale;
+            }
+        }
+        else {
+            for (let i = 0; i < vertices.length; i += 3) {
+                vertices[i] = vertices[i] * finalScale + offsetScaled;
+                vertices[i + 1] *= finalScale;
+                vertices[i + 2] *= finalScale;
+            }
         }
         planeBounds.min.x *= finalScale;
         planeBounds.min.y *= finalScale;
@@ -5677,14 +5873,10 @@ class Text {
         planeBounds.max.z *= finalScale;
         for (let i = 0; i < glyphInfoArray.length; i++) {
             const glyphInfo = glyphInfoArray[i];
-            if (offset !== 0) {
-                glyphInfo.bounds.min.x += offset;
-                glyphInfo.bounds.max.x += offset;
-            }
-            glyphInfo.bounds.min.x *= finalScale;
+            glyphInfo.bounds.min.x = glyphInfo.bounds.min.x * finalScale + offsetScaled;
             glyphInfo.bounds.min.y *= finalScale;
             glyphInfo.bounds.min.z *= finalScale;
-            glyphInfo.bounds.max.x *= finalScale;
+            glyphInfo.bounds.max.x = glyphInfo.bounds.max.x * finalScale + offsetScaled;
             glyphInfo.bounds.max.y *= finalScale;
             glyphInfo.bounds.max.z *= finalScale;
         }