@mlightcad/cad-simple-viewer 1.7.3 → 1.7.4

package/lib/view/AcTrView2d.js

@@ -99,7 +99,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { AcCmUiYieldGate, AcDbAttribute, AcDbBlockReference, acdbHostApplicationServices, AcDbMText, AcDbRasterImage, AcDbRay, AcDbSysVarManager, AcDbViewport, AcDbXline, AcGeBox2d, AcGePoint2d, acgiForegroundColorForBackground, 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 } from '@mlightcad/three-renderer';
+import { AcTrEntity, AcTrGlyphEntity, AcTrGroup, AcTrMTextRenderer, AcTrRenderer, 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';
@@ -122,7 +122,7 @@ import { shouldExtendBboxForDirectEntity, tryBuildDirectEntityMeta } from './AcT
 import { AcTrEntityDisplayController } from './AcTrEntityDisplayController';
 import { assertAcTrGroupWcsBboxesConsistent, unionGroupWcsChildBoxes } from './AcTrGroupWcsBboxAssert';
 import { AcTrInheritedLayerMaterialMapper } from './AcTrInheritedLayerMaterialMapper';
-import { computeIntelligentExtents } from './AcTrIntelligentExtents';
+import { computeIntelligentExtentsAsync } from './AcTrIntelligentExtents';
 import { AcTrLayer } from './AcTrLayer';
 import { AcTrLayerAppearanceController } from './AcTrLayerAppearanceController';
 import { AcTrLayout } from './AcTrLayout';
@@ -131,6 +131,7 @@ import { AcTrLayoutViewManager } from './AcTrLayoutViewManager';
 import { sortPickResults } from './AcTrPickResultUtil';
 import { AcTrProgressiveOpenFitController } from './AcTrProgressiveOpenFitController';
 import { AcTrScene } from './AcTrScene';
+import { AcTrWorkSlice } from './AcTrWorkSlice';
 import { shouldRegenDatabaseAfterFontLoad } from './fontLoadRegen';
 /**
  * Default view option values
@@ -385,6 +386,9 @@ var AcTrView2d = /** @class */ (function (_super) {
         renderer.setPixelRatio(Math.min(window.devicePixelRatio, 2));
         renderer.setSize(_this.width, _this.height);
         _this._renderer = new AcTrRenderer(renderer);
+        // Shared across all layer batched groups so later entities (e.g. wipeouts)
+        // occlude earlier linework via depth, matching AutoCAD draw order.
+        setAcTrDrawOrderZAllocator(function () { return _this._renderer.allocateDrawOrderZ(); });
         var fontMapping = AcApSettingManager.instance.fontMapping;
         _this._renderer.setFontMapping(fontMapping);
         _this._renderer.events.fontNotFound.addEventListener(function (args) {
@@ -1042,6 +1046,9 @@ var AcTrView2d = /** @class */ (function (_super) {
         // Style-manager changeForeground only updates cache entries; batch
         // containers own private material clones and must be repainted too.
         this._scene.repaintForegroundMaterials(acgiForegroundColorForBackground(value));
+        // Wipeouts track the canvas background (isBackgroundFill); repaint their
+        // batch-owned clones the same way as ACI-7 foreground materials.
+        this._scene.repaintBackgroundMaterials(value);
         this.resyncForegroundLayersForBackground();
         if (this._readingMode.isEnabled) {
             this._readingMode.noteLayoutBackground(value);
@@ -1561,7 +1568,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _this.endProgressiveOpenFit();
                 return;
             }
-            _this._progressiveOpenFit.applyFinalFit(function () { return _this.resolveLayoutFitBox(); });
+            _this._progressiveOpenFit.applyFinalFit(function () { return _this.getDrawingExtents(); });
             _this.endProgressiveOpenFit();
             var originalBtrId = layoutBtrId !== null && layoutBtrId !== void 0 ? layoutBtrId : _this.activeLayoutBtrId;
             if (originalBtrId) {
@@ -1593,27 +1600,87 @@ var AcTrView2d = /** @class */ (function (_super) {
     AcTrView2d.prototype.zoomToSmartExtents = function (timeout) {
         var _this = this;
         if (timeout === void 0) { timeout = 0; }
-        var waiter = new AcEdConditionWaiter(function () { return !_this.isProcessingEntities; }, function () {
-            var smart = _this.resolveSmartFitBox();
-            if (smart) {
-                _this.zoomTo(smart);
-                _this._isDirty = true;
-                _this.endProgressiveOpenFit();
-                return;
-            }
-            _this._progressiveOpenFit.applyFinalFit(function () { return _this.resolveLayoutFitBox(); });
-            _this.endProgressiveOpenFit();
-        }, 300, timeout);
-        waiter.start();
+        return new Promise(function (resolve, reject) {
+            var waiter = new AcEdConditionWaiter(function () { return !_this.isProcessingEntities; }, function () {
+                void (function () { return __awaiter(_this, void 0, void 0, function () {
+                    var smart, error_2;
+                    var _this = this;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                _a.trys.push([0, 2, , 3]);
+                                return [4 /*yield*/, this.resolveSmartFitBox()];
+                            case 1:
+                                smart = _a.sent();
+                                if (smart) {
+                                    this.zoomTo(smart);
+                                    this._isDirty = true;
+                                    this.endProgressiveOpenFit();
+                                    resolve();
+                                    return [2 /*return*/];
+                                }
+                                this._progressiveOpenFit.applyFinalFit(function () {
+                                    return _this.getDrawingExtents();
+                                });
+                                this.endProgressiveOpenFit();
+                                resolve();
+                                return [3 /*break*/, 3];
+                            case 2:
+                                error_2 = _a.sent();
+                                // Always clear progressive-open framing so a failed smart fit
+                                // cannot leave the open-fit overlay/state stuck indefinitely.
+                                this.endProgressiveOpenFit();
+                                reject(error_2);
+                                return [3 /*break*/, 3];
+                            case 3: return [2 /*return*/];
+                        }
+                    });
+                }); })();
+            }, 300, timeout);
+            waiter.start();
+        });
     };
     /**
      * Resolves intelligent zoom extents from spatial-index entity boxes.
+     * Reuses the layout cache until entity geometry extents are invalidated.
+     * Collects and clusters cooperatively so the UI thread stays responsive.
      */
     AcTrView2d.prototype.resolveSmartFitBox = function () {
-        var activeLayout = this._scene.activeLayout;
-        if (!activeLayout)
-            return undefined;
-        return computeIntelligentExtents(activeLayout.collectSpatialExtentBoxes());
+        return __awaiter(this, void 0, void 0, function () {
+            var activeLayout, cached, generation, work, entries, smart;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        activeLayout = this._scene.activeLayout;
+                        if (!activeLayout)
+                            return [2 /*return*/, undefined];
+                        cached = activeLayout.cachedSmartExtents;
+                        if (cached) {
+                            return [2 /*return*/, cached];
+                        }
+                        generation = activeLayout.smartExtentsGeneration;
+                        work = new AcTrWorkSlice();
+                        return [4 /*yield*/, activeLayout.collectSpatialExtentBoxesAsync(work)];
+                    case 1:
+                        entries = _a.sent();
+                        return [4 /*yield*/, computeIntelligentExtentsAsync(entries, work)
+                            // Geometry changed while we yielded: discard this result (a newer cache
+                            // may already exist; otherwise the caller falls back to drawing extents).
+                        ];
+                    case 2:
+                        smart = _a.sent();
+                        // Geometry changed while we yielded: discard this result (a newer cache
+                        // may already exist; otherwise the caller falls back to drawing extents).
+                        if (activeLayout.smartExtentsGeneration !== generation) {
+                            return [2 /*return*/, activeLayout.cachedSmartExtents];
+                        }
+                        if (smart) {
+                            activeLayout.cachedSmartExtents = smart;
+                        }
+                        return [2 /*return*/, smart];
+                }
+            });
+        });
     };
     /**
      * @inheritdoc
@@ -1667,7 +1734,9 @@ var AcTrView2d = /** @class */ (function (_super) {
                 return entity;
             return undefined;
         }
-        if (entity instanceof AcDbAttribute) {
+        if (entity instanceof AcDbAttribute ||
+            entity.type === 'Attrib' ||
+            entity.type === 'Attribute') {
             var owner = AcApDocManager.instance.curDocument.database.tables.blockTable.getEntityById(entity.ownerId);
             if (owner instanceof AcDbBlockReference &&
                 owner.attributeIterator().count > 0) {
@@ -2344,10 +2413,14 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._externallyFramedLayouts.add(layoutBtrId);
     };
     /**
-     * Resolves the 2D box to frame for the active layout once entities are
-     * converted. Uses {@link AcTrScene.box}, which is derived from batch geometry.
+     * Returns the 2D box of drawable geometry in the active layout.
+     *
+     * Uses {@link AcTrScene.box}, which is derived from batch geometry — not
+     * database header `EXTMIN`/`EXTMAX`, which are often stale on real DWGs.
+     *
+     * @inheritdoc
      */
-    AcTrView2d.prototype.resolveLayoutFitBox = function () {
+    AcTrView2d.prototype.getDrawingExtents = function () {
         var sceneBox = this._scene.box;
         if (sceneBox && !sceneBox.isEmpty()) {
             return AcTrGeometryUtil.threeBox3dToGeBox2d(sceneBox);
@@ -2375,7 +2448,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      *    populated. Many parsers leave this empty (we've seen `(0,0)-(0,0)`),
      *    so it sits below the viewport-based heuristic.
      *
-     * 4. **`resolveLayoutFitBox`** (entity extents from batch geometry) —
+     * 4. **`getDrawingExtents`** (entity extents from batch geometry) —
      *    last-resort fallback for layouts with no viewports and no
      *    sensible limits/extents (e.g. a freshly created empty paper).
      *    Vulnerable to scale-mismatch outliers, but better than no zoom.
@@ -2421,7 +2494,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _this.zoomTo(new AcGeBox2d({ x: extents.min.x, y: extents.min.y }, { x: extents.max.x, y: extents.max.y }));
             }
             else {
-                var box = _this.resolveLayoutFitBox();
+                var box = _this.getDrawingExtents();
                 if (box) {
                     _this.zoomTo(box);
                 }
@@ -2447,6 +2520,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         this.resetDeferredGeometryQueue();
         this._entityProcessingIdleAt = 0;
         this._scene.clear();
+        this._renderer.resetDrawOrderZ();
         this._isDirty = true;
         this._missedImages.clear();
         this._initializedLayouts.clear();
@@ -3000,7 +3074,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param database - Database whose text style table has just been filled.
      */
     AcTrView2d.prototype.startTextStyleFontPreload = function (database) {
-        var _a;
+        var e_12, _a;
+        var _b;
         var epoch = this._convertEpoch;
         if (this._textStyleFontPreloadEpoch === epoch &&
             this._textStyleFontPreloadPromise) {
@@ -3009,9 +3084,33 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._textStyleFontPreloadEpoch = epoch;
         var names = [];
         try {
-            names = (_a = database.tables.textStyleTable.fonts) !== null && _a !== void 0 ? _a : [];
+            var table = database.tables.textStyleTable;
+            names = __spreadArray([], __read(((_b = table.fonts) !== null && _b !== void 0 ? _b : [])), false);
+            // `fonts` is DXF group 3/4 file names only. TrueType styles store the
+            // face on `font` / `extendedFont` (仿宋, SimHei).
+            if (table.newIterator) {
+                try {
+                    for (var _c = __values(table.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var record = _d.value;
+                        var style = record.textStyle;
+                        if (style === null || style === void 0 ? void 0 : style.font)
+                            names.push(style.font);
+                        if (style === null || style === void 0 ? void 0 : style.bigFont)
+                            names.push(style.bigFont);
+                        if (style === null || style === void 0 ? void 0 : style.extendedFont)
+                            names.push(style.extendedFont);
+                    }
+                }
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                finally {
+                    try {
+                        if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    }
+                    finally { if (e_12) throw e_12.error; }
+                }
+            }
         }
-        catch (_b) {
+        catch (_e) {
             names = [];
         }
         // Style fonts alone are not enough: awaitFontsBeforeDraw only *awaits*
@@ -3026,12 +3125,24 @@ var AcTrView2d = /** @class */ (function (_super) {
             return;
         }
         var mtextRenderer = AcTrMTextRenderer.getInstance();
-        this._textStyleFontPreloadPromise = Promise.all([
+        // Same deadline as AcApDocManager.installFontFileLoadTimeout. Covers both
+        // main-thread requestFonts and worker-pool loadFonts so a stalled CDN
+        // cannot pin deferred glyph jobs / the open overlay indefinitely.
+        var preloadTimeoutMs = 30000;
+        var preload = Promise.all([
             FontManager.instance.requestFonts(preloadNames),
             // Worker isolates have their own FontManager; main-thread requestFonts
             // alone does not populate them before asyncRenderMText.
             mtextRenderer.loadFonts(fallbackFonts)
-        ]).then(function () { }, function () {
+        ]);
+        this._textStyleFontPreloadPromise = Promise.race([
+            preload,
+            new Promise(function (_, reject) {
+                setTimeout(function () {
+                    reject(new Error("Text-style font preload timed out after ".concat(preloadTimeoutMs, "ms")));
+                }, preloadTimeoutMs);
+            })
+        ]).then(function () { return undefined; }, function () {
             // Glyph draw still falls back via FontManager defaults / '?'.
         });
     };
@@ -3160,8 +3271,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_12_1, defaults, normalized_1, msSinceIdle, db;
-            var e_13, _c, e_12, _d;
+            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 _e, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -3183,12 +3294,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_13) throw e_13.error; }
+                            finally { if (e_14) throw e_14.error; }
                         }
                         _g.label = 1;
                     case 1:
@@ -3211,14 +3322,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_12_1 = _g.sent();
-                        e_12 = { error: e_12_1 };
+                        e_13_1 = _g.sent();
+                        e_13 = { error: e_13_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_12) throw e_12.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (glyphs.length > 0) {
@@ -3388,7 +3499,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper layouts.
      */
     AcTrView2d.prototype.ensureViewportViews = function (blockTableRecord, layoutView) {
-        var e_14, _a;
+        var e_15, _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()) {
@@ -3401,12 +3512,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 layoutView.addViewport(viewportView);
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (iterator_2_1 && !iterator_2_1.done && (_a = iterator_2.return)) _a.call(iterator_2);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
     };
     /**
@@ -3441,7 +3552,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                             return new Promise(function (resolve) { return setTimeout(resolve, 0); });
                         };
                         _loop_4 = function (i) {
-                            var entity, shouldConvert, objectId_1, convertGen_1, directMeta, added, superseded, threeEntity_1, isMultiLayerGroup, deferGeometry, isExtendBbox_1, commitEntity, layoutView, viewportView, fileName, error_2, didYield;
+                            var entity, shouldConvert, objectId_1, convertGen_1, directMeta, added, superseded, threeEntity_1, isMultiLayerGroup, deferGeometry, isExtendBbox_1, commitEntity, layoutView, viewportView, fileName, error_3, didYield;
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
@@ -3502,7 +3613,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                                                         this_3.applySessionHiddenObjectState(entity.objectId);
                                                         if (progressive) {
                                                             this_3.markProgressiveDirty();
-                                                            this_3._progressiveOpenFit.afterGeometryBatch(function () { return _this.resolveLayoutFitBox(); }, i);
+                                                            this_3._progressiveOpenFit.afterGeometryBatch(function () { return _this.getDrawingExtents(); }, i);
                                                         }
                                                     }
                                                 }
@@ -3579,7 +3690,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                                                         threeEntity_1.dispose();
                                                         if (progressive) {
                                                             this.markProgressiveDirty();
-                                                            this._progressiveOpenFit.afterGeometryBatch(function () { return _this.resolveLayoutFitBox(); }, i);
+                                                            this._progressiveOpenFit.afterGeometryBatch(function () { return _this.getDrawingExtents(); }, i);
                                                         }
                                                         return [2 /*return*/];
                                                 }
@@ -3621,8 +3732,8 @@ var AcTrView2d = /** @class */ (function (_super) {
                                         }
                                         return [3 /*break*/, 11];
                                     case 9:
-                                        error_2 = _e.sent();
-                                        log.error("[AcTrView2d] Failed to convert entity ".concat(entity.objectId, " (").concat(entity.type, "):"), error_2);
+                                        error_3 = _e.sent();
+                                        log.error("[AcTrView2d] Failed to convert entity ".concat(entity.objectId, " (").concat(entity.type, "):"), error_3);
                                         return [3 /*break*/, 11];
                                     case 10:
                                         // Counter was reset in clear() when the epoch advanced; do not
@@ -3687,7 +3798,7 @@ 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 objectId, children, objectsGroupByLayer, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex;
-            var e_15, _a;
+            var e_16, _a;
             var _this = this;
             var _b, _c;
             if (epoch === void 0) { epoch = this._convertEpoch; }
@@ -3737,12 +3848,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 child.parent = null;
                             }
                         }
-                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
                         finally {
                             try {
                                 if (children_1_1 && !children_1_1.done && (_a = children_1.return)) _a.call(children_1);
                             }
-                            finally { if (e_15) throw e_15.error; }
+                            finally { if (e_16) throw e_16.error; }
                         }
                         renderContext = group.renderContext;
                         groupObjectId = group.objectId;
@@ -3822,7 +3933,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                         if (progressive) {
                             this.markProgressiveDirty();
                             this._progressiveOpenFit.afterGeometryBatch(function () {
-                                return _this.resolveLayoutFitBox();
+                                return _this.getDrawingExtents();
                             });
                         }
                         return [2 /*return*/];
@@ -3855,7 +3966,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         if (!this._openLineworkFramePending || this.isConvertingEntities) {
             return;
         }
-        var box = this.resolveLayoutFitBox();
+        var box = this.getDrawingExtents();
         if (!box || box.isEmpty()) {
             this._openLineworkFramePending = false;
             return;