@xeokit/xeokit-sdk 2.4.2-beta-41 → 2.4.2-beta-43

package/dist/xeokit-sdk.cjs.js

@@ -61340,9 +61340,6 @@ function getSnapBatchingRenderers(scene) {
 const tempMat4$1 = math.mat4();
 const tempMat4b = math.mat4();
 const tempVec4a$7 = math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.OBB3();
 
 const tempVec3a$o = math.vec3();
 const tempVec3b$k = math.vec3();
@@ -61456,12 +61453,6 @@ class TrianglesBatchingLayer {
             this._state.origin.set(cfg.origin);
         }
 
-        /**
-         * The axis-aligned World-space boundary of this TrianglesBatchingLayer's positions.
-         * @type {*|Float64Array}
-         */
-        this.aabb = math.collapseAABB3();
-
         /**
          * When true, this layer contains solid triangle meshes, otherwise this layer contains surface triangle meshes
          * @type {boolean}
@@ -66397,11 +66388,8 @@ function getSnapInstancingRenderers(scene) {
     return instancingRenderers;
 }
 
-const tempUint8Vec4$2 = new Uint8Array(4);
 const tempFloat32$2 = new Float32Array(1);
 const tempVec4a$6 = math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
 const tempVec3fa$2 = new Float32Array(3);
 
 const tempVec3a$l = math.vec3();
@@ -66937,12 +66925,12 @@ class TrianglesInstancingLayer {
         if (!this._finalized) {
             throw "Not finalized";
         }
-        tempUint8Vec4$2[0] = color[0];
-        tempUint8Vec4$2[1] = color[1];
-        tempUint8Vec4$2[2] = color[2];
-        tempUint8Vec4$2[3] = color[3];
+        tempUint8Vec4[0] = color[0];
+        tempUint8Vec4[1] = color[1];
+        tempUint8Vec4[2] = color[2];
+        tempUint8Vec4[3] = color[3];
         if (this._state.colorsBuf) {
-            this._state.colorsBuf.setData(tempUint8Vec4$2, portionId * 4);
+            this._state.colorsBuf.setData(tempUint8Vec4, portionId * 4);
         }
     }
 
@@ -67906,11 +67894,6 @@ class LinesBatchingBuffer {
     }
 }
 
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.OBB3();
-
 /**
  * @private
  */
@@ -68926,13 +68909,9 @@ function getInstancingRenderers(scene) {
     return instancingRenderers;
 }
 
-const tempUint8Vec4$1 = new Uint8Array(4);
+const tempUint8Vec4$2 = new Uint8Array(4);
 const tempFloat32$1 = new Float32Array(1);
 
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-
 const tempVec3fa$1 = new Float32Array(3);
 
 const tempFloat32Vec4$1 = new Float32Array(4);
@@ -69314,11 +69293,11 @@ class LinesInstancingLayer {
         if (!this._finalized) {
             throw "Not finalized";
         }
-        tempUint8Vec4$1[0] = color[0];
-        tempUint8Vec4$1[1] = color[1];
-        tempUint8Vec4$1[2] = color[2];
-        tempUint8Vec4$1[3] = color[3];
-        this._state.colorsBuf.setData(tempUint8Vec4$1, portionId * 4, 4);
+        tempUint8Vec4$2[0] = color[0];
+        tempUint8Vec4$2[1] = color[1];
+        tempUint8Vec4$2[2] = color[2];
+        tempUint8Vec4$2[3] = color[3];
+        this._state.colorsBuf.setData(tempUint8Vec4$2, portionId * 4, 4);
     }
 
     setTransparent(portionId, flags, transparent) {
@@ -70457,13 +70436,6 @@ class PointsBatchingBuffer {
     }
 }
 
-math.vec4();
-math.vec4();
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.OBB3();
-
 /**
  * @private
  */
@@ -72357,11 +72329,8 @@ function getPointsInstancingRenderers(scene) {
     return instancingRenderers;
 }
 
-const tempUint8Vec4 = new Uint8Array(4);
+const tempUint8Vec4$1 = new Uint8Array(4);
 const tempFloat32 = new Float32Array(1);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
 const tempVec3fa = new Float32Array(3);
 
 const tempFloat32Vec4 = new Float32Array(4);
@@ -72742,10 +72711,10 @@ class PointsInstancingLayer {
         if (!this._finalized) {
             throw "Not finalized";
         }
-        tempUint8Vec4[0] = color[0];
-        tempUint8Vec4[1] = color[1];
-        tempUint8Vec4[2] = color[2];
-        this._state.colorsBuf.setData(tempUint8Vec4, portionId * 3);
+        tempUint8Vec4$1[0] = color[0];
+        tempUint8Vec4$1[1] = color[1];
+        tempUint8Vec4$1[2] = color[2];
+        this._state.colorsBuf.setData(tempUint8Vec4$1, portionId * 3);
     }
 
     setTransparent(portionId, flags, transparent) {
@@ -81179,15 +81148,10 @@ const INDICES_EDGE_INDICES_ALIGNEMENT_SIZE = 8;
  */
 const MAX_OBJECT_UPDATES_IN_FRAME_WITHOUT_BATCHED_UPDATE = 10;
 
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
 const tempMat4a = new Float32Array(16);
 const tempUint8Array4 = new Uint8Array(4);
 const tempFloat32Array3 = new Float32Array(3);
 
-math.AABB3();
-
 let numLayers = 0;
 
 const DEFAULT_MATRIX$1 = math.identityMat4();
@@ -81359,16 +81323,6 @@ class TrianglesDataTextureLayer {
             //math.expandAABB3(portionAABB, subPortionAABB);
             subPortionIds.push(subPortionId);
         });
-        // const origin = this._state.origin;
-        // if (origin[0] !== 0 || origin[1] !== 0 || origin[2] !== 0) {
-        //     portionAABB[0] += origin[0];
-        //     portionAABB[1] += origin[1];
-        //     portionAABB[2] += origin[2];
-        //     portionAABB[3] += origin[0];
-        //     portionAABB[4] += origin[1];
-        //     portionAABB[5] += origin[2];
-        // }
-        // math.expandAABB3(this.aabb, portionAABB);
         const portionId = this._portionToSubPortionsMap.length;
         this._portionToSubPortionsMap.push(subPortionIds);
         this.model.numPortions++;
@@ -81466,10 +81420,6 @@ class TrianglesDataTextureLayer {
 
         dataTextureRamStats.numberOfGeometries++;
 
-        // const aabb = math.collapseAABB3();
-        // math.expandAABB3Points3(aabb, bucket.positionsCompressed);
-        // geometryCompressionUtils.decompressAABB(aabb, portionCfg.positionsDecodeMatrix);
-
         const bucketGeometry = {
             vertexBase,
             numVertices,
@@ -81477,7 +81427,6 @@ class TrianglesDataTextureLayer {
             numEdges,
             indicesBase,
             edgeIndicesBase,
-            // aabb,
             obb: null // Lazy-created in _createSubPortion if needed
         };
 
@@ -81499,26 +81448,6 @@ class TrianglesDataTextureLayer {
         buffer.perObjectPositionsDecodeMatrices.push(portionCfg.positionsDecodeMatrix);
         buffer.perObjectInstancePositioningMatrices.push(meshMatrix || DEFAULT_MATRIX$1);
 
-        // if (meshMatrix) { // NB: SceneModel world matrix is used in shaders and SceneModelMesh.aabb
-        //
-        //     if (!bucketGeometry.obb) {
-        //         bucketGeometry.obb = math.AABB3ToOBB3(bucketGeometry.aabb);
-        //     }
-        //     const geometryOBB = bucketGeometry.obb;
-        //     for (let i = 0, len = geometryOBB.length; i < len; i += 4) {
-        //         tempVec4a[0] = geometryOBB[i + 0];
-        //         tempVec4a[1] = geometryOBB[i + 1];
-        //         tempVec4a[2] = geometryOBB[i + 2];
-        //         tempVec4a[3] = 1.0;
-        //         if (meshMatrix) {
-        //             math.transformPoint4(meshMatrix, tempVec4a, tempVec4b);
-        //         }
-        //         math.expandAABB3Point3(subPortionAABB, tempVec4b);
-        //     }
-        // } else {
-        //     math.expandAABB3(subPortionAABB, bucketGeometry.aabb);
-        // }
-
         buffer.perObjectSolid.push(!!portionCfg.solid);
 
         if (colors) {
@@ -81647,13 +81576,6 @@ class TrianglesDataTextureLayer {
             gl,
             buffer.perObjectPositionsDecodeMatrices);
 
-        // const positionsCompressed = new Uint16Array(buffer.lenPositionsCompressed);
-        // for (let i = 0, j = 0, len = buffer.positionsCompressed.length; i < len; i++) {
-        //     const pc = buffer.positionsCompressed[i];
-        //     positionsCompressed.set(pc, j);
-        //     j += pc.length;
-        // }
-
         textureState.texturePerVertexIdCoordinates = this._dataTextureGenerator.generateTextureForPositions(
             gl,
             buffer.positionsCompressed,
@@ -81902,7 +81824,6 @@ class TrianglesDataTextureLayer {
      * flags/flags2 set since the previous invocation of `_beginDeferredFlags`.
      */
     _uploadDeferredFlags() {
-        console.info("_uploadDeferredFlags");
         this._deferredSetFlagsActive = false;
         if (!this._deferredSetFlagsDirty) {
             return;
@@ -82096,7 +82017,7 @@ class TrianglesDataTextureLayer {
 
         // Pick
 
-        let f3 = (visible && pickable) ? RENDER_PASSES.PICK : RENDER_PASSES.NOT_RENDERED;
+        let f3 = (visible && (!culled) && pickable) ? RENDER_PASSES.PICK : RENDER_PASSES.NOT_RENDERED;
         const textureState = this._dataTextureState;
         const gl = this.model.scene.canvas.gl;
         tempUint8Array4 [0] = f0;
@@ -82912,7 +82833,6 @@ class SceneModelTransform {
 }
 
 const tempVec3a$8 = math.vec3();
-math.mat4();
 
 const tempOBB3 = math.OBB3();
 

package/dist/xeokit-sdk.es.js

@@ -61336,9 +61336,6 @@ function getSnapBatchingRenderers(scene) {
 const tempMat4$1 = math.mat4();
 const tempMat4b = math.mat4();
 const tempVec4a$7 = math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.OBB3();
 
 const tempVec3a$o = math.vec3();
 const tempVec3b$k = math.vec3();
@@ -61452,12 +61449,6 @@ class TrianglesBatchingLayer {
             this._state.origin.set(cfg.origin);
         }
 
-        /**
-         * The axis-aligned World-space boundary of this TrianglesBatchingLayer's positions.
-         * @type {*|Float64Array}
-         */
-        this.aabb = math.collapseAABB3();
-
         /**
          * When true, this layer contains solid triangle meshes, otherwise this layer contains surface triangle meshes
          * @type {boolean}
@@ -66393,11 +66384,8 @@ function getSnapInstancingRenderers(scene) {
     return instancingRenderers;
 }
 
-const tempUint8Vec4$2 = new Uint8Array(4);
 const tempFloat32$2 = new Float32Array(1);
 const tempVec4a$6 = math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
 const tempVec3fa$2 = new Float32Array(3);
 
 const tempVec3a$l = math.vec3();
@@ -66933,12 +66921,12 @@ class TrianglesInstancingLayer {
         if (!this._finalized) {
             throw "Not finalized";
         }
-        tempUint8Vec4$2[0] = color[0];
-        tempUint8Vec4$2[1] = color[1];
-        tempUint8Vec4$2[2] = color[2];
-        tempUint8Vec4$2[3] = color[3];
+        tempUint8Vec4[0] = color[0];
+        tempUint8Vec4[1] = color[1];
+        tempUint8Vec4[2] = color[2];
+        tempUint8Vec4[3] = color[3];
         if (this._state.colorsBuf) {
-            this._state.colorsBuf.setData(tempUint8Vec4$2, portionId * 4);
+            this._state.colorsBuf.setData(tempUint8Vec4, portionId * 4);
         }
     }
 
@@ -67902,11 +67890,6 @@ class LinesBatchingBuffer {
     }
 }
 
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.OBB3();
-
 /**
  * @private
  */
@@ -68922,13 +68905,9 @@ function getInstancingRenderers(scene) {
     return instancingRenderers;
 }
 
-const tempUint8Vec4$1 = new Uint8Array(4);
+const tempUint8Vec4$2 = new Uint8Array(4);
 const tempFloat32$1 = new Float32Array(1);
 
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-
 const tempVec3fa$1 = new Float32Array(3);
 
 const tempFloat32Vec4$1 = new Float32Array(4);
@@ -69310,11 +69289,11 @@ class LinesInstancingLayer {
         if (!this._finalized) {
             throw "Not finalized";
         }
-        tempUint8Vec4$1[0] = color[0];
-        tempUint8Vec4$1[1] = color[1];
-        tempUint8Vec4$1[2] = color[2];
-        tempUint8Vec4$1[3] = color[3];
-        this._state.colorsBuf.setData(tempUint8Vec4$1, portionId * 4, 4);
+        tempUint8Vec4$2[0] = color[0];
+        tempUint8Vec4$2[1] = color[1];
+        tempUint8Vec4$2[2] = color[2];
+        tempUint8Vec4$2[3] = color[3];
+        this._state.colorsBuf.setData(tempUint8Vec4$2, portionId * 4, 4);
     }
 
     setTransparent(portionId, flags, transparent) {
@@ -70453,13 +70432,6 @@ class PointsBatchingBuffer {
     }
 }
 
-math.vec4();
-math.vec4();
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.OBB3();
-
 /**
  * @private
  */
@@ -72353,11 +72325,8 @@ function getPointsInstancingRenderers(scene) {
     return instancingRenderers;
 }
 
-const tempUint8Vec4 = new Uint8Array(4);
+const tempUint8Vec4$1 = new Uint8Array(4);
 const tempFloat32 = new Float32Array(1);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
 const tempVec3fa = new Float32Array(3);
 
 const tempFloat32Vec4 = new Float32Array(4);
@@ -72738,10 +72707,10 @@ class PointsInstancingLayer {
         if (!this._finalized) {
             throw "Not finalized";
         }
-        tempUint8Vec4[0] = color[0];
-        tempUint8Vec4[1] = color[1];
-        tempUint8Vec4[2] = color[2];
-        this._state.colorsBuf.setData(tempUint8Vec4, portionId * 3);
+        tempUint8Vec4$1[0] = color[0];
+        tempUint8Vec4$1[1] = color[1];
+        tempUint8Vec4$1[2] = color[2];
+        this._state.colorsBuf.setData(tempUint8Vec4$1, portionId * 3);
     }
 
     setTransparent(portionId, flags, transparent) {
@@ -81175,15 +81144,10 @@ const INDICES_EDGE_INDICES_ALIGNEMENT_SIZE = 8;
  */
 const MAX_OBJECT_UPDATES_IN_FRAME_WITHOUT_BATCHED_UPDATE = 10;
 
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
-math.vec4([0, 0, 0, 1]);
 const tempMat4a = new Float32Array(16);
 const tempUint8Array4 = new Uint8Array(4);
 const tempFloat32Array3 = new Float32Array(3);
 
-math.AABB3();
-
 let numLayers = 0;
 
 const DEFAULT_MATRIX$1 = math.identityMat4();
@@ -81355,16 +81319,6 @@ class TrianglesDataTextureLayer {
             //math.expandAABB3(portionAABB, subPortionAABB);
             subPortionIds.push(subPortionId);
         });
-        // const origin = this._state.origin;
-        // if (origin[0] !== 0 || origin[1] !== 0 || origin[2] !== 0) {
-        //     portionAABB[0] += origin[0];
-        //     portionAABB[1] += origin[1];
-        //     portionAABB[2] += origin[2];
-        //     portionAABB[3] += origin[0];
-        //     portionAABB[4] += origin[1];
-        //     portionAABB[5] += origin[2];
-        // }
-        // math.expandAABB3(this.aabb, portionAABB);
         const portionId = this._portionToSubPortionsMap.length;
         this._portionToSubPortionsMap.push(subPortionIds);
         this.model.numPortions++;
@@ -81462,10 +81416,6 @@ class TrianglesDataTextureLayer {
 
         dataTextureRamStats.numberOfGeometries++;
 
-        // const aabb = math.collapseAABB3();
-        // math.expandAABB3Points3(aabb, bucket.positionsCompressed);
-        // geometryCompressionUtils.decompressAABB(aabb, portionCfg.positionsDecodeMatrix);
-
         const bucketGeometry = {
             vertexBase,
             numVertices,
@@ -81473,7 +81423,6 @@ class TrianglesDataTextureLayer {
             numEdges,
             indicesBase,
             edgeIndicesBase,
-            // aabb,
             obb: null // Lazy-created in _createSubPortion if needed
         };
 
@@ -81495,26 +81444,6 @@ class TrianglesDataTextureLayer {
         buffer.perObjectPositionsDecodeMatrices.push(portionCfg.positionsDecodeMatrix);
         buffer.perObjectInstancePositioningMatrices.push(meshMatrix || DEFAULT_MATRIX$1);
 
-        // if (meshMatrix) { // NB: SceneModel world matrix is used in shaders and SceneModelMesh.aabb
-        //
-        //     if (!bucketGeometry.obb) {
-        //         bucketGeometry.obb = math.AABB3ToOBB3(bucketGeometry.aabb);
-        //     }
-        //     const geometryOBB = bucketGeometry.obb;
-        //     for (let i = 0, len = geometryOBB.length; i < len; i += 4) {
-        //         tempVec4a[0] = geometryOBB[i + 0];
-        //         tempVec4a[1] = geometryOBB[i + 1];
-        //         tempVec4a[2] = geometryOBB[i + 2];
-        //         tempVec4a[3] = 1.0;
-        //         if (meshMatrix) {
-        //             math.transformPoint4(meshMatrix, tempVec4a, tempVec4b);
-        //         }
-        //         math.expandAABB3Point3(subPortionAABB, tempVec4b);
-        //     }
-        // } else {
-        //     math.expandAABB3(subPortionAABB, bucketGeometry.aabb);
-        // }
-
         buffer.perObjectSolid.push(!!portionCfg.solid);
 
         if (colors) {
@@ -81643,13 +81572,6 @@ class TrianglesDataTextureLayer {
             gl,
             buffer.perObjectPositionsDecodeMatrices);
 
-        // const positionsCompressed = new Uint16Array(buffer.lenPositionsCompressed);
-        // for (let i = 0, j = 0, len = buffer.positionsCompressed.length; i < len; i++) {
-        //     const pc = buffer.positionsCompressed[i];
-        //     positionsCompressed.set(pc, j);
-        //     j += pc.length;
-        // }
-
         textureState.texturePerVertexIdCoordinates = this._dataTextureGenerator.generateTextureForPositions(
             gl,
             buffer.positionsCompressed,
@@ -81898,7 +81820,6 @@ class TrianglesDataTextureLayer {
      * flags/flags2 set since the previous invocation of `_beginDeferredFlags`.
      */
     _uploadDeferredFlags() {
-        console.info("_uploadDeferredFlags");
         this._deferredSetFlagsActive = false;
         if (!this._deferredSetFlagsDirty) {
             return;
@@ -82092,7 +82013,7 @@ class TrianglesDataTextureLayer {
 
         // Pick
 
-        let f3 = (visible && pickable) ? RENDER_PASSES.PICK : RENDER_PASSES.NOT_RENDERED;
+        let f3 = (visible && (!culled) && pickable) ? RENDER_PASSES.PICK : RENDER_PASSES.NOT_RENDERED;
         const textureState = this._dataTextureState;
         const gl = this.model.scene.canvas.gl;
         tempUint8Array4 [0] = f0;
@@ -82908,7 +82829,6 @@ class SceneModelTransform {
 }
 
 const tempVec3a$8 = math.vec3();
-math.mat4();
 
 const tempOBB3 = math.OBB3();