@vitrosoftware/common-ui-ts 1.1.254 → 1.1.255

package/dist/index.js

@@ -67554,7 +67554,7 @@ var Viewer = function Viewer(props) {
 };
 
 var name = "@vitrosoftware/common-ui-ts";
-var version$1 = "1.1.254";
+var version$1 = "1.1.255";
 var description = "vitro software common ui ts";
 var author = "";
 var license = "MIT";

package/lib/xeokit/xeokit-sdk-2.6.10.es.js

@@ -41491,6 +41491,78 @@ const letters = {
             [21, 12]
         ]
     }
+
+    //Vitro
+    ,
+    'А': { width: 18, points: [[9, 21], [1, 0], [-1, -1], [9, 21], [17, 0], [-1, -1], [4, 7], [14, 7]] },
+    'Б': { width: 20, points: [[16, 21], [4, 21], [4, 0], [-1, -1], [4, 11], [12, 11], [15, 10], [16, 9], [17, 7], [17, 4], [16, 2], [14, 1], [11, 0], [4, 0]] },
+    'В': { width: 21, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [13, 21], [16, 20], [17, 19], [18, 17], [18, 15], [17, 13], [16, 12], [13, 11], [-1, -1], [4, 11], [13, 11], [16, 10], [17, 9], [18, 7], [18, 4], [17, 2], [16, 1], [13, 0], [4, 0]] },
+    'Г': { width: 18, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [16, 21]] },
+    'Д': { width: 22, points: [[0, 0], [0, 4], [4, 4], [7, 21], [15, 21], [18, 4], [20, 4], [20, 0], [20, 4], [0, 4]] },
+    'Е': { width: 19, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [17, 21], [-1, -1], [4, 11], [12, 11], [-1, -1], [4, 0], [17, 0]] },
+    'Ё': { width: 19, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [17, 21], [-1, -1], [4, 11], [12, 11], [-1, -1], [4, 0], [17, 0], [-1, -1], [7, 24], [7, 26], [-1, -1], [13, 24], [13, 26]] },
+    'Ж': { width: 24, points: [[2, 21], [12, 11], [2, 0], [-1, -1], [22, 21], [12, 11], [22, 0], [-1, -1], [12, 21], [12, 0]] },
+    'З': { width: 20, points: [[4, 18], [6, 20], [9, 21], [13, 21], [16, 20], [18, 18], [18, 15], [17, 13], [15, 12], [12, 11], [15, 10], [17, 9], [18, 7], [18, 4], [16, 2], [13, 1], [9, 0], [6, 1], [4, 3]] },
+    'И': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 0], [18, 21]] },
+    'Й': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 0], [18, 21], [-1, -1], [7, 24], [11, 26], [15, 24]] },
+    'К': { width: 21, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [4, 7], [-1, -1], [9, 12], [18, 0]] },
+    'Л': { width: 20, points: [[2, 0], [6, 21], [18, 21], [18, 0]] },
+    'М': { width: 24, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [12, 0], [-1, -1], [20, 21], [12, 0], [-1, -1], [20, 21], [20, 0]] },
+    'Н': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 11], [18, 11]] },
+    'О': { width: 22, points: [[9, 21], [7, 20], [5, 18], [4, 16], [3, 13], [3, 8], [4, 5], [5, 3], [7, 1], [9, 0], [13, 0], [15, 1], [17, 3], [18, 5], [19, 8], [19, 13], [18, 16], [17, 18], [15, 20], [13, 21], [9, 21]] },
+    'П': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 21], [18, 21]] },
+    'Р': { width: 21, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [13, 21], [16, 20], [17, 19], [18, 17], [18, 14], [17, 12], [16, 11], [13, 10], [4, 10]] },
+    'С': { width: 21, points: [[18, 16], [17, 18], [15, 20], [13, 21], [9, 21], [7, 20], [5, 18], [4, 16], [3, 13], [3, 8], [4, 5], [5, 3], [7, 1], [9, 0], [13, 0], [15, 1], [17, 3], [18, 5]] },
+    'Т': { width: 16, points: [[8, 21], [8, 0], [-1, -1], [1, 21], [15, 21]] },
+    'У': { width: 18, points: [[1, 21], [9, 11], [9, 0], [-1, -1], [17, 21], [9, 11]] },
+    'Ф': { width: 22, points: [[11, 25], [11, -4], [-1, -1], [6, 21], [16, 21], [19, 20], [20, 18], [21, 15], [21, 7], [20, 4], [19, 2], [16, 1], [6, 1], [3, 2], [2, 4], [1, 7], [1, 15], [2, 18], [3, 20], [6, 21]] },
+    'Х': { width: 20, points: [[3, 21], [17, 0], [-1, -1], [17, 21], [3, 0]] },
+    'Ц': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [20, 0], [20, -5], [-1, -1], [4, 0], [18, 0]] },
+    'Ч': { width: 20, points: [[4, 21], [4, 11], [16, 11], [16, 0], [-1, -1], [16, 21], [16, 11]] },
+    'Ш': { width: 26, points: [[4, 21], [4, 0], [-1, -1], [14, 21], [14, 0], [-1, -1], [24, 21], [24, 0], [-1, -1], [4, 0], [24, 0]] },
+    'Щ': { width: 32, points: [[4, 21], [4, 0], [-1, -1], [14, 21], [14, 0], [-1, -1], [24, 21], [24, 0], [28, 0], [28, -5], [-1, -1], [4, 0], [24, 0]] },
+    'Ъ': { width: 22, points: [[4, 21], [4, 0], [12, 0], [15, 1], [17, 3], [18, 6], [18, 9], [17, 12], [15, 14], [12, 15], [4, 15], [-1, -1], [4, 21], [0, 21]] },
+    'Ы': { width: 26, points: [[4, 21], [4, 0], [12, 0], [15, 1], [17, 3], [18, 6], [18, 9], [17, 12], [15, 14], [12, 15], [4, 15], [-1, -1], [22, 21], [22, 0]] },
+    'Ь': { width: 20, points: [[4, 21], [4, 0], [12, 0], [15, 1], [17, 3], [18, 6], [18, 9], [17, 12], [15, 14], [12, 15], [4, 15]] },
+    'Э': { width: 20, points: [[4, 3], [6, 1], [9, 0], [13, 0], [16, 1], [18, 3], [19, 6], [19, 13], [18, 16], [16, 18], [13, 19], [9, 19], [6, 18], [4, 16], [-1, -1], [6, 10], [19, 10]] },
+    'Ю': { width: 28, points: [[4, 21], [4, 0], [-1, -1], [4, 11], [11, 11], [-1, -1], [20, 21], [23, 20], [25, 18], [26, 15], [26, 6], [25, 3], [23, 1], [20, 0], [15, 0], [12, 1], [10, 3], [9, 6], [9, 15], [10, 18], [12, 20], [15, 21], [20, 21]] },
+    'Я': { width: 20, points: [[2, 0], [10, 11], [-1, -1], [16, 0], [16, 21], [-1, -1], [16, 11], [8, 11], [5, 12], [3, 14], [2, 17], [2, 19], [3, 20], [5, 21], [8, 21], [16, 21]] },
+
+
+
+    'а': { width: 19, points: [[15, 14], [15, 0], [-1, -1], [15, 11], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3]] },
+    'б': { width: 18, points: [[14, 14], [6, 14], [4, 12], [4, 0], [14, 0], [14, 6], [6, 6], [4, 8]] },
+    'в': { width: 17, points: [[4, 14], [4, 0], [-1, -1], [4, 14], [10, 14], [12, 13], [13, 12], [13, 10], [12, 9], [10, 8], [4, 8], [-1, -1], [4, 8], [10, 8], [12, 7], [13, 6], [13, 4], [12, 3], [10, 2], [4, 2]] },
+    'г': { width: 14, points: [[4, 14], [4, 0], [-1, -1], [4, 14], [12, 14]] },
+    'д': { width: 20, points: [[1, 0], [1, 4], [4, 4], [6, 14], [14, 14], [16, 4], [19, 4], [19, 0], [-1, -1], [1, 4], [19, 4]] },
+    'е': { width: 18, points: [[3, 8], [15, 8], [15, 10], [14, 12], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3]] },
+    'ё': { width: 18, points: [[3, 8], [15, 8], [15, 10], [14, 12], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3], [-1, -1], [6, 17], [6, 19], [-1, -1], [12, 17], [12, 19]] },
+    'ж': { width: 22, points: [[2, 14], [11, 7], [2, 0], [-1, -1], [20, 14], [11, 7], [20, 0], [-1, -1], [11, 14], [11, 0]] },
+    'з': { width: 16, points: [[3, 12], [5, 13], [8, 14], [11, 14], [13, 13], [14, 11], [14, 9], [13, 8], [11, 7], [8, 7], [-1, -1], [11, 7], [13, 6], [14, 5], [14, 3], [13, 1], [11, 0], [8, 0], [5, 1], [3, 2]] },
+    'и': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 0], [14, 14]] },
+    'й': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 0], [14, 14], [-1, -1], [6, 17], [9, 19], [12, 17]] },
+    'к': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [4, 7], [14, 14], [-1, -1], [4, 7], [14, 0]] },
+    'л': { width: 18, points: [[2, 0], [6, 14], [14, 14], [14, 0]] },
+    'м': { width: 22, points: [[4, 14], [4, 0], [-1, -1], [4, 14], [11, 0], [-1, -1], [11, 0], [18, 14], [-1, -1], [18, 14], [18, 0]] },
+    'н': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 7], [14, 7]] },
+    'о': { width: 19, points: [[8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3], [16, 6], [16, 8], [15, 11], [13, 13], [11, 14], [8, 14]] },
+    'п': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 14], [14, 14]] },
+    'р': { width: 19, points: [[4, 14], [4, -7], [-1, -1], [4, 11], [6, 13], [8, 14], [11, 14], [13, 13], [15, 11], [16, 8], [16, 6], [15, 3], [13, 1], [11, 0], [8, 0], [6, 1], [4, 3]] },
+    'с': { width: 18, points: [[15, 11], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3]] },
+    'т': { width: 18, points: [[2, 14], [16, 14], [-1, -1], [9, 14], [9, 0]] },
+    'у': { width: 16, points: [[2, 14], [8, 0], [-1, -1], [14, 14], [8, 0], [6, -4], [4, -6], [2, -7], [1, -7]] },
+    'ф': { width: 20, points: [[10, 18], [10, -4], [-1, -1], [5, 14], [7, 14], [9, 13], [10, 11], [10, 3], [9, 1], [7, 0], [5, 0], [3, 1], [2, 3], [2, 11], [3, 13], [5, 14], [-1, -1], [11, 14], [13, 14], [15, 13], [16, 11], [16, 3], [15, 1], [13, 0], [11, 0]] },
+    'х': { width: 17, points: [[3, 14], [14, 0], [-1, -1], [14, 14], [3, 0]] },
+    'ц': { width: 19, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [16, 0], [16, -4], [-1, -1], [4, 0], [14, 0]] },
+    'ч': { width: 17, points: [[4, 14], [4, 7], [13, 7], [13, 0], [-1, -1], [13, 14], [13, 7]] },
+    'ш': { width: 22, points: [[4, 14], [4, 0], [-1, -1], [11, 14], [11, 0], [-1, -1], [18, 14], [18, 0], [-1, -1], [4, 0], [18, 0]] },
+    'щ': { width: 26, points: [[4, 14], [4, 0], [-1, -1], [11, 14], [11, 0], [-1, -1], [18, 14], [18, 0], [22, 0], [22, -4], [-1, -1], [4, 0], [18, 0]] },
+    'ъ': { width: 16, points: [[4, 14], [4, 0], [9, 0], [11, 1], [12, 3], [12, 5], [11, 7], [9, 8], [4, 8], [-1, -1], [4, 14], [0, 14]] },
+    'ы': { width: 22, points: [[4, 14], [4, 0], [9, 0], [11, 1], [12, 3], [12, 5], [11, 7], [9, 8], [4, 8], [-1, -1], [18, 14], [18, 0]] },
+    'ь': { width: 16, points: [[4, 14], [4, 0], [9, 0], [11, 1], [12, 3], [12, 5], [11, 7], [9, 8], [4, 8]] },
+    'э': { width: 16, points: [[3, 2], [5, 1], [8, 0], [11, 0], [13, 1], [15, 3], [15, 11], [13, 13], [11, 14], [8, 14], [5, 13], [3, 12], [-1, -1], [5, 7], [15, 7]] },
+    'ю': { width: 24, points: [[4, 14], [4, 0], [-1, -1], [4, 7], [9, 7], [-1, -1], [14, 14], [16, 13], [18, 11], [19, 8], [19, 6], [18, 3], [16, 1], [14, 0], [11, 0], [9, 1], [7, 3], [6, 6], [6, 8], [7, 11], [9, 13], [11, 14], [14, 14]] },
+    'я': { width: 16, points: [[3, 0], [8, 7], [-1, -1], [12, 0], [12, 14], [-1, -1], [12, 7], [7, 7], [5, 8], [4, 9], [3, 11], [3, 13], [4, 14], [7, 14], [12, 14]] }
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.254",
+    "version": "1.1.255",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer-models.js

@@ -675,6 +675,35 @@ class VitroModel {
                 }
             }
         });
+    },
+
+    GetText3DList: function (callback, error, async = true) {
+        var paramObj = {};
+
+        paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/Text3D/Get",
+            data: JSON.stringify(paramObj),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (error) {
+                    error(jqXHR, textStatus, errorThrown);
+                }
+            },
+            success: function (data, status, jqXHR) {
+                //console.log(data);
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
     }
 
 }

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.254';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.255';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
-    GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
+    GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers, buildVectorTextGeometry
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.254';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.255';
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -1067,6 +1067,8 @@ function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
             model.vitroModelLoader.largeModel = model;
             model.vitroModelLoader.startSmallLoad = true;
 
+            load3DText(model);
+
             $('#btnToggleSectionPlan').addClass('toggled');
         }
         else {
@@ -1092,6 +1094,62 @@ function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
     return model;
 }
 
+
+function load3DText(model) {
+    BIMModel.GetText3DList(
+        (data) => {
+            var entityList = [];
+
+            data.forEach(obj => {
+                var text = buildVectorTextGeometry({
+                    origin: [obj.x, obj.y, obj.z],
+                    text: obj.value + ""
+                });
+
+                var mesh = model.createMesh({
+                    id: model.id + ".text." + obj.id,
+                    primitive: "lines",
+                    positions: text.positions,
+                    indices: text.indices,
+                    origin: [0.0, 0.0, 0.0],
+                    matrix: obj.matrix,
+                    color: [0, 0, 0]
+                });
+
+                var entity = model._entities[obj.entityId];
+
+                if (entity) {
+                    entity.meshes.push(mesh);
+                    delete model._unusedMeshes[mesh.id];
+
+                    entityList.push(entity);
+                }
+            });
+
+            model.layerList.forEach(layer => { layer.finalize(); });
+
+            //model._layersToFinalize = [];  for new xeokit
+
+            entityList.forEach(e => {
+
+                e.meshes.forEach(m => {
+                    m._finalize(e._flags);
+                    m._setVisible(e._flags);
+                });
+            });
+
+            model.glRedraw();
+            model._layersFinalized = true;
+
+            viewer.scene.canvas.spinner.processes--;
+        },
+        (error) => {
+            viewer.scene.canvas.spinner.processes--;
+        }
+    );
+}
+
+
 function isPointCloud(filename) {
     const ext = filename.split('.').pop().toLowerCase();
     return ext === 'las' || ext === 'laz';

package/src/controls/DxfViewer/js/dxf-viewer.js

@@ -1,18 +1,18 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.254';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.254';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.254';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.254';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.254';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.254';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.254';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.254';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.254';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.254';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.254';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.254';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.254';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.254';
-import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.254'
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.255';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.255';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.255';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.255';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.255';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.255';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.255';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.255';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.255';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.255';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.255';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.255';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.255';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.255';
+import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.255'
 
 let treeViewData = [];
 let notes = [];

package/src/controls/PdfViewer/js/pdf-viewer.js

@@ -21208,7 +21208,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.254",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.255",
     kind: OptionKind.WORKER
   }
 };