@mlightcad/cad-simple-viewer 1.7.7-preview.1 → 1.7.8-preview.0

package/lib/view/AcTrView2d.js

@@ -96,10 +96,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { AcCmUiYieldGate, AcDbAttribute, AcDbBlockReference, acdbHostApplicationServices, AcDbMText, AcDbRasterImage, AcDbRay, AcDbRenderingCache, AcDbSysVarManager, AcDbText, AcDbViewport, AcDbXline, AcGeBox2d, AcGePoint2d, AcGePoint3d, acgiForegroundColorForBackground, log } from '@mlightcad/data-model';
+import { AcCmUiYieldGate, AcDbAttribute, AcDbBlockReference, acdbHostApplicationServices, AcDbMText, AcDbRasterImage, AcDbRay, AcDbRenderingCache, AcDbSysVarManager, AcDbText, AcDbViewport, AcDbXline, AcGeBox2d, AcGePoint2d, AcGePoint3d, acgiForegroundColorForBackground, AcGiMTextAttachmentPoint, log } from '@mlightcad/data-model';
 import { AcDbSystemVariables } from '@mlightcad/data-model';
 import { FontManager } from '@mlightcad/mtext-renderer';
-import { AcTrEntity, AcTrGlyphEntity, AcTrGroup, AcTrMTextRenderer, AcTrRenderer, AcTrViewportView, hasPendingComplexLineTypeGlyphs, setAcTrDrawOrderZAllocator } from '@mlightcad/three-renderer';
+import { AcTrEntity, AcTrGlyphEntity, AcTrGroup, AcTrMText, AcTrMTextRenderer, AcTrRenderer, AcTrShape, AcTrViewportView, hasPendingComplexLineTypeGlyphs, setAcTrDrawOrderZAllocator } from '@mlightcad/three-renderer';
 import { AcTrMatrixUtil } from '@mlightcad/three-renderer';
 import * as THREE from 'three';
 import Stats from 'three/examples/jsm/libs/stats.module';
@@ -396,9 +396,17 @@ var AcTrView2d = /** @class */ (function (_super) {
         /** Convert-phase wall timers (ms) for OPENPERF diagnostics. */
         _this._convertPhaseMs = {
             finishGeometry: 0,
+            /** Cumulative `asyncDraw` work inside finishEntityGeometry (excludes awaitFonts). */
+            finishGeometryAsyncDraw: 0,
+            /** Cumulative deferred-queue wait (enqueue → job start). */
+            finishGeometryQueueWait: 0,
             handleGroup: 0,
             addEntity: 0,
-            awaitFonts: 0
+            awaitFonts: 0,
+            glyphEntityCount: 0,
+            mtextCount: 0,
+            shapeCount: 0,
+            sharedGlyphDrawCount: 0
         };
         /** Last text-style font preload plan (for OPENPERF). */
         _this._fontPreloadDiag = null;
@@ -459,6 +467,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             _this._isDirty = needsRedraw;
             _this._htmlDirty = false;
         };
+        _this._meshGlyphFlushTimer = null;
         _this._disposeCanvasTouchCallout = disposeCanvasTouchCallout;
         var onProgressiveInput = function () { return _this.noteProgressiveUserInput(); };
         // Pointer and wheel both claim shortcut focus so undo/erase still work
@@ -863,9 +872,15 @@ var AcTrView2d = /** @class */ (function (_super) {
                 ? __assign({}, this._fontPreloadDiag) : undefined });
         this._convertPhaseMs = {
             finishGeometry: 0,
+            finishGeometryAsyncDraw: 0,
+            finishGeometryQueueWait: 0,
             handleGroup: 0,
             addEntity: 0,
-            awaitFonts: 0
+            awaitFonts: 0,
+            glyphEntityCount: 0,
+            mtextCount: 0,
+            shapeCount: 0,
+            sharedGlyphDrawCount: 0
         };
         this._fontPreloadDiag = null;
         return snapshot;
@@ -1734,6 +1749,10 @@ var AcTrView2d = /** @class */ (function (_super) {
                         if (!idle) {
                             log.warn('[AcTrView2d] Timed out waiting for deferred geometry before export');
                         }
+                        // Mesh-glyph InstancedMeshes are coalesced on a 16ms timer after idle.
+                        // HTML snapshot walks layer roots and must see those meshes; do not rely
+                        // on racing waitUntilIdle against the timer.
+                        this.flushMeshGlyphWorldBatch();
                         return [2 /*return*/];
                 }
             });
@@ -2062,43 +2081,64 @@ var AcTrView2d = /** @class */ (function (_super) {
     };
     AcTrView2d.prototype.editMTextEntity = function (mtext) {
         return __awaiter(this, void 0, void 0, function () {
-            var db, editor, applied, result_1, _a, _b;
+            var db, resolvePresentation, presentation, rawLocation, location, direction, attachmentPoint, editorWidth, textHeight, editor, applied, result_1, _a, _b;
             var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _d, _e, _f, _g;
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         db = mtext.database;
-                        if (mtext.lineSpacingFactor !== AcEdMTextEditor.defaultLineSpacingFactor) {
-                            acapRunDatabaseEdit(db, 'Edit MText', function () {
-                                var opened = db.openEntityForWrite(mtext);
-                                if (!(opened instanceof AcDbMText))
-                                    return;
-                                opened.lineSpacingFactor = AcEdMTextEditor.defaultLineSpacingFactor;
-                            });
-                        }
-                        // Hide the in-scene MTEXT while the inline editor renders its own copy; otherwise
-                        // both draw at once (double text) when the user double-clicks to edit.
-                        // this.removeEntity(mtext)
+                        // Hide the in-scene MTEXT while the inline editor renders its own copy;
+                        // otherwise both draw at once when the user double-clicks to edit.
+                        this.setEntitySceneVisible(mtext.objectId, false);
                         this._isDirty = true;
+                        resolvePresentation = mtext.resolveAnnotativePresentation;
+                        presentation = typeof resolvePresentation === 'function' ? resolvePresentation.call(mtext) : null;
+                        rawLocation = (_d = presentation === null || presentation === void 0 ? void 0 : presentation.position) !== null && _d !== void 0 ? _d : mtext.location;
+                        location = {
+                            x: rawLocation.x,
+                            y: rawLocation.y,
+                            z: (_e = rawLocation.z) !== null && _e !== void 0 ? _e : 0
+                        };
+                        direction = (_f = presentation === null || presentation === void 0 ? void 0 : presentation.direction) !== null && _f !== void 0 ? _f : mtext.direction;
+                        attachmentPoint = (_g = presentation === null || presentation === void 0 ? void 0 : presentation.attachmentPoint) !== null && _g !== void 0 ? _g : mtext.attachmentPoint;
+                        editorWidth = presentation && Number.isFinite(presentation.width) && presentation.width > 0
+                            ? presentation.width
+                            : this.resolveMTextEditorWidth(mtext);
+                        textHeight = presentation && Number.isFinite(presentation.height) && presentation.height > 0
+                            ? presentation.height
+                            : this.resolveMTextEditorTextHeight(mtext);
                         editor = new AcEdMTextEditor();
                         applied = false;
-                        _d.label = 1;
+                        _h.label = 1;
                     case 1:
-                        _d.trys.push([1, , 4, 5]);
+                        _h.trys.push([1, , 4, 5]);
                         _b = (_a = editor).open;
                         _c = {
                             view: this,
-                            location: mtext.location,
-                            width: this.resolveMTextEditorWidth(mtext),
-                            textHeight: this.resolveMTextEditorTextHeight(mtext),
+                            location: location,
+                            width: editorWidth,
+                            textHeight: textHeight,
                             initialText: mtext.contents,
-                            initialAttachmentPoint: mtext.attachmentPoint
+                            initialAttachmentPoint: attachmentPoint,
+                            initialDrawingDirection: mtext.drawingDirection,
+                            rotation: mtext.rotation,
+                            directionVector: {
+                                x: direction.x,
+                                y: direction.y,
+                                z: direction.z
+                            },
+                            // Match the entity's DXF style (group 7), not the drawing's current TEXTSTYLE.
+                            textStyleName: mtext.styleName,
+                            // Keep DXF group 44 so vertical layout matches the drawing (do not
+                            // rewrite to the ribbon default before the editor opens).
+                            initialLineSpaceFactor: mtext.lineSpacingFactor
                         };
                         return [4 /*yield*/, this.getMTextToolbarFontFamilies()];
-                    case 2: return [4 /*yield*/, _b.apply(_a, [(_c.toolbarFontFamilies = _d.sent(),
+                    case 2: return [4 /*yield*/, _b.apply(_a, [(_c.toolbarFontFamilies = _h.sent(),
                                 _c)])];
                     case 3:
-                        result_1 = _d.sent();
+                        result_1 = _h.sent();
                         if (!result_1)
                             return [2 /*return*/];
                         acapRunDatabaseEdit(db, 'Edit MText', function () {
@@ -2115,10 +2155,13 @@ var AcTrView2d = /** @class */ (function (_super) {
                         applied = true;
                         return [3 /*break*/, 5];
                     case 4:
+                        // Successful DB edits rebuild the drawable via update listeners; cancel
+                        // paths must restore visibility and refresh the original mesh.
+                        this.setEntitySceneVisible(mtext.objectId, true);
                         if (!applied) {
                             this.updateEntity(mtext);
-                            this._isDirty = true;
                         }
+                        this._isDirty = true;
                         return [7 /*endfinally*/];
                     case 5: return [2 /*return*/];
                 }
@@ -2134,36 +2177,34 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.editTextEntity = function (text) {
         return __awaiter(this, void 0, void 0, function () {
-            var db, height, textHeight, content, width, editor, applied, result_2, _a, _b;
-            var _c;
+            var db, height, textHeight, content, width, rotation, editor, applied, result_2, _a, _b, _c;
             var _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         db = text.database;
+                        this.setEntitySceneVisible(text.objectId, false);
                         this._isDirty = true;
                         height = Number(text.height);
                         textHeight = Number.isFinite(height) && height > 0 ? height : this.pixelsToWorldY(24);
-                        content = (_d = text.textString) !== null && _d !== void 0 ? _d : '';
+                        content = (_e = text.textString) !== null && _e !== void 0 ? _e : '';
                         width = Math.max(textHeight * Math.max(content.length, 1) * 0.6, textHeight);
+                        rotation = Number(text.rotation);
                         editor = new AcEdMTextEditor();
                         applied = false;
-                        _e.label = 1;
+                        _f.label = 1;
                     case 1:
-                        _e.trys.push([1, , 4, 5]);
+                        _f.trys.push([1, , 4, 5]);
                         _b = (_a = editor).open;
-                        _c = {
-                            view: this,
-                            location: text.position,
-                            width: width,
-                            textHeight: textHeight,
-                            initialText: content
-                        };
+                        _c = [__assign({ view: this, location: text.position, width: width, textHeight: textHeight, initialText: content, 
+                                // Single-line TEXT inserts on the baseline by default.
+                                initialAttachmentPoint: AcGiMTextAttachmentPoint.BaselineLeft }, (Number.isFinite(rotation) ? { rotation: rotation } : {}))];
+                        _d = {};
                         return [4 /*yield*/, this.getMTextToolbarFontFamilies()];
-                    case 2: return [4 /*yield*/, _b.apply(_a, [(_c.toolbarFontFamilies = _e.sent(),
-                                _c)])];
+                    case 2: return [4 /*yield*/, _b.apply(_a, [__assign.apply(void 0, _c.concat([(_d.toolbarFontFamilies = _f.sent(), _d)]))])];
                     case 3:
-                        result_2 = _e.sent();
+                        result_2 = _f.sent();
                         if (!result_2)
                             return [2 /*return*/];
                         acapRunDatabaseEdit(db, 'Edit Text', function () {
@@ -2179,10 +2220,11 @@ var AcTrView2d = /** @class */ (function (_super) {
                         applied = true;
                         return [3 /*break*/, 5];
                     case 4:
+                        this.setEntitySceneVisible(text.objectId, true);
                         if (!applied) {
                             this.updateEntity(text);
-                            this._isDirty = true;
                         }
+                        this._isDirty = true;
                         return [7 /*endfinally*/];
                     case 5: return [2 /*return*/];
                 }
@@ -2191,9 +2233,12 @@ var AcTrView2d = /** @class */ (function (_super) {
     };
     AcTrView2d.prototype.resolveMTextEditorWidth = function (mtext) {
         var width = Number(mtext.width);
+        // DXF group 41 <= 0 means no defined wrap column (AutoCAD / mtext-renderer).
+        // Pass 0 through so the input box can match renderer no-wrap layout instead
+        // of clamping to a tiny positive width that forces mid-string wrapping.
         if (Number.isFinite(width) && width > 0)
             return width;
-        return 1e-4;
+        return 0;
     };
     AcTrView2d.prototype.resolveMTextEditorTextHeight = function (mtext) {
         var textHeight = Number(mtext.height);
@@ -2247,7 +2292,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      * don't have to land pixel-perfect on the viewport line to grab it.
      */
     AcTrView2d.prototype.pick = function (point, hitRadius, pickOneOnly) {
-        var e_6, _a;
+        var e_6, _a, e_7, _b;
+        var _c, _d, _e, _f;
         if (point == null)
             point = this.curPos;
         var results = [];
@@ -2269,8 +2315,8 @@ var AcTrView2d = /** @class */ (function (_super) {
         var drillThroughViewportIds = new Set();
         if (isPaperSpace) {
             try {
-                for (var _b = __values(activeLayoutView.viewportViews), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var vpView = _c.value;
+                for (var _g = __values(activeLayoutView.viewportViews), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    var vpView = _h.value;
                     if (vpView.containsPaperPoint(point) &&
                         !vpView.isNearPaperBorder(point, borderTolerance)) {
                         drillThroughViewports.push(vpView);
@@ -2281,7 +2327,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
                 }
                 finally { if (e_6) throw e_6.error; }
             }
@@ -2292,15 +2338,58 @@ var AcTrView2d = /** @class */ (function (_super) {
         //    region) and selection feels "stuck on the frame".
         var firstQueryResults = this._scene.search(paperBox);
         var raycaster = activeLayoutView.resetRaycaster(point, threshold);
+        var mtextRenderer = AcTrMTextRenderer.getInstance();
+        var seenPickIds = new Set();
         firstQueryResults.forEach(function (item) {
             if (drillThroughViewportIds.has(item.id))
                 return;
-            if (!isEffectiveSpatialQueryHit(item))
+            var meshGlyphHit = mtextRenderer.intersectMeshGlyphObjectId(item.id, raycaster);
+            // Hierarchical hits with empty children are normally filtered (stale
+            // coarse root). Mesh-glyph InstancedMeshes are not in child boxes, so
+            // allow the root through when the glyph batch itself is hit.
+            if (!isEffectiveSpatialQueryHit(item) && !meshGlyphHit)
                 return;
-            if (activeLayout.isIntersectWith(item.id, raycaster)) {
+            if (activeLayout.isIntersectWith(item.id, raycaster) || meshGlyphHit) {
                 results.push(item);
+                seenPickIds.add(item.id);
             }
         });
+        // Mesh-glyph text may sit outside the INSERT spatial child union (placements
+        // stolen before child boxes were refreshed). Query the batch pick boxes
+        // directly so clicks on that text still select the entity.
+        var meshGlyphIds = mtextRenderer.queryMeshGlyphObjectIdsIntersectingBox({
+            minX: paperBox.min.x,
+            minY: paperBox.min.y,
+            maxX: paperBox.max.x,
+            maxY: paperBox.max.y
+        });
+        try {
+            for (var meshGlyphIds_1 = __values(meshGlyphIds), meshGlyphIds_1_1 = meshGlyphIds_1.next(); !meshGlyphIds_1_1.done; meshGlyphIds_1_1 = meshGlyphIds_1.next()) {
+                var objectId = meshGlyphIds_1_1.value;
+                if (seenPickIds.has(objectId) || drillThroughViewportIds.has(objectId)) {
+                    continue;
+                }
+                if (!mtextRenderer.intersectMeshGlyphObjectId(objectId, raycaster)) {
+                    continue;
+                }
+                var pickBox = mtextRenderer.getMeshGlyphWorldPickBoxes().get(objectId);
+                results.push({
+                    id: objectId,
+                    minX: (_c = pickBox === null || pickBox === void 0 ? void 0 : pickBox.min.x) !== null && _c !== void 0 ? _c : paperBox.min.x,
+                    minY: (_d = pickBox === null || pickBox === void 0 ? void 0 : pickBox.min.y) !== null && _d !== void 0 ? _d : paperBox.min.y,
+                    maxX: (_e = pickBox === null || pickBox === void 0 ? void 0 : pickBox.max.x) !== null && _e !== void 0 ? _e : paperBox.max.x,
+                    maxY: (_f = pickBox === null || pickBox === void 0 ? void 0 : pickBox.max.y) !== null && _f !== void 0 ? _f : paperBox.max.y
+                });
+                seenPickIds.add(objectId);
+            }
+        }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        finally {
+            try {
+                if (meshGlyphIds_1_1 && !meshGlyphIds_1_1.done && (_b = meshGlyphIds_1.return)) _b.call(meshGlyphIds_1);
+            }
+            finally { if (e_7) throw e_7.error; }
+        }
         // 2) For each drill-through viewport, resolve hits against the
         //    model-space layout using the viewport's own camera/raycaster.
         if (drillThroughViewports.length > 0) {
@@ -2313,7 +2402,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.getViewportCoordinateMapper = function (viewportId) {
-        var e_7, _a;
+        var e_8, _a;
         var _b, _c;
         var vpView;
         try {
@@ -2325,12 +2414,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         if (!vpView)
             return undefined;
@@ -2357,7 +2446,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper-space pick.
      */
     AcTrView2d.prototype.pickThroughViewports = function (paperPoint, paperBox, viewports, results) {
-        var e_8, _a;
+        var e_9, _a;
         var modelLayout = this._scene.modelSpaceLayout;
         if (!modelLayout)
             return;
@@ -2392,12 +2481,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _loop_1(vpView);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (viewports_1_1 && !viewports_1_1.done && (_a = viewports_1.return)) _a.call(viewports_1);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
     };
     /**
@@ -2431,7 +2520,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * that interior also selects those polylines and can stall highlight work.
      */
     AcTrView2d.prototype.refineCrossingSelectionHits = function (box, results) {
-        var e_9, _a;
+        var e_10, _a;
         var _b;
         var database = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         if (!database) {
@@ -2456,12 +2545,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (results_1_1 && !results_1_1.done && (_a = results_1.return)) _a.call(results_1);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         return ids;
     };
@@ -2477,7 +2566,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.updateLayer = function (layer, changes) {
-        var e_10, _a;
+        var e_11, _a;
         var touchedObjectIds = this._scene.updateLayer(this.toLayerInfo(layer)).touchedObjectIds;
         if (this._layerAppearance.layerStyleMayHaveChanged(changes)) {
             this._layerAppearance.syncFromLiveRecord(layer);
@@ -2499,12 +2588,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 this.applySessionHiddenObjectState(objectId);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (touchedObjectIds_1_1 && !touchedObjectIds_1_1.done && (_a = touchedObjectIds_1.return)) _a.call(touchedObjectIds_1);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         this._isDirty = true;
     };
@@ -2526,6 +2615,10 @@ var AcTrView2d = /** @class */ (function (_super) {
                 var threeEntity = this_1.drawEntity(entity_1, true);
                 if (threeEntity) {
                     threeEntity.objectId = entity_1.objectId;
+                    // Grip/jig clones reuse the live entity objectId. Keep mesh glyphs on
+                    // the transient tree (merge) so preview cannot enqueue duplicate
+                    // world InstancedMesh instances that outlive the transient.
+                    threeEntity.userData.skipMeshGlyphInstancing = true;
                     void threeEntity
                         .asyncDraw()
                         .then(function () {
@@ -2741,6 +2834,9 @@ var AcTrView2d = /** @class */ (function (_super) {
                 // duplicate progressive slots. updateEntity must release that claim or
                 // batchConvert skips the entity (scene already cleared → blank RasterImage).
                 this._claimedConvertObjectIds.delete(objectId);
+                // Always drop world mesh-glyph instances first (even if layout remove
+                // fails). Grip preview may have enqueued extras under this objectId.
+                AcTrMTextRenderer.getInstance().removeMeshGlyphInstances(objectId);
             }
             if (this._scene.hasEntity(item.objectId)) {
                 this._scene.removeEntity(item.objectId);
@@ -2778,7 +2874,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * drawable entity that must be rebuilt (for example ATTRIB → INSERT).
      */
     AcTrView2d.prototype.resolveSceneUpdateEntities = function (entities) {
-        var e_11, _a;
+        var e_12, _a;
         var _b;
         var db = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         var resolved = [];
@@ -2800,12 +2896,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 resolved.push(target);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         return resolved;
     };
@@ -2953,6 +3049,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         // the cleared scene nor double-decrements the processing counter.
         this._convertEpoch++;
         this.clearFontLoadedRedrawTimer();
+        this.clearMeshGlyphFlushTimer();
         this._convertQueue.length = 0;
         this._viewportRepairOwnerIds.clear();
         this._numOfEntitiesToProcess = 0;
@@ -2968,6 +3065,8 @@ var AcTrView2d = /** @class */ (function (_super) {
     AcTrView2d.prototype.clear = function () {
         this.abortConversion();
         this._scene.clear();
+        // Scene teardown orphans InstancedMeshes — drop singleton slot maps too.
+        AcTrMTextRenderer.getInstance().resetMeshGlyphBatch();
         this._renderer.resetDrawOrderZ();
         this._isDirty = true;
         this._missedImages.clear();
@@ -2986,6 +3085,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @returns Parked state owned by {@link AcApDocSession} until restore.
      */
     AcTrView2d.prototype.captureSessionState = function () {
+        this.clearMeshGlyphFlushTimer();
         return {
             scene: this._scene,
             layoutViewManager: this._layoutViewManager,
@@ -2995,7 +3095,9 @@ var AcTrView2d = /** @class */ (function (_super) {
             loadingLayouts: this._loadingLayouts,
             missedImages: this._missedImages,
             missedFonts: this._renderer.snapshotMissedFonts(),
-            selectionIds: this.selectionSet.ids
+            selectionIds: this.selectionSet.ids,
+            // Detach so the next document cannot pick/highlight this one's glyphs.
+            meshGlyphBatch: AcTrMTextRenderer.getInstance().detachMeshGlyphBatch()
         };
     };
     /**
@@ -3007,6 +3109,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         var _a, _b;
         this._convertEpoch++;
         this.clearFontLoadedRedrawTimer();
+        this.clearMeshGlyphFlushTimer();
         this.cancelOpenLineworkFrame();
         this._convertQueue.length = 0;
         this._viewportRepairOwnerIds.clear();
@@ -3023,6 +3126,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._loadingLayouts = state.loadingLayouts;
         this._missedImages = state.missedImages;
         this._renderer.replaceMissedFonts((_b = state.missedFonts) !== null && _b !== void 0 ? _b : {});
+        AcTrMTextRenderer.getInstance().attachMeshGlyphBatch(state.meshGlyphBatch);
         this.rebindLayerAppearance();
         this._layoutViewManager.resize(this.width, this.height);
         this.selectionSet.clear();
@@ -3069,6 +3173,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param state - Parked snapshot to discard.
      */
     AcTrView2d.prototype.disposeSessionState = function (state) {
+        state.meshGlyphBatch.dispose();
         state.scene.clear();
         state.layoutViewManager = new AcTrLayoutViewManager();
         state.initializedLayouts.clear();
@@ -3581,7 +3686,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param layoutBtrId Input the block table record id of the layout
      */
     AcTrView2d.prototype.loadLayoutEntitiesIfNeeded = function (layoutBtrId) {
-        var e_12, _a;
+        var e_13, _a;
         var _this = this;
         try {
             var db = AcApDocManager.instance.curDocument.database;
@@ -3645,12 +3750,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                     entities_2.push(entity);
                 }
             }
-            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+            catch (e_13_1) { e_13 = { error: e_13_1 }; }
             finally {
                 try {
                     if (iterator_1_1 && !iterator_1_1.done && (_a = iterator_1.return)) _a.call(iterator_1);
                 }
-                finally { if (e_12) throw e_12.error; }
+                finally { if (e_13) throw e_13.error; }
             }
             if (entities_2.length === 0) {
                 // Empty layout (e.g. a freshly-created paper space tab). Mark as
@@ -3877,7 +3982,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.finishEntityGeometry = function (threeEntity, _progressive) {
         return __awaiter(this, void 0, void 0, function () {
-            var t0, isGroup, groupPending, needsGlyphDraw;
+            var t0, isGroup, groupPending, needsGlyphDraw, noteGlyphCounts, td_1, td_2, td;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -3897,29 +4003,47 @@ var AcTrView2d = /** @class */ (function (_super) {
                         _a.sent();
                         _a.label = 3;
                     case 3:
+                        noteGlyphCounts = function () {
+                            _this._convertPhaseMs.glyphEntityCount++;
+                            if (threeEntity instanceof AcTrMText) {
+                                _this._convertPhaseMs.mtextCount++;
+                            }
+                            else if (threeEntity instanceof AcTrShape) {
+                                _this._convertPhaseMs.shapeCount++;
+                            }
+                        };
                         if (!isGroup) return [3 /*break*/, 5];
                         // Linework-only INSERTs (no empty glyph shells) skip asyncDraw; spatial
                         // boxes are refreshed by syncGroupSpatialBoundsForIndexing after commit.
                         if (!groupPending) {
                             return [2 /*return*/];
                         }
+                        noteGlyphCounts();
+                        td_1 = performance.now();
                         return [4 /*yield*/, threeEntity.asyncDraw()];
                     case 4:
                         _a.sent();
+                        this._convertPhaseMs.finishGeometryAsyncDraw += performance.now() - td_1;
                         return [2 /*return*/];
                     case 5:
                         if (!hasPendingComplexLineTypeGlyphs(threeEntity)) return [3 /*break*/, 7];
+                        noteGlyphCounts();
+                        td_2 = performance.now();
                         return [4 /*yield*/, threeEntity.asyncDraw()];
                     case 6:
                         _a.sent();
+                        this._convertPhaseMs.finishGeometryAsyncDraw += performance.now() - td_2;
                         return [2 /*return*/];
                     case 7:
                         if (threeEntity.hasDrawableGeometry()) {
                             return [2 /*return*/];
                         }
+                        noteGlyphCounts();
+                        td = performance.now();
                         return [4 /*yield*/, threeEntity.asyncDraw()];
                     case 8:
                         _a.sent();
+                        this._convertPhaseMs.finishGeometryAsyncDraw += performance.now() - td;
                         return [3 /*break*/, 10];
                     case 9:
                         this._convertPhaseMs.finishGeometry += performance.now() - t0;
@@ -3974,8 +4098,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.redrawGlyphEntitiesAfterFontLoad = function (epoch, fontName) {
         return __awaiter(this, void 0, void 0, function () {
-            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_13_1, defaults, normalized_1, msSinceIdle, db;
-            var e_14, _c, e_13, _d;
+            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_14_1, defaults, normalized_1, msSinceIdle, db;
+            var e_15, _c, e_14, _d;
             var _e, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -3997,12 +4121,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_14) throw e_14.error; }
+                            finally { if (e_15) throw e_15.error; }
                         }
                         _g.label = 1;
                     case 1:
@@ -4025,14 +4149,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_13_1 = _g.sent();
-                        e_13 = { error: e_13_1 };
+                        e_14_1 = _g.sent();
+                        e_14 = { error: e_14_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (glyphs_1_1 && !glyphs_1_1.done && (_d = glyphs_1.return)) _d.call(glyphs_1);
                         }
-                        finally { if (e_13) throw e_13.error; }
+                        finally { if (e_14) throw e_14.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (glyphs.length > 0) {
@@ -4083,7 +4207,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         });
     };
     AcTrView2d.prototype.groupHasPendingGlyphGeometry = function (group) {
-        var e_15, _a;
+        var e_16, _a;
         try {
             // Prefer O(block-def shells). A full THREE.traverse over a mega-block
             // (100k+ flattened mesh leaves) was dominating scene-convert wall time.
@@ -4094,12 +4218,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_16) throw e_16.error; }
         }
         return AcTrView2d.directChildrenHavePendingGlyphs(group);
     };
@@ -4110,7 +4234,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * a whole-floor INSERT is O(glyph shells), not O(all drawable leaves).
      */
     AcTrView2d.directChildrenHavePendingGlyphs = function (root) {
-        var e_16, _a;
+        var e_17, _a;
         var children = root.children;
         for (var i = 0; i < children.length; i++) {
             var child = children[i];
@@ -4122,7 +4246,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             }
             if (child instanceof AcTrGroup) {
                 try {
-                    for (var _b = (e_16 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = (e_17 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var entity = _c.value;
                         if (entity instanceof AcTrGlyphEntity &&
                             !entity.hasDrawableGeometry()) {
@@ -4130,12 +4254,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                catch (e_17_1) { e_17 = { error: e_17_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_16) throw e_16.error; }
+                    finally { if (e_17) throw e_17.error; }
                 }
                 if (AcTrView2d.directChildrenHavePendingGlyphs(child)) {
                     return true;
@@ -4164,7 +4288,11 @@ var AcTrView2d = /** @class */ (function (_super) {
             return;
         }
         this._pendingGeometryJobs++;
-        this._deferredGeometryQueue.push({ run: run, epoch: epoch });
+        this._deferredGeometryQueue.push({
+            run: run,
+            epoch: epoch,
+            enqueuedAt: performance.now()
+        });
         this.pumpDeferredGeometryQueue();
     };
     /**
@@ -4179,6 +4307,8 @@ var AcTrView2d = /** @class */ (function (_super) {
                 this_2._pendingGeometryJobs = Math.max(0, this_2._pendingGeometryJobs - 1);
                 return "continue";
             }
+            this_2._convertPhaseMs.finishGeometryQueueWait +=
+                performance.now() - job.enqueuedAt;
             this_2._deferredGeometryActive++;
             void job
                 .run()
@@ -4293,7 +4423,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper layouts.
      */
     AcTrView2d.prototype.ensureViewportViews = function (blockTableRecord, layoutView) {
-        var e_17, _a;
+        var e_18, _a;
         var iterator = blockTableRecord.newIterator();
         try {
             for (var iterator_2 = __values(iterator), iterator_2_1 = iterator_2.next(); !iterator_2_1.done; iterator_2_1 = iterator_2.next()) {
@@ -4306,12 +4436,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 layoutView.addViewport(viewportView);
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (iterator_2_1 && !iterator_2_1.done && (_a = iterator_2.return)) _a.call(iterator_2);
             }
-            finally { if (e_17) throw e_17.error; }
+            finally { if (e_18) throw e_18.error; }
         }
     };
     /**
@@ -4320,7 +4450,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * {@link AcDbViewport.frozenLayerIds} but omit them from `toGiViewport()`.
      */
     AcTrView2d.prototype.toGiViewportWithFrozenLayers = function (entity) {
-        var e_18, _a;
+        var e_19, _a;
         var _b;
         var gi = entity.toGiViewport();
         if (gi.frozenLayers && gi.frozenLayers.length > 0) {
@@ -4340,12 +4470,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         names.push(layer.name);
                 }
             }
-            catch (e_18_1) { e_18 = { error: e_18_1 }; }
+            catch (e_19_1) { e_19 = { error: e_19_1 }; }
             finally {
                 try {
                     if (ids_1_1 && !ids_1_1.done && (_a = ids_1.return)) _a.call(ids_1);
                 }
-                finally { if (e_18) throw e_18.error; }
+                finally { if (e_19) throw e_19.error; }
             }
         }
         gi.frozenLayerIds = __spreadArray([], __read(ids), false);
@@ -4665,8 +4795,8 @@ var AcTrView2d = /** @class */ (function (_super) {
     };
     AcTrView2d.prototype.handleGroup = function (group_1, progressive_1) {
         return __awaiter(this, arguments, void 0, function (group, progressive, epoch, convertGen) {
-            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_5, this_4, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_19_1;
-            var e_20, _b, e_19, _c;
+            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_5, this_4, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_20_1;
+            var e_21, _b, e_20, _c;
             var _this = this;
             var _d, _e;
             if (epoch === void 0) { epoch = this._convertEpoch; }
@@ -4721,12 +4851,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 child.parent = null;
                             }
                         }
-                        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+                        catch (e_21_1) { e_21 = { error: e_21_1 }; }
                         finally {
                             try {
                                 if (children_1_1 && !children_1_1.done && (_b = children_1.return)) _b.call(children_1);
                             }
-                            finally { if (e_20) throw e_20.error; }
+                            finally { if (e_21) throw e_21.error; }
                         }
                         renderContext = group.renderContext;
                         groupObjectId = group.objectId;
@@ -4841,14 +4971,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_19_1 = _f.sent();
-                        e_19 = { error: e_19_1 };
+                        e_20_1 = _f.sent();
+                        e_20 = { error: e_20_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (objectsGroupByLayer_1_1 && !objectsGroupByLayer_1_1.done && (_c = objectsGroupByLayer_1.return)) _c.call(objectsGroupByLayer_1);
                         }
-                        finally { if (e_19) throw e_19.error; }
+                        finally { if (e_20) throw e_20.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         group.dispose();
@@ -4912,6 +5042,9 @@ var AcTrView2d = /** @class */ (function (_super) {
     AcTrView2d.prototype.stampEntityProcessingIdle = function () {
         if (this._numOfEntitiesToProcess === 0 && this._pendingGeometryJobs === 0) {
             this._entityProcessingIdleAt = performance.now();
+            // Coalesce: deferred waves can briefly hit 0 pending before the next
+            // enqueue; delay flush so one open prefers a single InstancedMesh build.
+            this.scheduleMeshGlyphWorldBatchFlush();
             // Release block templates after INSERT convert/glyph work finishes.
             // Clearing at converter END was too early (convert still draining);
             // keeping templates until the next open kept baked shells in memory and
@@ -4919,6 +5052,85 @@ var AcTrView2d = /** @class */ (function (_super) {
             AcDbRenderingCache.instance.clear();
         }
     };
+    AcTrView2d.prototype.clearMeshGlyphFlushTimer = function () {
+        if (this._meshGlyphFlushTimer != null) {
+            clearTimeout(this._meshGlyphFlushTimer);
+            this._meshGlyphFlushTimer = null;
+        }
+    };
+    /**
+     * Schedules {@link flushMeshGlyphWorldBatch} on the next macrotask if the
+     * convert/glyph pools are still idle.
+     */
+    AcTrView2d.prototype.scheduleMeshGlyphWorldBatchFlush = function () {
+        var _this = this;
+        var mtextRenderer = AcTrMTextRenderer.getInstance();
+        if (!mtextRenderer.getMeshGlyphInstancing()) {
+            return;
+        }
+        this.clearMeshGlyphFlushTimer();
+        var epoch = this._convertEpoch;
+        this._meshGlyphFlushTimer = setTimeout(function () {
+            _this._meshGlyphFlushTimer = null;
+            if (epoch !== _this._convertEpoch) {
+                return;
+            }
+            if (_this._numOfEntitiesToProcess > 0 || _this._pendingGeometryJobs > 0) {
+                return;
+            }
+            _this.flushMeshGlyphWorldBatch();
+        }, 16);
+    };
+    /**
+     * Builds scene-level mesh-glyph InstancedMeshes after deferred asyncDraw
+     * drains. No-op unless {@link AcTrMTextRenderer.setMeshGlyphInstancing}.
+     *
+     * Cancels any pending coalesce timer so callers (HTML export) can flush
+     * synchronously without waiting for the 16ms delay.
+     */
+    AcTrView2d.prototype.flushMeshGlyphWorldBatch = function () {
+        var _this = this;
+        this.clearMeshGlyphFlushTimer();
+        var mtextRenderer = AcTrMTextRenderer.getInstance();
+        if (!mtextRenderer.getMeshGlyphInstancing()) {
+            return;
+        }
+        var _a = mtextRenderer.flushMeshGlyphInstances(this._scene.internalScene, function (layerName) { return _this.resolveMeshGlyphLayerParent(layerName); }), placements = _a.placements, buckets = _a.buckets;
+        if (placements > 0) {
+            // Prefix for headless CLI console forwarding.
+            console.log("[cad-simple-viewer-cli] mesh glyph InstancedMesh flush: placements=".concat(placements, " buckets=").concat(buckets));
+        }
+    };
+    /**
+     * Prefers the active layout's layer group, then any layout that already has
+     * that layer (multi-layout HTML export). Falls back to null so flush can
+     * parent under the bookkeeping root.
+     */
+    AcTrView2d.prototype.resolveMeshGlyphLayerParent = function (layerName) {
+        var e_22, _a;
+        var _b;
+        var active = (_b = this._scene.activeLayout) === null || _b === void 0 ? void 0 : _b.getLayer(layerName);
+        if (active) {
+            return active.internalObject;
+        }
+        try {
+            for (var _c = __values(this._scene.layouts.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var layout = _d.value;
+                var layer = layout.getLayer(layerName);
+                if (layer) {
+                    return layer.internalObject;
+                }
+            }
+        }
+        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_22) throw e_22.error; }
+        }
+        return null;
+    };
     /**
      * Wall-time between cooperative yields during scene convert (ms) when
      * progressive rendering is off. Overlay still blocks input, so a larger