@shapediver/viewer.data-engine.tag3d-engine 3.0.4 → 3.0.6

package/dist/Tag3dEngine.d.ts

@@ -1,13 +1,10 @@
-import { ITag3D } from '@shapediver/viewer.data-engine.shared-types';
 import { ITreeNode } from '@shapediver/viewer.shared.node-tree';
 import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2';
 export declare class Tag3dEngine {
-    #private;
+    private readonly _globalAccessObjects;
     private readonly _stateEngine;
     private static _instance;
     static get instance(): Tag3dEngine;
-    get geometryCreator(): ((tag3dInfo: ITag3D) => ITreeNode | undefined) | undefined;
-    set geometryCreator(value: ((tag3dInfo: ITag3D) => ITreeNode | undefined) | undefined);
     /**
      * Load the tag3d content into a scene graph node.
      *

package/dist/Tag3dEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tag3dEngine.d.ts","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,6CAA6C,CAAC;AACrE,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AAGtF,qBAAa,WAAW;;IAGpB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqC;IAElE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IAQtC,WAAkB,QAAQ,gBAEzB;IAMD,IAAW,eAAe,IAIQ,CAAC,CAAC,SAAS,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,CAAC,GAAG,SAAS,CAF3F;IAED,IAAW,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,CAAC,GAAG,SAAS,EAE3F;IAMD;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;CA+BzF"}
+{"version":3,"file":"Tag3dEngine.d.ts","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AAGtF,qBAAa,WAAW;IAGpB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAqD;IAC1F,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqC;IAElE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IAMtC,WAAkB,QAAQ,gBAEzB;IAMD;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;CA4BzF"}

package/dist/Tag3dEngine.js

@@ -8,28 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _Tag3dEngine_geometryCreator;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tag3dEngine = void 0;
 const viewer_shared_types_1 = require("@shapediver/viewer.shared.types");
+const viewer_shared_global_access_objects_1 = require("@shapediver/viewer.shared.global-access-objects");
 const viewer_shared_node_tree_1 = require("@shapediver/viewer.shared.node-tree");
 const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
 class Tag3dEngine {
     constructor() {
         // #region Properties (3)
+        this._globalAccessObjects = viewer_shared_global_access_objects_1.GlobalAccessObjects.instance;
         this._stateEngine = viewer_shared_services_1.StateEngine.instance;
-        _Tag3dEngine_geometryCreator.set(this, void 0);
         // #endregion Public Methods (1)
     }
     // #endregion Properties (3)
@@ -38,14 +27,6 @@ class Tag3dEngine {
         return this._instance || (this._instance = new this());
     }
     // #endregion Public Static Getters And Setters (1)
-    // #region Public Getters And Setters (2)
-    get geometryCreator() {
-        return __classPrivateFieldGet(this, _Tag3dEngine_geometryCreator, "f");
-    }
-    set geometryCreator(value) {
-        __classPrivateFieldSet(this, _Tag3dEngine_geometryCreator, value, "f");
-    }
-    // #endregion Public Getters And Setters (2)
     // #region Public Methods (1)
     /**
      * Load the tag3d content into a scene graph node.
@@ -56,15 +37,13 @@ class Tag3dEngine {
     loadContent(content) {
         return __awaiter(this, void 0, void 0, function* () {
             const node = new viewer_shared_node_tree_1.TreeNode('tag3d');
-            if (this._stateEngine.fontLoaded.resolved === false)
-                yield this._stateEngine.fontLoaded;
             if (!content)
                 throw new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: Invalid content was provided to tag3d engine.');
             if (content.data && Array.isArray(content.data)) {
-                if (__classPrivateFieldGet(this, _Tag3dEngine_geometryCreator, "f")) {
+                if (this._globalAccessObjects.loadTag3D) {
                     for (let i = 0; i < content.data.length; i++) {
                         const tag3dInfo = content.data[i];
-                        const child = __classPrivateFieldGet(this, _Tag3dEngine_geometryCreator, "f").call(this, tag3dInfo);
+                        const child = this._globalAccessObjects.loadTag3D(tag3dInfo);
                         if (child)
                             node.addChild(child);
                     }
@@ -86,5 +65,4 @@ class Tag3dEngine {
     }
 }
 exports.Tag3dEngine = Tag3dEngine;
-_Tag3dEngine_geometryCreator = new WeakMap();
 //# sourceMappingURL=Tag3dEngine.js.map

package/dist/Tag3dEngine.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tag3dEngine.js","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAA6D;AAE7D,iFAA0E;AAE1E,+EAAsG;AAEtG,MAAa,WAAW;IAAxB;QACI,yBAAyB;QAER,iBAAY,GAAgB,oCAAW,CAAC,QAAQ,CAAC;QAIlE,+CAA6E;QA8D7E,gCAAgC;IACpC,CAAC;IA7DG,4BAA4B;IAE5B,gDAAgD;IAEzC,MAAM,KAAK,QAAQ;QACtB,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,mDAAmD;IAEnD,yCAAyC;IAEzC,IAAW,eAAe;QACtB,OAAO,uBAAA,IAAI,oCAAiB,CAAC;IACjC,CAAC;IAED,IAAW,eAAe,CAAC,KAAiE;QACxF,uBAAA,IAAI,gCAAoB,KAAK,MAAA,CAAC;IAClC,CAAC;IAED,4CAA4C;IAE5C,6BAA6B;IAE7B;;;;;OAKG;IACU,WAAW,CAAC,OAAwC;;YAC7D,MAAM,IAAI,GAAG,IAAI,kCAAQ,CAAC,OAAO,CAAC,CAAC;YAEnC,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,KAAK,KAAK;gBAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;YAEvC,IAAI,CAAC,OAAO;gBACR,MAAM,IAAI,4DAAmC,CAAC,wEAAwE,CAAC,CAAC;YAE5H,IAAI,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC7C,IAAI,uBAAA,IAAI,oCAAiB,EAAE;oBACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC1C,MAAM,SAAS,GAAW,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC1C,MAAM,KAAK,GAAG,uBAAA,IAAI,oCAAiB,MAArB,IAAI,EAAkB,SAAS,CAAC,CAAC;wBAC/C,IAAI,KAAK;4BAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACnC;iBACJ;qBAAM;oBACH,MAAM,UAAU,GAAG,IAAI,gCAAU,CAAC,EAAE,CAAC,CAAC;oBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC1C,MAAM,SAAS,GAAW,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC1C,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;qBAC7D;oBACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;iBAC5B;aACJ;iBAAM;gBACH,MAAM,IAAI,4DAAmC,CAAC,sEAAsE,CAAC,CAAC;aACzH;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;CAGJ;AAtED,kCAsEC"}
+{"version":3,"file":"Tag3dEngine.js","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAA6D;AAC7D,yGAAsF;AAEtF,iFAA0E;AAE1E,+EAAsG;AAEtG,MAAa,WAAW;IAAxB;QACI,yBAAyB;QAER,yBAAoB,GAAwB,yDAAmB,CAAC,QAAQ,CAAC;QACzE,iBAAY,GAAgB,oCAAW,CAAC,QAAQ,CAAC;QAiDlE,gCAAgC;IACpC,CAAC;IA9CG,4BAA4B;IAE5B,gDAAgD;IAEzC,MAAM,KAAK,QAAQ;QACtB,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,mDAAmD;IAEnD,6BAA6B;IAE7B;;;;;OAKG;IACU,WAAW,CAAC,OAAwC;;YAC7D,MAAM,IAAI,GAAG,IAAI,kCAAQ,CAAC,OAAO,CAAC,CAAC;YAEnC,IAAI,CAAC,OAAO;gBACR,MAAM,IAAI,4DAAmC,CAAC,wEAAwE,CAAC,CAAC;YAE5H,IAAI,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC7C,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE;oBACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC1C,MAAM,SAAS,GAAW,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;wBAC7D,IAAI,KAAK;4BAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACnC;iBACJ;qBAAM;oBACH,MAAM,UAAU,GAAG,IAAI,gCAAU,CAAC,EAAE,CAAC,CAAC;oBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC1C,MAAM,SAAS,GAAW,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC1C,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;qBAC7D;oBACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;iBAC5B;aACJ;iBAAM;gBACH,MAAM,IAAI,4DAAmC,CAAC,sEAAsE,CAAC,CAAC;aACzH;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;CAGJ;AAtDD,kCAsDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapediver/viewer.data-engine.tag3d-engine",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "",
   "keywords": [],
   "author": "Michael Oppitz <michael@shapediver.com>",
@@ -40,10 +40,11 @@
   },
   "dependencies": {
     "@shapediver/sdk.geometry-api-sdk-v2": "1.8.2",
-    "@shapediver/viewer.data-engine.shared-types": "3.0.4",
-    "@shapediver/viewer.shared.node-tree": "3.0.4",
-    "@shapediver/viewer.shared.services": "3.0.4",
-    "@shapediver/viewer.shared.types": "3.0.4"
+    "@shapediver/viewer.data-engine.shared-types": "3.0.6",
+    "@shapediver/viewer.shared.global-access-objects": "3.0.6",
+    "@shapediver/viewer.shared.node-tree": "3.0.6",
+    "@shapediver/viewer.shared.services": "3.0.6",
+    "@shapediver/viewer.shared.types": "3.0.6"
   },
-  "gitHead": "6e12b1f2978e96192ec1d331b7f7df50615631ee"
+  "gitHead": "c9a43ef749feeeb9b4825b6a25b37a06a62e78e9"
 }

package/src/Tag3dEngine.ts

@@ -1,4 +1,5 @@
 import { CustomData } from '@shapediver/viewer.shared.types';
+import { GlobalAccessObjects } from '@shapediver/viewer.shared.global-access-objects';
 import { ITag3D } from '@shapediver/viewer.data-engine.shared-types';
 import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree';
 import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2';
@@ -7,12 +8,11 @@ import { ShapeDiverViewerDataProcessingError, StateEngine } from '@shapediver/vi
 export class Tag3dEngine {
     // #region Properties (3)
 
+    private readonly _globalAccessObjects: GlobalAccessObjects = GlobalAccessObjects.instance;
     private readonly _stateEngine: StateEngine = StateEngine.instance;
 
     private static _instance: Tag3dEngine;
 
-    #geometryCreator: ((tag3dInfo: ITag3D) => ITreeNode | undefined) | undefined;
-
     // #endregion Properties (3)
 
     // #region Public Static Getters And Setters (1)
@@ -23,18 +23,6 @@ export class Tag3dEngine {
 
     // #endregion Public Static Getters And Setters (1)
 
-    // #region Public Getters And Setters (2)
-
-    public get geometryCreator() {
-        return this.#geometryCreator;
-    }
-
-    public set geometryCreator(value: ((tag3dInfo: ITag3D) => ITreeNode | undefined) | undefined) {
-        this.#geometryCreator = value;
-    }
-
-    // #endregion Public Getters And Setters (2)
-
     // #region Public Methods (1)
 
     /**
@@ -46,17 +34,14 @@ export class Tag3dEngine {
     public async loadContent(content: ShapeDiverResponseOutputContent): Promise<ITreeNode> {
         const node = new TreeNode('tag3d');
 
-        if (this._stateEngine.fontLoaded.resolved === false)
-            await this._stateEngine.fontLoaded;
-
         if (!content)
             throw new ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: Invalid content was provided to tag3d engine.');
 
         if (content.data && Array.isArray(content.data)) {
-            if (this.#geometryCreator) {
+            if (this._globalAccessObjects.loadTag3D) {
                 for (let i = 0; i < content.data.length; i++) {
                     const tag3dInfo: ITag3D = content.data[i];
-                    const child = this.#geometryCreator(tag3dInfo);
+                    const child = this._globalAccessObjects.loadTag3D(tag3dInfo);
                     if (child) node.addChild(child);
                 }
             } else {