@xtctwins/tctwins-bimx-viewer 0.1.12 → 0.1.13

package/dist/tctwins-bimx-viewer.min.es.js

@@ -69856,9 +69856,10 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
         this._eventTrigger = new _EventTrigger__WEBPACK_IMPORTED_MODULE_2__["default"]();
         this.navCubeCanvasElement = cfg.navCubeCanvasElement;
         this.viewerElement = cfg.viewerElement;
-        this._modelId = cfg.modelId;
+        this._multiModel = cfg.multiModel ? cfg.multiModel : false;
         this._hasOutlier = false;
         this._outlierObjectIds = [];
+        this._projectId = cfg.projectId ? cfg.projectId : "";
         this.viewer = viewer;
         // this._objectsKdTree3 = new ObjectsKdTree3({
         //   viewer
@@ -69868,12 +69869,11 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
             enableEditModels: false,
             modelFromOutSide: true,
             modelType: cfg.modelType,
-            modelContent: cfg.modelContent,
             modelSrc: cfg.modelSrc ? cfg.modelSrc : "/",
-            modelMetaData: cfg.modelMetaData,
             modelConfig: cfg.modelConfig,
             IfcAPI: cfg.IfcAPI,
-            WebIFC: cfg.WebIFC
+            WebIFC: cfg.WebIFC,
+            multiModel: this._multiModel
         });
         this._objectsExplorer = new _explorer_ObjectsExplorer__WEBPACK_IMPORTED_MODULE_12__["default"](this, {
             modelType: cfg.modelType
@@ -69921,7 +69921,7 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
         });
         this._hideTool = new _toolbar_HideTool__WEBPACK_IMPORTED_MODULE_7__["default"](this, {});
         this._annotationTool = new _toolbar_AnnotationTool__WEBPACK_IMPORTED_MODULE_17__["default"](this, {
-            modelId: this._modelId
+            modelId: this._projectId
         });
         this._measureTool = new _toolbar_MeasureTool__WEBPACK_IMPORTED_MODULE_18__["default"](this, {});
         this._sectionTool = new _toolbar_SectionTool__WEBPACK_IMPORTED_MODULE_9__["default"](this, {});
@@ -69965,6 +69965,9 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
     get eventTrigger() {
         return this._eventTrigger;
     }
+    get multiModel() {
+        return this._multiModel;
+    }
     /**
      * Returns the LocaleService that was configured on this Viewer.
      *
@@ -70319,8 +70322,8 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
      *
      * @returns {String[]} The IDs of the models in the currently loaded project.
      */
-    modelId() {
-        return this._modelId;
+    projectId() {
+        return this._projectId;
     }
     /**
      * Loads a model into the viewer.
@@ -70331,15 +70334,15 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
      * @param {Function} done Callback invoked on success.
      * @param {Function} error Callback invoked on failure, into which the error message string is passed.
      */
-    loadModel(done = () => { }, error = () => { }) {
-        this._modelsExplorer.loadModel(this._modelId, done, error);
+    loadModel(modelId, modelBuffer, done = () => { }, error = () => { }) {
+        this._modelsExplorer.loadModel(modelId, modelBuffer, done, error);
     }
     /**
      * 单独加载元数据
      * @param deflatedMetadata
      */
-    loadMetadata(deflatedMetadata, force = true, done = () => { }) {
-        this._modelsExplorer.loadMetadata(this.viewer.metaScene.metaModels[this._modelId], deflatedMetadata, force, () => {
+    loadMetadata(modelId, deflatedMetadata, force = true, done = () => { }) {
+        this._modelsExplorer.loadMetadata(modelId, deflatedMetadata, force, () => {
             this._metaLoaded = true;
             if (this._focusPartial) {
                 this.viewFitPartial(0, done);
@@ -70415,8 +70418,8 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
      * 获取模型信息
      * @returns
      */
-    getModelInfo() {
-        const metaModel = this.viewer.metaScene.metaModels[this._modelId];
+    getModelInfo(modelId) {
+        const metaModel = this.viewer.metaScene.metaModels[modelId];
         const modelInfo = {
             id: metaModel.id,
             createDate: metaModel.createdAt ? metaModel.createdAt : "",
@@ -70426,6 +70429,9 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
         };
         return modelInfo;
     }
+    getMetaModel(modelId) {
+        return this.viewer.metaScene.metaModels[modelId];
+    }
     //------------------------------------------------------------------------------------------------------------------
     // 视图设置
     //------------------------------------------------------------------------------------------------------------------
@@ -70768,7 +70774,7 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
             this._hasOutlier = true;
             this._outlierObjectIds = exceptionIDs;
         }
-        const model = this.viewer.scene.models[this._modelId];
+        const model = this.viewer.scene.models[this._projectId];
         const newExceptionsIds = exceptionIDs.concat(model.exceptionIds);
         model.exceptionIds = newExceptionsIds;
         this.viewer.scene.setObjectsVisible(newExceptionsIds, false);
@@ -72280,9 +72286,8 @@ class ModelsExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"]
     constructor(parent, cfg) {
         super(parent, cfg);
         this._modelFromOutSide = cfg.modelFromOutSide;
+        this._projectId = cfg.projectId;
         this._modelType = cfg.modelType;
-        this._modelArrayBuffer = cfg.modelContent;
-        this._modelMetaData = cfg.modelMetaData;
         this._modelSrc = cfg.modelSrc;
         this._eventTrigger = parent.eventTrigger;
         this._dataSource = new BIMViewerDataSource(this.server, {
@@ -72317,7 +72322,6 @@ class ModelsExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"]
         this._modelsInfo = {};
         this._numModels = 0;
         this._numModelsLoaded = 0;
-        this._projectId = null;
     }
     /**
      *
@@ -72325,57 +72329,81 @@ class ModelsExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"]
     getModelIds() {
         return Object.keys(this._modelsInfo);
     }
+    getModelInfo(modelId) {
+        return this._modelsInfo[modelId];
+    }
     /**
      * @param {string} modelId
      * @param {Function} done
      * @param {Function} error
      */
-    loadModel(modelId, done = () => { }, error = () => { }) {
-        let modelInfo = this._modelsInfo[modelId];
-        if (!modelInfo) {
-            modelInfo = {
-                id: "testModel",
-                name: "testModel",
-                objectColorSource: "model",
+    loadModel(modelId, modelBuffer, done = () => { }, error = () => { }) {
+        if (this._modelType == "ifc") {
+            this._modelsInfo[modelId] = {
+                id: modelId,
+                ifc: modelBuffer,
+                metaBuffer: null,
+                edges: true,
+                loadMetadata: false,
+                saoEnabled: true,
+                pbrEnabled: true,
+                dtxEnabled: true
+            };
+        }
+        else {
+            this._modelsInfo[modelId] = {
+                id: modelId,
+                xtc: modelBuffer,
+                metaBuffer: null,
                 edges: true,
+                loadMetadata: false,
                 saoEnabled: true,
-                pbrEnabled: true
+                pbrEnabled: true,
+                dtxEnabled: true
             };
         }
-        this._loadGeometry(modelId, modelInfo, this._modelMetaData, done, error);
+        this._loadGeometry(modelId, done, error);
+    }
+    /**
+     * 销毁已载入模型
+     * @param {string} modelId
+     * @returns
+     */
+    unloadModel(modelId) {
+        const model = this.viewer.scene.models[modelId];
+        if (!model) {
+            this.error("Model not loaded: " + modelId);
+            return;
+        }
+        model.destroy();
+        this.fire("modelUnloaded", modelId);
     }
     /**
      * 单独加载元数据
      * @param metaModel
      * @param deflatedMetadata
      */
-    loadMetadata(metaModel, deflatedMetadata, force, done) {
-        if (this._xtcLoader)
-            this._xtcLoader.loadMetadata(metaModel, deflatedMetadata, force, done);
+    loadMetadata(modelId, deflatedMetadata, force, done) {
+        if (this._xtcLoader) {
+            if (this._modelsInfo[modelId]) {
+                this._modelsInfo[modelId].metaBuffer = deflatedMetadata;
+            }
+            this._xtcLoader.loadMetadata(this.viewer.metaScene.metaModels[modelId], deflatedMetadata, force, done);
+        }
     }
     /**
      * @param {string} modelId
-     * @param {*} modelInfo
      * @param {*} json
      * @param {Function} done
      * @param {Function} error
      */
-    _loadGeometry(modelId, modelInfo, json, done, error) {
+    _loadGeometry(modelId, done, error) {
+        const modelInfo = this._modelsInfo[modelId];
         const modelLoaded = () => {
-            this._numModelsLoaded += 1;
-            if (this._numModelsLoaded === 1) {
-                // Jump camera to view-fit first model loaded
-                this._jumpToInitialCamera();
-                this.fire("modelLoaded", modelId);
-                if (done) {
-                    done();
-                }
-            }
-            else {
-                this.fire("modelLoaded", modelId);
-                if (done) {
-                    done();
-                }
+            this._jumpToInitialCamera();
+            this.fire("modelLoaded", modelId);
+            if (done) {
+                done();
             }
         };
         const loadError = (errMsg) => {
@@ -72384,44 +72412,11 @@ class ModelsExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"]
                 error(errMsg);
             }
         };
-        if (modelInfo.manifest) {
-            // Load multi-part split model;
-            // Uses the BIMViewerDataSource, which then uses the BIMViewer's Server strategy
-            this._dataSource.setProjectId(this._projectId);
-            this._dataSource.setModelId(modelId);
-            if (this._xtcLoader) {
-                const model = this._xtcLoader.load({
-                    id: modelId,
-                    manifestSrc: modelInfo.manifest,
-                    // objectDefaults,
-                    excludeUnclassifiedObjects: true,
-                    origin: modelInfo.origin || modelInfo.position,
-                    scale: modelInfo.scale,
-                    rotation: modelInfo.rotation,
-                    matrix: modelInfo.matrix,
-                    edges: modelInfo.edges !== false,
-                    saoEnabled: modelInfo.saoEnabled,
-                    pbrEnabled: modelInfo.pbrEnabled,
-                    backfaces: modelInfo.backfaces,
-                    globalizeObjectIds: modelInfo.globalizeObjectIds,
-                    reuseGeometries: modelInfo.reuseGeometries !== false
-                });
-                model.on("loaded", modelLoaded);
-                model.on("error", loadError);
-            }
-        }
-        else if (this._modelType == "ifc") {
+        if (this._modelType == "ifc") {
             if (this._ifcLoader) {
                 if (this._modelFromOutSide) {
                     this.log("加载从外部传入的ifc模型...");
-                    const model = this._ifcLoader.load({
-                        id: modelId,
-                        ifc: this._modelArrayBuffer,
-                        edges: this._modelConfig.edges ? this._modelConfig.edges : false,
-                        loadMetadata: false,
-                        dtxEnabled: true,
-                        metadata: json
-                    });
+                    const model = this._ifcLoader.load(modelInfo);
                     model.on("loaded", modelLoaded);
                     model.on("error", loadError);
                 }
@@ -72430,12 +72425,10 @@ class ModelsExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"]
                     const model = this._ifcLoader.load({
                         id: modelId,
                         src: this._modelSrc,
-                        edges: this._modelConfig.edges !== undefined ? this._modelConfig.edges : false,
+                        edges: modelInfo.edges,
                         loadMetadata: false,
-                        metadata: json,
-                        // pbrEnabled: true,
-                        dtxEnabled: true
-                        // excludeUnclassifiedObjects: true
+                        pbrEnabled: modelInfo.pbrEnabled,
+                        dtxEnabled: modelInfo.dtxEnabled
                     });
                     model.on("loaded", modelLoaded);
                     model.on("error", loadError);
@@ -72445,22 +72438,7 @@ class ModelsExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"]
         else if (this._xtcLoader) {
             if (this._modelFromOutSide) {
                 this.log("加载从外部传入的xtc模型...");
-                const model = this._xtcLoader.load({
-                    id: modelId,
-                    metaModelData: json,
-                    xtc: this._modelArrayBuffer,
-                    // objectDefaults,
-                    origin: modelInfo.origin || modelInfo.position,
-                    scale: modelInfo.scale,
-                    rotation: modelInfo.rotation,
-                    matrix: modelInfo.matrix,
-                    edges: this._modelConfig.edges ? this._modelConfig.edges : false,
-                    saoEnabled: modelInfo.saoEnabled,
-                    pbrEnabled: modelInfo.pbrEnabled,
-                    backfaces: modelInfo.backfaces,
-                    globalizeObjectIds: modelInfo.globalizeObjectIds,
-                    reuseGeometries: modelInfo.reuseGeometries !== false
-                });
+                const model = this._xtcLoader.load(modelInfo);
                 model.on("loaded", modelLoaded);
                 model.on("error", loadError);
             }
@@ -73973,11 +73951,9 @@ class CommentsTool extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"] {
         this._revocationMechanism = null;
         this.on("active", (active) => {
             if (active) {
-                // this.saveSVG();
-                // this.endCommentsTool();
+                this.saveSVG();
             }
             else {
-                // this.endCommentsTool();
                 this.endCommentsTool();
             }
         });
@@ -76077,8 +76053,14 @@ class FitAction extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"] {
     fit(callback) {
         const { viewer } = this;
         const { scene } = viewer;
-        const { aabb } = scene;
         const { center } = scene;
+        let aabb;
+        if (this.bimViewer.multiModel) {
+            aabb = scene.getAABB(scene.visibleObjectIds);
+        }
+        else {
+            aabb = scene.aabb;
+        }
         const diag = _xtctwins_tctwins_core__WEBPACK_IMPORTED_MODULE_0__.math.getAABB3Diag(aabb);
         viewer.cameraControl.pivotPos = center;
         if (viewer.cameraControl.planView)
@@ -77225,8 +77207,13 @@ class ResetAction extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"] {
     _resetCamera(callback) {
         const { viewer } = this;
         const { scene } = viewer;
-        const { aabb } = scene;
-        // const aabb = scene.getAABB(scene.visibleObjectIds);
+        let aabb;
+        if (this.bimViewer.multiModel) {
+            aabb = scene.getAABB(scene.visibleObjectIds);
+        }
+        else {
+            aabb = scene.aabb;
+        }
         const diag = _xtctwins_tctwins_core__WEBPACK_IMPORTED_MODULE_0__.math.getAABB3Diag(aabb);
         const center = _xtctwins_tctwins_core__WEBPACK_IMPORTED_MODULE_0__.math.getAABB3Center(aabb, tempVec3a);
         const { camera } = scene;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtctwins/tctwins-bimx-viewer",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "private": false,
   "description": "BIM viewer built on xtctwins",
   "main": "./dist/tctwins-bimx-viewer.min.es.js",

package/types/src/BIMXViewer.d.ts

@@ -44,7 +44,8 @@ export default class BIMXViewer extends Controller {
     protected _eventTrigger: EventTrigger;
     private navCubeCanvasElement;
     private viewerElement;
-    private _modelId;
+    private _projectId;
+    private _multiModel;
     protected _configs: any;
     protected _disableClickEvent: boolean;
     /** 是否有异常构建 */
@@ -68,6 +69,7 @@ export default class BIMXViewer extends Controller {
      */
     constructor(cfg?: any);
     get eventTrigger(): EventTrigger;
+    get multiModel(): boolean;
     /**
      * Returns the LocaleService that was configured on this Viewer.
      *
@@ -124,7 +126,7 @@ export default class BIMXViewer extends Controller {
      *
      * @returns {String[]} The IDs of the models in the currently loaded project.
      */
-    modelId(): string;
+    projectId(): string;
     /**
      * Loads a model into the viewer.
      *
@@ -134,12 +136,12 @@ export default class BIMXViewer extends Controller {
      * @param {Function} done Callback invoked on success.
      * @param {Function} error Callback invoked on failure, into which the error message string is passed.
      */
-    loadModel(done?: (result?: any) => void, error?: (errorMsg: string) => void): void;
+    loadModel(modelId: string, modelBuffer: ArrayBuffer, done?: (result?: any) => void, error?: (errorMsg: string) => void): void;
     /**
      * 单独加载元数据
      * @param deflatedMetadata
      */
-    loadMetadata(deflatedMetadata: Buffer, force?: boolean, done?: (content?: any) => void): void;
+    loadMetadata(modelId: string, deflatedMetadata: Buffer, force?: boolean, done?: (content?: any) => void): void;
     /**
      * Sets where the colors for model objects will be loaded from.
      *
@@ -168,13 +170,14 @@ export default class BIMXViewer extends Controller {
      * 获取模型信息
      * @returns
      */
-    getModelInfo(): {
+    getModelInfo(modelId: string): {
         id: string | number;
         createDate: string;
         author: string;
         objectCount: string | number;
         propertySetCount: string | number;
     };
+    getMetaModel(modelId: string): import("@xtctwins/tctwins-core").MetaModel;
     protected _withObjectsInSubtree(objectIds: string[], callback?: (content?: any) => void): void;
     /**
      * Flies the camera to fit the given object in view.

package/types/src/explorer/ModelsExplorer.d.ts

@@ -59,8 +59,6 @@ export default class ModelsExplorer extends Controller {
     protected _projectId: string | null;
     protected _modelFromOutSide: boolean;
     protected _modelType: string;
-    protected _modelArrayBuffer: ArrayBuffer;
-    protected _modelMetaData: any;
     protected _modelSrc: string;
     protected _modelConfig: any;
     protected _eventTrigger: EventTrigger;
@@ -74,26 +72,32 @@ export default class ModelsExplorer extends Controller {
      *
      */
     getModelIds(): string[];
+    getModelInfo(modelId: string): any;
     /**
      * @param {string} modelId
      * @param {Function} done
      * @param {Function} error
      */
-    loadModel(modelId: string, done?: Function, error?: Function): void;
+    loadModel(modelId: string, modelBuffer: ArrayBuffer, done?: Function, error?: Function): void;
+    /**
+     * 销毁已载入模型
+     * @param {string} modelId
+     * @returns
+     */
+    unloadModel(modelId: string): void;
     /**
      * 单独加载元数据
      * @param metaModel
      * @param deflatedMetadata
      */
-    loadMetadata(metaModel: any, deflatedMetadata: any, force: boolean, done?: Function): void;
+    loadMetadata(modelId: string, deflatedMetadata: any, force: boolean, done?: Function): void;
     /**
      * @param {string} modelId
-     * @param {*} modelInfo
      * @param {*} json
      * @param {Function} done
      * @param {Function} error
      */
-    protected _loadGeometry(modelId: string, modelInfo: any, json: any, done: Function, error: Function): void;
+    protected _loadGeometry(modelId: string, done: Function, error: Function): void;
     /**
      *
      */