@xeokit/xeokit-sdk 2.4.0-alpha-22 → 2.4.0-alpha-23

package/dist/xeokit-sdk.cjs.js

@@ -627,7 +627,7 @@ class ContextMenu {
     }
 
     _getNextId() { // Returns a unique ID
-        return "ContextMenu_" + this._id + "" + this._nextId++; // Start ID with alpha chars to make a valid DOM element selector
+        return "ContextMenu_" + this._id + "_" + this._nextId++; // Start ID with alpha chars to make a valid DOM element selector
     }
 
     _createUI() { // Builds DOM elements for the entire menu tree
@@ -9507,7 +9507,7 @@ class Wire {
         wireClickableStyle['-o-transform'] = 'rotate(0deg)';
         wireClickableStyle['transform'] = 'rotate(0deg)';
         wireClickableStyle["opacity"] = 0.0;
-        wireClickableStyle["pointer-events"] = "all";
+        wireClickableStyle["pointer-events"] = "none";
         if (cfg.onContextMenu) ;
 
         parentElement.appendChild(wireClickable);
@@ -9617,8 +9617,12 @@ class Wire {
     }
 
     destroy(visible) {
-        this._wire.parentElement.removeChild(this._wire);
-        this._wireClickable.parentElement.removeChild(this._wireClickable);
+        if (this._wire.parentElement) {
+            this._wire.parentElement.removeChild(this._wire);
+        }
+        if (this._wireClickable.parentElement) {
+            this._wireClickable.parentElement.removeChild(this._wireClickable);
+        }
     }
 }
 
@@ -9753,8 +9757,12 @@ class Dot {
     
     destroy() {
         this.setVisible(false);
-        this._dot.parentElement.removeChild(this._dot);
-        this._dotClickable.parentElement.removeChild(this._dotClickable);
+        if (this._dot.parentElement) {
+            this._dot.parentElement.removeChild(this._dot);
+        }
+        if (this._dotClickable.parentElement) {
+            this._dotClickable.parentElement.removeChild(this._dotClickable);
+        }
     }
 }
 
@@ -9904,7 +9912,9 @@ class Label {
     }
 
     destroy() {
-        this._label.parentElement.removeChild(this._label);
+        if (this._label.parentElement) {
+            this._label.parentElement.removeChild(this._label);
+        }
     }
 }
 
@@ -29686,7 +29696,7 @@ function attachFPSTracker (scene, cullingManager) {
 
         // Apply LOD-culling before rendering the scene
         scene.on("rendering", function () {
-            if (currentFPS == -1)
+            if (currentFPS === -1)
             {
                 return;
             }
@@ -29852,7 +29862,7 @@ function attachFPSTracker (scene, cullingManager) {
      * @param {DataTextureSceneModel} model
      */
     initializeLodState (model) {
-        if (model._nodeList.length == 0)
+        if (model._nodeList.length === 0)
         {
             return;
         }
@@ -29921,11 +29931,11 @@ class LodCullingManager {
             targetFps
         );
 
-        console.time ("initializeLodState");
+      //  console.time ("initializeLodState");
         
         this.lodState.initializeLodState (model);
         
-        console.timeEnd ("initializeLodState");
+      //  console.timeEnd ("initializeLodState");
 
         attachFPSTracker (this.model.scene, this);
     }
@@ -29939,7 +29949,7 @@ class LodCullingManager {
     {
         const lodState = this.lodState;
 
-        if (lodState.lodLevelIndex == lodState.triangleLODLevels.length)
+        if (lodState.lodLevelIndex === lodState.triangleLODLevels.length)
         {
             return false;
         }
@@ -29965,7 +29975,7 @@ class LodCullingManager {
     {
         const lodState = this.lodState;
 
-        if (lodState.lodLevelIndex == 0)
+        if (lodState.lodLevelIndex === 0)
         {
             return false;
         }
@@ -30018,9 +30028,9 @@ class LodCullingManager {
             }
         }
 
-        if (retVal) {
-            console.log ("LOD level = " + lodState.lodLevelIndex);
-        }
+        // if (retVal) {
+        //     console.log ("LOD level = " + lodState.lodLevelIndex);
+        // }
 
         return retVal;
     }
@@ -30037,9 +30047,9 @@ class LodCullingManager {
             retVal |= (decreasedLevel = this._decreaseLODLevelIndex());
         } while (decreasedLevel);
 
-        if (retVal) {
-            console.log ("LOD resetted");
-        }
+        // if (retVal) {
+        //     console.log ("LOD resetted");
+        // }
 
         return retVal;
     }
@@ -32187,12 +32197,13 @@ class DataTextureSceneModel extends Component {
      * @param {Boolean} [cfg.edges=false] Indicates if the DataTextureSceneModel's edges are initially emphasized.
      * @param {Number[]} [cfg.colorize=[1.0,1.0,1.0]] DataTextureSceneModel's initial RGB colorize color, multiplies by the rendered fragment colors.
      * @param {Number} [cfg.opacity=1.0] DataTextureSceneModel's initial opacity factor, multiplies by the rendered fragment alpha.
-     * @param {Number} [cfg.backfaces=false] When we set this ````true````, then we force rendering of backfaces for this dataTexturePerformanceModel. When
+     * @param {Number} [cfg.backfaces=false] When we set this ````true````, then we force rendering of backfaces for this DataTextureModel. When
      * we leave this ````false````, then we allow the Viewer to decide when to render backfaces. In that case, the
      * Viewer will hide backfaces on watertight meshes, show backfaces on open meshes, and always show backfaces on meshes when we slice them open with {@link SectionPlane}s.
-     * @param {Boolean} [cfg.saoEnabled=true] Indicates if Scalable Ambient Obscurance (SAO) will apply to this dataTexturePerformanceModel. SAO is configured by the Scene's {@link SAO} component.
-     * @param {Boolean} [cfg.pbrEnabled=false] Indicates if physically-based rendering (PBR) will apply to the dataTexturePerformanceModel. Only works when {@link Scene#pbrEnabled} is also ````true````.
+     * @param {Boolean} [cfg.saoEnabled=true] Indicates if Scalable Ambient Obscurance (SAO) will apply to this DataTextureModel. SAO is configured by the Scene's {@link SAO} component.
      * @param {Number} [cfg.edgeThreshold=10] When xraying, highlighting, selecting or edging, this is the threshold angle between normals of adjacent triangles, below which their shared wireframe edge is not drawn.
+     * @param {Number} [cfg.targetLodFps] Optional target LoD FPS. When provided, will enable LoD culling for this DataTextureModel, with the given target FPS.
+     * @param {Boolean} [cfg.enableViewFrustumCulling=false] When true, will enable view frustum culling for the objects within this DataTextureModel.
      * @param {Boolean} [cfg.disableVertexWelding] Disable vertex welding when loading geometry into the GPU. Default is ```false```.
      * @param {Boolean} [cfg.disableIndexRebucketing] Disable index rebucketing when loading geometry into the GPU. Default is ```false```.
      */
@@ -32376,7 +32387,7 @@ class DataTextureSceneModel extends Component {
 
         this._saoEnabled = (cfg.saoEnabled !== false);
 
-        this._pbrEnabled = (!!cfg.pbrEnabled);
+        this._pbrEnabled = false;
 
         this._isModel = cfg.isModel;
         if (this._isModel) {
@@ -32988,7 +32999,7 @@ class DataTextureSceneModel extends Component {
     /**
      * Gets if physically-based rendering (PBR) is enabled for this DataTextureSceneModel.
      *
-     * Only works when {@link Scene#pbrEnabled} is also true.
+     * This will always be ````false````.
      *
      * @type {Boolean}
      */
@@ -57675,10 +57686,17 @@ class Texture2D {
         let generateMipMap = false;
 
         gl.bindTexture(this.target, this.texture);
+
+        const bak1 = gl.getParameter(gl.UNPACK_FLIP_Y_WEBGL);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, this.flipY);
+
+        const bak2 = gl.getParameter(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL);
         gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, this.premultiplyAlpha);
+
+        const bak3 = gl.getParameter(gl.UNPACK_ALIGNMENT);
         gl.pixelStorei(gl.UNPACK_ALIGNMENT, this.unpackAlignment);
-        gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, gl.NONE);
+
+        const bak4 = gl.getParameter(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL);        gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, gl.NONE);
 
         const minFilter = convertConstant(gl, this.minFilter);
         gl.texParameteri(this.target, gl.TEXTURE_MIN_FILTER, minFilter);
@@ -57733,6 +57751,11 @@ class Texture2D {
         }
 
         gl.bindTexture(this.target, null);
+
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, bak1);
+        gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, bak2);
+        gl.pixelStorei(gl.UNPACK_ALIGNMENT, bak3);
+        gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, bak4);
     }
 
     setCompressedData({mipmaps, props = {}}) {
@@ -83796,7 +83819,7 @@ class TrianglesInstancingLayer {
             this._numPickableLayerPortions--;
             this.model.numPickableLayerPortions--;
         }
-        this._setFlags2(portionId, flags, meshTransparent);
+        this._setFlags(portionId, flags, meshTransparent);
     }
 
     setCulled(portionId, flags, meshTransparent) {
@@ -88802,6 +88825,7 @@ class PointsBatchingOcclusionRenderer {
         const sectionPlanesState = scene._sectionPlanesState;
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
+        src.push ('#version 300 es');
         src.push("// Points batching occlusion fragment shader");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
@@ -102598,7 +102622,7 @@ class MetaScene {
         for (let i = 0, len = createObjectsParams.length; i < len; i++) {
             const createObject = createObjectsParams[i];
             const type = createObject.type;
-            const objectId = createObject.id;
+            const objectId = options.globalizeObjectIds ? math.globalizeObjectId(modelId, createObject.id) : createObject.id;
             const originalSystemId = createObject.id;
             const name = createObject.name;
             const propertySets = [];
@@ -102632,13 +102656,13 @@ class MetaScene {
 
         for (let i = 0, len = existingObjects.length; i < len; i++) {
             const existingObject = existingObjects[i];
-            const objectId = existingObject.id;
+            const objectId = options.globalizeObjectIds ? math.globalizeObjectId(modelId, existingObject.id) : existingObject.id;
             if ((existingObject._parentId === undefined || existingObject._parentId === null) && !existingObject.parent) {
                 metaModel.rootMetaObject = existingObject; // Deprecated, and won't work for federated models
                 metaModel.rootMetaObjects[objectId] = existingObject;
                 this.rootMetaObjects[objectId] = existingObject;
             } else if (existingObject._parentId) {
-                const parentId = existingObject._parentId;
+                const parentId = options.globalizeObjectIds ? math.globalizeObjectId(modelId, existingObject._parentId) : existingObject._parentId;
                 existingObject._parentId = null;
                 let parentMetaObject = this.metaObjects[parentId];
                 if (parentMetaObject) {

package/dist/xeokit-sdk.es.js

@@ -623,7 +623,7 @@ class ContextMenu {
     }
 
     _getNextId() { // Returns a unique ID
-        return "ContextMenu_" + this._id + "" + this._nextId++; // Start ID with alpha chars to make a valid DOM element selector
+        return "ContextMenu_" + this._id + "_" + this._nextId++; // Start ID with alpha chars to make a valid DOM element selector
     }
 
     _createUI() { // Builds DOM elements for the entire menu tree
@@ -9503,7 +9503,7 @@ class Wire {
         wireClickableStyle['-o-transform'] = 'rotate(0deg)';
         wireClickableStyle['transform'] = 'rotate(0deg)';
         wireClickableStyle["opacity"] = 0.0;
-        wireClickableStyle["pointer-events"] = "all";
+        wireClickableStyle["pointer-events"] = "none";
         if (cfg.onContextMenu) ;
 
         parentElement.appendChild(wireClickable);
@@ -9613,8 +9613,12 @@ class Wire {
     }
 
     destroy(visible) {
-        this._wire.parentElement.removeChild(this._wire);
-        this._wireClickable.parentElement.removeChild(this._wireClickable);
+        if (this._wire.parentElement) {
+            this._wire.parentElement.removeChild(this._wire);
+        }
+        if (this._wireClickable.parentElement) {
+            this._wireClickable.parentElement.removeChild(this._wireClickable);
+        }
     }
 }
 
@@ -9749,8 +9753,12 @@ class Dot {
     
     destroy() {
         this.setVisible(false);
-        this._dot.parentElement.removeChild(this._dot);
-        this._dotClickable.parentElement.removeChild(this._dotClickable);
+        if (this._dot.parentElement) {
+            this._dot.parentElement.removeChild(this._dot);
+        }
+        if (this._dotClickable.parentElement) {
+            this._dotClickable.parentElement.removeChild(this._dotClickable);
+        }
     }
 }
 
@@ -9900,7 +9908,9 @@ class Label {
     }
 
     destroy() {
-        this._label.parentElement.removeChild(this._label);
+        if (this._label.parentElement) {
+            this._label.parentElement.removeChild(this._label);
+        }
     }
 }
 
@@ -29682,7 +29692,7 @@ function attachFPSTracker (scene, cullingManager) {
 
         // Apply LOD-culling before rendering the scene
         scene.on("rendering", function () {
-            if (currentFPS == -1)
+            if (currentFPS === -1)
             {
                 return;
             }
@@ -29848,7 +29858,7 @@ function attachFPSTracker (scene, cullingManager) {
      * @param {DataTextureSceneModel} model
      */
     initializeLodState (model) {
-        if (model._nodeList.length == 0)
+        if (model._nodeList.length === 0)
         {
             return;
         }
@@ -29917,11 +29927,11 @@ class LodCullingManager {
             targetFps
         );
 
-        console.time ("initializeLodState");
+      //  console.time ("initializeLodState");
         
         this.lodState.initializeLodState (model);
         
-        console.timeEnd ("initializeLodState");
+      //  console.timeEnd ("initializeLodState");
 
         attachFPSTracker (this.model.scene, this);
     }
@@ -29935,7 +29945,7 @@ class LodCullingManager {
     {
         const lodState = this.lodState;
 
-        if (lodState.lodLevelIndex == lodState.triangleLODLevels.length)
+        if (lodState.lodLevelIndex === lodState.triangleLODLevels.length)
         {
             return false;
         }
@@ -29961,7 +29971,7 @@ class LodCullingManager {
     {
         const lodState = this.lodState;
 
-        if (lodState.lodLevelIndex == 0)
+        if (lodState.lodLevelIndex === 0)
         {
             return false;
         }
@@ -30014,9 +30024,9 @@ class LodCullingManager {
             }
         }
 
-        if (retVal) {
-            console.log ("LOD level = " + lodState.lodLevelIndex);
-        }
+        // if (retVal) {
+        //     console.log ("LOD level = " + lodState.lodLevelIndex);
+        // }
 
         return retVal;
     }
@@ -30033,9 +30043,9 @@ class LodCullingManager {
             retVal |= (decreasedLevel = this._decreaseLODLevelIndex());
         } while (decreasedLevel);
 
-        if (retVal) {
-            console.log ("LOD resetted");
-        }
+        // if (retVal) {
+        //     console.log ("LOD resetted");
+        // }
 
         return retVal;
     }
@@ -32183,12 +32193,13 @@ class DataTextureSceneModel extends Component {
      * @param {Boolean} [cfg.edges=false] Indicates if the DataTextureSceneModel's edges are initially emphasized.
      * @param {Number[]} [cfg.colorize=[1.0,1.0,1.0]] DataTextureSceneModel's initial RGB colorize color, multiplies by the rendered fragment colors.
      * @param {Number} [cfg.opacity=1.0] DataTextureSceneModel's initial opacity factor, multiplies by the rendered fragment alpha.
-     * @param {Number} [cfg.backfaces=false] When we set this ````true````, then we force rendering of backfaces for this dataTexturePerformanceModel. When
+     * @param {Number} [cfg.backfaces=false] When we set this ````true````, then we force rendering of backfaces for this DataTextureModel. When
      * we leave this ````false````, then we allow the Viewer to decide when to render backfaces. In that case, the
      * Viewer will hide backfaces on watertight meshes, show backfaces on open meshes, and always show backfaces on meshes when we slice them open with {@link SectionPlane}s.
-     * @param {Boolean} [cfg.saoEnabled=true] Indicates if Scalable Ambient Obscurance (SAO) will apply to this dataTexturePerformanceModel. SAO is configured by the Scene's {@link SAO} component.
-     * @param {Boolean} [cfg.pbrEnabled=false] Indicates if physically-based rendering (PBR) will apply to the dataTexturePerformanceModel. Only works when {@link Scene#pbrEnabled} is also ````true````.
+     * @param {Boolean} [cfg.saoEnabled=true] Indicates if Scalable Ambient Obscurance (SAO) will apply to this DataTextureModel. SAO is configured by the Scene's {@link SAO} component.
      * @param {Number} [cfg.edgeThreshold=10] When xraying, highlighting, selecting or edging, this is the threshold angle between normals of adjacent triangles, below which their shared wireframe edge is not drawn.
+     * @param {Number} [cfg.targetLodFps] Optional target LoD FPS. When provided, will enable LoD culling for this DataTextureModel, with the given target FPS.
+     * @param {Boolean} [cfg.enableViewFrustumCulling=false] When true, will enable view frustum culling for the objects within this DataTextureModel.
      * @param {Boolean} [cfg.disableVertexWelding] Disable vertex welding when loading geometry into the GPU. Default is ```false```.
      * @param {Boolean} [cfg.disableIndexRebucketing] Disable index rebucketing when loading geometry into the GPU. Default is ```false```.
      */
@@ -32372,7 +32383,7 @@ class DataTextureSceneModel extends Component {
 
         this._saoEnabled = (cfg.saoEnabled !== false);
 
-        this._pbrEnabled = (!!cfg.pbrEnabled);
+        this._pbrEnabled = false;
 
         this._isModel = cfg.isModel;
         if (this._isModel) {
@@ -32984,7 +32995,7 @@ class DataTextureSceneModel extends Component {
     /**
      * Gets if physically-based rendering (PBR) is enabled for this DataTextureSceneModel.
      *
-     * Only works when {@link Scene#pbrEnabled} is also true.
+     * This will always be ````false````.
      *
      * @type {Boolean}
      */
@@ -57671,10 +57682,17 @@ class Texture2D {
         let generateMipMap = false;
 
         gl.bindTexture(this.target, this.texture);
+
+        const bak1 = gl.getParameter(gl.UNPACK_FLIP_Y_WEBGL);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, this.flipY);
+
+        const bak2 = gl.getParameter(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL);
         gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, this.premultiplyAlpha);
+
+        const bak3 = gl.getParameter(gl.UNPACK_ALIGNMENT);
         gl.pixelStorei(gl.UNPACK_ALIGNMENT, this.unpackAlignment);
-        gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, gl.NONE);
+
+        const bak4 = gl.getParameter(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL);        gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, gl.NONE);
 
         const minFilter = convertConstant(gl, this.minFilter);
         gl.texParameteri(this.target, gl.TEXTURE_MIN_FILTER, minFilter);
@@ -57729,6 +57747,11 @@ class Texture2D {
         }
 
         gl.bindTexture(this.target, null);
+
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, bak1);
+        gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, bak2);
+        gl.pixelStorei(gl.UNPACK_ALIGNMENT, bak3);
+        gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, bak4);
     }
 
     setCompressedData({mipmaps, props = {}}) {
@@ -83792,7 +83815,7 @@ class TrianglesInstancingLayer {
             this._numPickableLayerPortions--;
             this.model.numPickableLayerPortions--;
         }
-        this._setFlags2(portionId, flags, meshTransparent);
+        this._setFlags(portionId, flags, meshTransparent);
     }
 
     setCulled(portionId, flags, meshTransparent) {
@@ -88798,6 +88821,7 @@ class PointsBatchingOcclusionRenderer {
         const sectionPlanesState = scene._sectionPlanesState;
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
+        src.push ('#version 300 es');
         src.push("// Points batching occlusion fragment shader");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
@@ -102594,7 +102618,7 @@ class MetaScene {
         for (let i = 0, len = createObjectsParams.length; i < len; i++) {
             const createObject = createObjectsParams[i];
             const type = createObject.type;
-            const objectId = createObject.id;
+            const objectId = options.globalizeObjectIds ? math.globalizeObjectId(modelId, createObject.id) : createObject.id;
             const originalSystemId = createObject.id;
             const name = createObject.name;
             const propertySets = [];
@@ -102628,13 +102652,13 @@ class MetaScene {
 
         for (let i = 0, len = existingObjects.length; i < len; i++) {
             const existingObject = existingObjects[i];
-            const objectId = existingObject.id;
+            const objectId = options.globalizeObjectIds ? math.globalizeObjectId(modelId, existingObject.id) : existingObject.id;
             if ((existingObject._parentId === undefined || existingObject._parentId === null) && !existingObject.parent) {
                 metaModel.rootMetaObject = existingObject; // Deprecated, and won't work for federated models
                 metaModel.rootMetaObjects[objectId] = existingObject;
                 this.rootMetaObjects[objectId] = existingObject;
             } else if (existingObject._parentId) {
-                const parentId = existingObject._parentId;
+                const parentId = options.globalizeObjectIds ? math.globalizeObjectId(modelId, existingObject._parentId) : existingObject._parentId;
                 existingObject._parentId = null;
                 let parentMetaObject = this.metaObjects[parentId];
                 if (parentMetaObject) {