@shapediver/viewer.data-engine.tag3d-engine 3.5.1 → 3.5.3

package/dist/Tag3dEngine.d.ts

@@ -1,10 +1,32 @@
 import { ITreeNode } from '@shapediver/viewer.shared.node-tree';
 import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2';
+/**
+ * The font info object contains the glb file path and the dimensions of the font.
+ *
+ * There can either be a single glb file for both ascii and non-ascii characters or separate glb files for each.
+ * The advantage of having separate glb files is that the ascii glb can be loaded once and the non-ascii glb can be loaded only when needed.
+ */
+export declare type FontInfo = {
+    glb: string;
+    height: number;
+    width: number;
+} | {
+    glb: {
+        ascii: string;
+        other: string;
+    };
+    height: number;
+    width: number;
+};
 export declare class Tag3dEngine {
-    private readonly _globalAccessObjects;
-    private readonly _stateEngine;
+    private readonly _logger;
+    private static _asciiGlb;
+    private static _fontInfo;
     private static _instance;
+    private static _mainGlb;
+    private static _nonAsciiGlb;
     static get instance(): Tag3dEngine;
+    static setFontInfo(fontInfo: FontInfo): void;
     /**
      * Load the tag3d content into a scene graph node.
      *
@@ -12,5 +34,16 @@ export declare class Tag3dEngine {
      * @returns the scene graph node
      */
     loadContent(content: ShapeDiverResponseOutputContent): Promise<ITreeNode>;
+    /**
+     * Load the tag 3d content into separate characters.
+     * For each character, a node is created and the character is added as a geometry data object.
+     * The nodes are then added to a dictionary with the character as the key.
+     *
+     * Instance matrices are provided depending on the number of instances of the character.
+     *
+     * @param tag3dInfo
+     * @returns
+     */
+    private loadTag;
 }
 //# sourceMappingURL=Tag3dEngine.d.ts.map

package/dist/Tag3dEngine.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"Tag3dEngine.d.ts","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AAOtF;;;;;GAKG;AACH,oBAAY,QAAQ,GAAG;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB,GAAG;IACA,GAAG,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAMF,qBAAa,WAAW;IAGpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAwB;IAChD,OAAO,CAAC,MAAM,CAAC,SAAS,CAOtB;IACF,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IACtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAwB;IAC/C,OAAO,CAAC,MAAM,CAAC,YAAY,CAAwB;IAMnD,WAAkB,QAAQ,gBAEzB;WAMa,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAW5C;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;IA6FtF;;;;;;;;;OASG;YACW,OAAO;CAmKxB"}

package/dist/Tag3dEngine.js

@@ -11,22 +11,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 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");
+const viewer_data_engine_geometry_engine_1 = require("@shapediver/viewer.data-engine.geometry-engine");
+const gl_matrix_1 = require("gl-matrix");
+// #endregion Type aliases (1)
+// #region Classes (1)
 class Tag3dEngine {
     constructor() {
-        // #region Properties (3)
-        this._globalAccessObjects = viewer_shared_global_access_objects_1.GlobalAccessObjects.instance;
-        this._stateEngine = viewer_shared_services_1.StateEngine.instance;
-        // #endregion Public Methods (1)
+        // #region Properties (6)
+        this._logger = viewer_shared_services_1.Logger.instance;
+        // #endregion Private Methods (1)
     }
-    // #endregion Properties (3)
+    // #endregion Properties (6)
     // #region Public Static Getters And Setters (1)
     static get instance() {
         return this._instance || (this._instance = new this());
     }
     // #endregion Public Static Getters And Setters (1)
+    // #region Public Static Methods (1)
+    static setFontInfo(fontInfo) {
+        this._fontInfo = fontInfo;
+        this._mainGlb = undefined;
+        this._asciiGlb = undefined;
+        this._nonAsciiGlb = undefined;
+    }
+    // #endregion Public Static Methods (1)
     // #region Public Methods (1)
     /**
      * Load the tag3d content into a scene graph node.
@@ -39,23 +49,72 @@ class Tag3dEngine {
             const node = new viewer_shared_node_tree_1.TreeNode('tag3d');
             if (!content)
                 throw new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: Invalid content was provided to tag3d engine.');
+            if (typeof Tag3dEngine._fontInfo.glb === 'string') {
+                // if there is a single glb for both ascii and non-ascii characters defined
+                // but the glb has not been loaded yet, we load it now
+                if (!Tag3dEngine._mainGlb) {
+                    const geometryEngine = viewer_data_engine_geometry_engine_1.GeometryEngine.instance;
+                    Tag3dEngine._mainGlb = yield geometryEngine.loadContent({
+                        href: Tag3dEngine._fontInfo.glb,
+                        format: 'glb'
+                    }, 'Tag3dEngine.loadContent');
+                }
+            }
+            else {
+                // if there are separate glbs for ascii and non-ascii characters defined
+                // but the glb for ascii has not been loaded yet, we load it now
+                // the glb for non-ascii characters is loaded when the character is encountered
+                if (!Tag3dEngine._asciiGlb) {
+                    const geometryEngine = viewer_data_engine_geometry_engine_1.GeometryEngine.instance;
+                    Tag3dEngine._asciiGlb = yield geometryEngine.loadContent({
+                        href: Tag3dEngine._fontInfo.glb.ascii,
+                        format: 'glb'
+                    }, 'Tag3dEngine.loadContent');
+                }
+            }
             if (content.data && Array.isArray(content.data)) {
-                if (this._globalAccessObjects.loadTag3D) {
-                    for (let i = 0; i < content.data.length; i++) {
-                        const tag3dInfo = content.data[i];
-                        const child = this._globalAccessObjects.loadTag3D(tag3dInfo);
-                        if (child)
-                            node.addChild(child);
-                    }
+                const textTagDictionary = {};
+                const dictionaryPromises = [];
+                for (let i = 0; i < content.data.length; i++) {
+                    const tag3dInfo = content.data[i];
+                    const dictionary = this.loadTag(tag3dInfo);
+                    if (dictionary)
+                        dictionaryPromises.push(dictionary);
                 }
-                else {
-                    const customData = new viewer_shared_types_1.CustomData({});
-                    for (let i = 0; i < content.data.length; i++) {
-                        const tag3dInfo = content.data[i];
-                        customData.data['tag3d_' + tag3dInfo.version] = tag3dInfo;
+                yield Promise.all(dictionaryPromises).then((dictionaries) => {
+                    for (const dictionary of dictionaries) {
+                        for (const key in dictionary) {
+                            if (textTagDictionary[key] === undefined) {
+                                textTagDictionary[key] = dictionary[key];
+                            }
+                            else {
+                                textTagDictionary[key].transformations.push(...dictionary[key].transformations);
+                            }
+                        }
+                    }
+                });
+                const tag3dNode = new viewer_shared_node_tree_1.TreeNode('tag3dDictionary');
+                for (const key in textTagDictionary) {
+                    const { characterNode, transformations } = textTagDictionary[key];
+                    const meshNode = new viewer_shared_node_tree_1.TreeNode('mesh_' + key);
+                    meshNode.addChild(characterNode);
+                    if (transformations.length === 1) {
+                        // there is only once instance of the character
+                        // we add it as usual
+                        meshNode.addTransformation({
+                            id: 'tag3d_transformation',
+                            matrix: transformations[0]
+                        });
+                    }
+                    else {
+                        // there are multiple instances of the character
+                        // we therefore create an instance matrices data object
+                        const instanceData = new viewer_shared_types_1.InstanceMatricesData(transformations);
+                        meshNode.addData(instanceData);
                     }
-                    node.addData(customData);
+                    tag3dNode.addChild(meshNode);
                 }
+                node.addChild(tag3dNode);
             }
             else {
                 throw new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: No tag3d data was provided to tag3d engine.');
@@ -63,6 +122,157 @@ class Tag3dEngine {
             return node;
         });
     }
+    // #endregion Public Methods (1)
+    // #region Private Methods (1)
+    /**
+     * Load the tag 3d content into separate characters.
+     * For each character, a node is created and the character is added as a geometry data object.
+     * The nodes are then added to a dictionary with the character as the key.
+     *
+     * Instance matrices are provided depending on the number of instances of the character.
+     *
+     * @param tag3dInfo
+     * @returns
+     */
+    loadTag(tag3dInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const characterGlb = Tag3dEngine._fontInfo.glb === 'string' ? Tag3dEngine._mainGlb : Tag3dEngine._asciiGlb;
+            const material = new viewer_shared_types_1.MaterialStandardData({ color: tag3dInfo.color, metalness: 0, roughness: 1 });
+            tag3dInfo.size = tag3dInfo.size ? +tag3dInfo.size : 1;
+            if (tag3dInfo.text === undefined || tag3dInfo.text === '' || /^[ \t\n\r]*$/.test(tag3dInfo.text))
+                return;
+            // split into lines
+            const lines = tag3dInfo.text.split(/\r\n|\r|\n/g);
+            // split into characters per line
+            const charactersPerLine = lines.map(line => line.split(''));
+            const characterWidth = Tag3dEngine._fontInfo.width / 1000;
+            const characterHeight = (Tag3dEngine._fontInfo.height / 1000) * 1.25;
+            let maxLineWidth = 0;
+            const maxLineHeight = characterHeight * charactersPerLine.length;
+            let lineHeight = -characterHeight;
+            const characterDictionary = {};
+            for (let i = 0; i < charactersPerLine.length; ++i) {
+                const characters = charactersPerLine[i];
+                if (characters.length === 0)
+                    continue;
+                let lineWidth = 0;
+                // loop through characters in line
+                for (let j = 0; j < characters.length; ++j) {
+                    const char = characters[j];
+                    let nodesWithName = characterGlb.getNodesByName(char);
+                    if (nodesWithName.length === 0) {
+                        if (typeof Tag3dEngine._fontInfo.glb !== 'string') {
+                            // if the character is not found in the ascii glb, try to load the non-ascii glb
+                            // and search for the character there
+                            if (!Tag3dEngine._nonAsciiGlb) {
+                                const geometryEngine = viewer_data_engine_geometry_engine_1.GeometryEngine.instance;
+                                Tag3dEngine._nonAsciiGlb = yield geometryEngine.loadContent({
+                                    href: Tag3dEngine._fontInfo.glb.other,
+                                    format: 'glb'
+                                }, 'Tag3dEngine.loadContent');
+                            }
+                            nodesWithName = Tag3dEngine._nonAsciiGlb.getNodesByName(char);
+                        }
+                    }
+                    if (nodesWithName.length !== 0) {
+                        const transformationMatrix = gl_matrix_1.mat4.fromTranslation(gl_matrix_1.mat4.create(), gl_matrix_1.vec3.fromValues(lineWidth, lineHeight, 0));
+                        if (characterDictionary[char] === undefined) {
+                            // if the character does not exist yet, create it
+                            const characterNode = new viewer_shared_node_tree_1.TreeNode(char);
+                            nodesWithName.forEach(n => {
+                                n.traverseData((data) => {
+                                    if (data instanceof viewer_shared_types_1.GeometryData) {
+                                        const clone = data.clone();
+                                        clone.material = material;
+                                        characterNode.addData(clone);
+                                    }
+                                });
+                            });
+                            characterDictionary[char] = {
+                                characterNode,
+                                transformations: [transformationMatrix]
+                            };
+                        }
+                        else {
+                            // if the character already exists, add the transformation matrix to the list
+                            characterDictionary[char].transformations.push(transformationMatrix);
+                        }
+                    }
+                    else {
+                        if (char !== ' ')
+                            this._logger.warn(`Tag3dEngine.loadContent: Character ${char} not found in font.`);
+                    }
+                    lineWidth += characterWidth * tag3dInfo.size;
+                }
+                maxLineWidth = Math.max(maxLineWidth, lineWidth);
+                lineHeight -= characterHeight * tag3dInfo.size;
+            }
+            const tagJustTranslation = gl_matrix_1.vec3.create();
+            switch (tag3dInfo.justification) {
+                case 'TL':
+                    break;
+                case 'TC':
+                    tagJustTranslation[0] = -maxLineWidth * 0.5;
+                    break;
+                case 'TR':
+                    tagJustTranslation[0] = -maxLineWidth;
+                    break;
+                case 'ML':
+                    tagJustTranslation[1] = maxLineHeight * 0.5;
+                    break;
+                case 'MC':
+                    tagJustTranslation[0] = -maxLineWidth * 0.5;
+                    tagJustTranslation[1] = maxLineHeight * 0.5;
+                    break;
+                case 'MR':
+                    tagJustTranslation[0] = -maxLineWidth;
+                    tagJustTranslation[1] = maxLineHeight * 0.5;
+                    break;
+                case 'BL':
+                    tagJustTranslation[1] = maxLineHeight;
+                    break;
+                case 'BC':
+                    tagJustTranslation[0] = -maxLineWidth * 0.5;
+                    tagJustTranslation[1] = maxLineHeight;
+                    break;
+                case 'BR':
+                    tagJustTranslation[0] = -maxLineWidth;
+                    tagJustTranslation[1] = maxLineHeight;
+                    break;
+            }
+            const tagJustTranslationMatrix = gl_matrix_1.mat4.fromTranslation(gl_matrix_1.mat4.create(), tagJustTranslation);
+            const scalingMatrix = gl_matrix_1.mat4.fromScaling(gl_matrix_1.mat4.create(), gl_matrix_1.vec3.fromValues(tag3dInfo.size, tag3dInfo.size, tag3dInfo.size));
+            const rotationMatrix = gl_matrix_1.mat4.create();
+            const translationMatrix = gl_matrix_1.mat4.create();
+            if (tag3dInfo.location.xAxis !== undefined) {
+                gl_matrix_1.mat4.set(rotationMatrix, tag3dInfo.location.xAxis.X, tag3dInfo.location.xAxis.Y, tag3dInfo.location.xAxis.Z, 0, tag3dInfo.location.yAxis.X, tag3dInfo.location.yAxis.Y, tag3dInfo.location.yAxis.Z, 0, tag3dInfo.location.normal.X, tag3dInfo.location.normal.Y, tag3dInfo.location.normal.Z, 0, 0, 0, 0, 1);
+                gl_matrix_1.mat4.fromTranslation(translationMatrix, gl_matrix_1.vec3.fromValues(tag3dInfo.location.origin.X, tag3dInfo.location.origin.Y, tag3dInfo.location.origin.Z));
+            }
+            // add the justifications to the characters
+            Object.values(characterDictionary).forEach(character => {
+                character.transformations.forEach(transformation => {
+                    // apply the justification translation
+                    gl_matrix_1.mat4.multiply(transformation, transformation, tagJustTranslationMatrix);
+                    // apply the scaling matrix
+                    gl_matrix_1.mat4.multiply(transformation, transformation, scalingMatrix);
+                    // apply the global rotation matrix
+                    gl_matrix_1.mat4.multiply(transformation, rotationMatrix, transformation);
+                    // apply the global translation matrix
+                    gl_matrix_1.mat4.multiply(transformation, translationMatrix, transformation);
+                });
+            });
+            return characterDictionary;
+        });
+    }
 }
 exports.Tag3dEngine = Tag3dEngine;
+Tag3dEngine._fontInfo = {
+    glb: {
+        ascii: 'https://viewer.shapediver.com/v3/gltf/tag3dASCII.glb',
+        other: 'https://viewer.shapediver.com/v3/gltf/tag3dNonASCII.glb'
+    },
+    height: 1467,
+    width: 833
+};
+// #endregion Classes (1)
 //# 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;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"}
+{"version":3,"file":"Tag3dEngine.js","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapediver/viewer.data-engine.tag3d-engine",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "description": "",
   "keywords": [],
   "author": "Michael Oppitz <michael@shapediver.com>",
@@ -38,12 +38,13 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@shapediver/sdk.geometry-api-sdk-v2": "1.12.1",
-    "@shapediver/viewer.data-engine.shared-types": "3.5.1",
-    "@shapediver/viewer.shared.global-access-objects": "3.5.1",
-    "@shapediver/viewer.shared.node-tree": "3.5.1",
-    "@shapediver/viewer.shared.services": "3.5.1",
-    "@shapediver/viewer.shared.types": "3.5.1"
+    "@shapediver/sdk.geometry-api-sdk-v2": "1.12.2",
+    "@shapediver/viewer.data-engine.geometry-engine": "3.5.3",
+    "@shapediver/viewer.data-engine.shared-types": "3.5.3",
+    "@shapediver/viewer.shared.global-access-objects": "3.5.3",
+    "@shapediver/viewer.shared.node-tree": "3.5.3",
+    "@shapediver/viewer.shared.services": "3.5.3",
+    "@shapediver/viewer.shared.types": "3.5.3"
   },
-  "gitHead": "e0dca9d16a70198ada9e5b8681feaaf1af577746"
+  "gitHead": "b1bc8787be49ae7457f039df05b3c4013d365370"
 }