@xtctwins/tctwins-core 1.0.31 → 1.0.32

package/dist/tctwins-core.es.js

@@ -15495,7 +15495,7 @@ const defaultCSS =
         margin: 0 auto;\
         width: 15%;\
         height: 15%;\
-        background-color: #ff8800;\
+        background-color: #66abdd;\
         border-radius: 100%;\
         -webkit-animation: sk-circleFadeDelay 1.2s infinite ease-in-out both;\
         animation: sk-circleFadeDelay 1.2s infinite ease-in-out both;\
@@ -15657,25 +15657,31 @@ class Spinner extends Component {
 			// Custom spinner element supplied
 			this._element = document.getElementById(cfg.elementId);
 			if (!this._element) {
-				this.error(
-					"Can't find given Spinner HTML element: '" + cfg.elementId + "' - will automatically create default element"
-				);
+				this._createDefaultSpinner(cfg.elementId);
 			} else {
 				this._adjustPosition();
 			}
+		} else {
+			this._createDefaultSpinner("engine_spinner");
 		}
 
-		if (!this._element) {
-			this._createDefaultSpinner();
-		}
+		this._processes = 0;
+	}
 
-		this.processes = 0;
+	get visible() {
+		return this._element.style["visibility"] === "visible";
+	}
+
+	set visible(visible) {
+		visible ? (this._element.style["visibility"] = "visible") : (this._element.style["visibility"] = "hidden");
 	}
 
 	/** @private */
-	_createDefaultSpinner() {
+	_createDefaultSpinner(elementId) {
+		console.log("_createDefaultSpinner");
 		this._injectDefaultCSS();
 		const element = document.createElement("div");
+		element.setAttribute("id", elementId);
 		const style = element.style;
 		style["z-index"] = "9000";
 		style.position = "absolute";
@@ -42272,7 +42278,8 @@ class AxisGizmoPlugin extends Plugin {
 			this._axisGizmoScene = new Scene(viewer, {
 				canvasId: cfg.canvasId,
 				canvasElement: cfg.canvasElement,
-				transparent: true
+				transparent: true,
+				spinnerElementId: "axisgizmoscene_spinner"
 			});
 		} catch (error) {
 			this.error(error);
@@ -100101,71 +100108,77 @@ class MetaModel {
 	 * Load metamodel data into this MetaModel.
 	 * @param metaModelData
 	 */
-	loadData(metaModelData, options = {}) {
+	// loadData(metaModelData, options = {}) {
+	loadData(metaModelData, done, err) {
 		if (this._finalized) {
 			throw "MetaScene already finalized - can't add more data";
 		}
-
-		if (metaModelData.author) this.author = metaModelData.author;
-		if (metaModelData.schema) this.schema = metaModelData.schema;
-		if (metaModelData.createdAt) this.createdAt = metaModelData.createdAt;
-		if (metaModelData.projectId) this.projectId = metaModelData.projectId;
-		if (metaModelData.revisionId) this.revisionId = metaModelData.revisionId;
-		if (metaModelData.objectCount) this.objectCount = metaModelData.objectCount;
-		if (metaModelData.propertySetCount) this.propertySetCount = metaModelData.propertySetCount;
-		if (metaModelData.creatingApplication) this.creatingApplication = metaModelData.creatingApplication;
-
-		// this._globalizeIDs(metaModelData, options);
-
-		const metaScene = this.metaScene;
-
-		if (metaModelData.propertySets) {
-			// for (let i = 0; i < metaModelData.propertySets.length; i++) {
-			// 	const propertySetData = metaModelData.propertySets[i];
-			// const metaId = propertySetData.id;
-
-			for (let metaId in metaModelData.propertySets) {
-				const propertySetData = metaModelData.propertySets[metaId];
-				let propertySet = new PropertySet({
-					id: propertySetData.id,
-					originalSystemId: propertySetData.originalSystemId || propertySetData.id,
-					type: propertySetData.type,
-					name: propertySetData.name,
-					properties: propertySetData.properties
-				});
-				metaScene.propertySets[metaId] = propertySet;
-				// propertySet.metaModels.push(this);
-				this.propertySets.push(propertySet);
+		try {
+			if (metaModelData.author) this.author = metaModelData.author;
+			if (metaModelData.schema) this.schema = metaModelData.schema;
+			if (metaModelData.createdAt) this.createdAt = metaModelData.createdAt;
+			if (metaModelData.projectId) this.projectId = metaModelData.projectId;
+			if (metaModelData.revisionId) this.revisionId = metaModelData.revisionId;
+			if (metaModelData.objectCount) this.objectCount = metaModelData.objectCount;
+			if (metaModelData.propertySetCount) this.propertySetCount = metaModelData.propertySetCount;
+			if (metaModelData.creatingApplication) this.creatingApplication = metaModelData.creatingApplication;
+
+			// this._globalizeIDs(metaModelData, options);
+
+			const metaScene = this.metaScene;
+
+			if (metaModelData.propertySets) {
+				// for (let i = 0; i < metaModelData.propertySets.length; i++) {
+				// 	const propertySetData = metaModelData.propertySets[i];
+				// const metaId = propertySetData.id;
+
+				for (let metaId in metaModelData.propertySets) {
+					const propertySetData = metaModelData.propertySets[metaId];
+					let propertySet = new PropertySet({
+						id: propertySetData.id,
+						originalSystemId: propertySetData.originalSystemId || propertySetData.id,
+						type: propertySetData.type,
+						name: propertySetData.name,
+						properties: propertySetData.properties
+					});
+					metaScene.propertySets[metaId] = propertySet;
+					// propertySet.metaModels.push(this);
+					this.propertySets.push(propertySet);
+				}
 			}
-		}
 
-		if (metaModelData.metaObjects) {
-			// for (let i = 0; i < metaModelData.metaObjects.length; i++) {
-			// 	const objectData = metaModelData.metaObjects[i];
-			// 	const metaId = objectData.id;
-
-			for (let metaId in metaModelData.metaObjects) {
-				const objectData = metaModelData.metaObjects[metaId];
-				let metaObject = new MetaObject({
-					id: metaId,
-					originalSystemId: metaId,
-					parentId: objectData.parent,
-					type: objectData.type,
-					name: objectData.name,
-					propertySetIds: objectData.propertySetIds,
-					external: objectData.external
-				});
-				metaObject.children = [];
-				metaObject.metaModels = [];
-				metaObject.metaModels.push(this);
-				metaScene.metaObjects[metaId] = metaObject;
-
-				this.metaObjects.push(metaObject);
-				if (!objectData.parent) {
-					this.rootMetaObjects.push(metaObject);
-					metaScene.rootMetaObjects[metaId] = metaObject;
+			if (metaModelData.metaObjects) {
+				// for (let i = 0; i < metaModelData.metaObjects.length; i++) {
+				// 	const objectData = metaModelData.metaObjects[i];
+				// 	const metaId = objectData.id;
+
+				for (let metaId in metaModelData.metaObjects) {
+					const objectData = metaModelData.metaObjects[metaId];
+					let metaObject = new MetaObject({
+						id: metaId,
+						originalSystemId: metaId,
+						parentId: objectData.parent,
+						type: objectData.type,
+						name: objectData.name,
+						propertySetIds: objectData.propertySetIds,
+						external: objectData.external
+					});
+					metaObject.children = [];
+					metaObject.metaModels = [];
+					metaObject.metaModels.push(this);
+					metaScene.metaObjects[metaId] = metaObject;
+
+					this.metaObjects.push(metaObject);
+					if (!objectData.parent) {
+						this.rootMetaObjects.push(metaObject);
+						metaScene.rootMetaObjects[metaId] = metaObject;
+					}
 				}
 			}
+			if (typeof done === "function") done();
+		} catch (error) {
+			if (typeof err === "function") err(error);
+			else this.log(err);
 		}
 	}
 
@@ -118450,7 +118463,8 @@ class NavCubePlugin extends Plugin {
 			this._navCubeScene = new Scene(viewer, {
 				canvasId: cfg.canvasId,
 				canvasElement: cfg.canvasElement,
-				transparent: true
+				transparent: true,
+				spinnerElementId: "navcube_spinner"
 			});
 
 			this._navCubeCanvas = this._navCubeScene.canvas.canvas;
@@ -123548,7 +123562,8 @@ class Overview$1 {
 
 		this._scene = new Scene(this._viewer, {
 			canvasId: this._canvas.id,
-			transparent: true
+			transparent: true,
+			spinnerElementId: "overviewer_spinner"
 		});
 		this._scene.clearLights();
 		new DirLight(this._scene, {
@@ -128499,8 +128514,9 @@ class TreeViewPlugin extends Plugin {
 			return;
 		}
 		if (this._metaModels[modelId]) {
-			this.warn("Model already added: " + modelId);
-			return;
+			this._metaModels[modelId] = null;
+			// this.warn("Model already added: " + modelId);
+			// return;
 		}
 		this._metaModels[modelId] = metaModel;
 
@@ -134583,11 +134599,12 @@ class XTCLoaderPlugin extends Plugin {
 					deflatedMetadata,
 					(worker) => {
 						worker.terminate();
-						this.fire("metaloaded", { result: "success", metaModel });
-						done();
+						this.fire("metaLoaded", { result: "success", metaModel });
+						if (typeof done === "function") done();
 					},
-					(err) => {
-						throw err;
+					(worker, error) => {
+						worker.terminate();
+						this.fire("metaLoaded", { result: "failed", message: error, metaModel });
 					}
 				);
 			}
@@ -134605,14 +134622,22 @@ class XTCLoaderPlugin extends Plugin {
 		});
 
 		worker.onmessage = function (e) {
-			plugin.fire("metaLoading");
-			metaModel.loadData(e.data.metaJson);
-			metaModel.finalize();
-			if (typeof done === "function") done(worker);
-			else worker.terminate();
+			plugin.fire("metaLoading", () => {
+				metaModel.loadData(
+					e.data.metaJson,
+					() => {
+						metaModel.finalize();
+						if (typeof done === "function") done(worker);
+						else worker.terminate();
+					},
+					(e) => {
+						if (typeof err === "function") err(worker, e);
+					}
+				);
+			});
 		};
 		worker.onerror = function (e) {
-			if (typeof err === "function") err(e);
+			if (typeof err === "function") err(worker, e.message);
 			worker.terminate();
 		};
 	}