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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.2-beta-41",
+  "version": "2.4.2-beta-43",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/viewer/scene/model/SceneModel.js

@@ -39,7 +39,6 @@ import {geometryCompressionUtils} from "../math/geometryCompressionUtils.js";
 import {SceneModelTransform} from "./SceneModelTransform";
 
 const tempVec3a = math.vec3();
-const tempMat4 = math.mat4();
 
 const tempOBB3 = math.OBB3();
 

package/src/viewer/scene/model/dtx/triangles/TrianglesDataTextureLayer.js

@@ -35,15 +35,10 @@ const INDICES_EDGE_INDICES_ALIGNEMENT_SIZE = 8;
  */
 const MAX_OBJECT_UPDATES_IN_FRAME_WITHOUT_BATCHED_UPDATE = 10;
 
-const tempVec4a = math.vec4([0, 0, 0, 1]);
-const tempVec4b = math.vec4([0, 0, 0, 1]);
-const tempVec4c = math.vec4([0, 0, 0, 1]);
 const tempMat4a = new Float32Array(16);
 const tempUint8Array4 = new Uint8Array(4);
 const tempFloat32Array3 = new Float32Array(3);
 
-const tempAABB3b = math.AABB3();
-
 let numLayers = 0;
 
 const DEFAULT_MATRIX = math.identityMat4();
@@ -215,16 +210,6 @@ export 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++;
@@ -322,10 +307,6 @@ export class TrianglesDataTextureLayer {
 
         dataTextureRamStats.numberOfGeometries++;
 
-        // const aabb = math.collapseAABB3();
-        // math.expandAABB3Points3(aabb, bucket.positionsCompressed);
-        // geometryCompressionUtils.decompressAABB(aabb, portionCfg.positionsDecodeMatrix);
-
         const bucketGeometry = {
             vertexBase,
             numVertices,
@@ -333,7 +314,6 @@ export class TrianglesDataTextureLayer {
             numEdges,
             indicesBase,
             edgeIndicesBase,
-            // aabb,
             obb: null // Lazy-created in _createSubPortion if needed
         };
 
@@ -355,26 +335,6 @@ export class TrianglesDataTextureLayer {
         buffer.perObjectPositionsDecodeMatrices.push(portionCfg.positionsDecodeMatrix);
         buffer.perObjectInstancePositioningMatrices.push(meshMatrix || DEFAULT_MATRIX);
 
-        // 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) {
@@ -503,13 +463,6 @@ export 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,
@@ -758,7 +711,6 @@ export class TrianglesDataTextureLayer {
      * flags/flags2 set since the previous invocation of `_beginDeferredFlags`.
      */
     _uploadDeferredFlags() {
-        console.info("_uploadDeferredFlags")
         this._deferredSetFlagsActive = false;
         if (!this._deferredSetFlagsDirty) {
             return;
@@ -952,7 +904,7 @@ export 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;

package/src/viewer/scene/model/vbo/linesBatching/LinesBatchingLayer.js

@@ -8,11 +8,6 @@ import {getBatchingRenderers} from "./LinesBatchingRenderers.js";
 import {LinesBatchingBuffer} from "./LinesBatchingBuffer.js";
 import {quantizePositions} from "../../compression.js";
 
-const tempVec4a = math.vec4([0, 0, 0, 1]);
-const tempVec4b = math.vec4([0, 0, 0, 1]);
-const tempVec4c = math.vec4([0, 0, 0, 1]);
-const tempOBB3 = math.OBB3();
-
 /**
  * @private
  */

package/src/viewer/scene/model/vbo/linesInstancing/LinesInstancingLayer.js

@@ -9,10 +9,6 @@ import {getInstancingRenderers} from "./LinesInstancingRenderers.js";
 const tempUint8Vec4 = new Uint8Array(4);
 const tempFloat32 = new Float32Array(1);
 
-const tempVec4a = math.vec4([0, 0, 0, 1]);
-const tempVec4b = math.vec4([0, 0, 0, 1]);
-const tempVec4c = math.vec4([0, 0, 0, 1]);
-
 const tempVec3fa = new Float32Array(3);
 
 const tempFloat32Vec4 = new Float32Array(4);

package/src/viewer/scene/model/vbo/pointsBatching/PointsBatchingLayer.js

@@ -8,13 +8,6 @@ import {getPointsBatchingRenderers} from "./PointsBatchingRenderers.js";
 import {PointsBatchingBuffer} from "./PointsBatchingBuffer.js";
 import {quantizePositions} from "../../compression.js";
 
-const tempVec3a = math.vec4();
-const tempVec3b = math.vec4();
-const tempVec4a = math.vec4([0, 0, 0, 1]);
-const tempVec4b = math.vec4([0, 0, 0, 1]);
-const tempVec4c = math.vec4([0, 0, 0, 1]);
-const tempOBB3 = math.OBB3();
-
 /**
  * @private
  */

package/src/viewer/scene/model/vbo/pointsInstancing/PointsInstancingLayer.js

@@ -8,9 +8,6 @@ import {getPointsInstancingRenderers} from "./PointsInstancingRenderers.js";
 
 const tempUint8Vec4 = new Uint8Array(4);
 const tempFloat32 = new Float32Array(1);
-const tempVec4a = math.vec4([0, 0, 0, 1]);
-const tempVec4b = math.vec4([0, 0, 0, 1]);
-const tempVec4c = math.vec4([0, 0, 0, 1]);
 const tempVec3fa = new Float32Array(3);
 
 const tempFloat32Vec4 = new Float32Array(4);

package/src/viewer/scene/model/vbo/trianglesBatching/TrianglesBatchingLayer.js

@@ -13,9 +13,6 @@ import {getSnapBatchingRenderers} from "../snapBatching/SnapBatchingRenderers.js
 const tempMat4 = math.mat4();
 const tempMat4b = math.mat4();
 const tempVec4a = math.vec4([0, 0, 0, 1]);
-const tempVec4b = math.vec4([0, 0, 0, 1]);
-const tempVec4c = math.vec4([0, 0, 0, 1]);
-const tempOBB3 = math.OBB3();
 
 const tempVec3a = math.vec3();
 const tempVec3b = math.vec3();
@@ -129,12 +126,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}

package/src/viewer/scene/model/vbo/trianglesInstancing/TrianglesInstancingLayer.js

@@ -7,11 +7,8 @@ import {ArrayBuf} from "../../../webgl/ArrayBuf.js";
 import {getInstancingRenderers} from "./TrianglesInstancingRenderers.js";
 import {getSnapInstancingRenderers} from "../snapInstancing/SnapInstancingRenderers.js";
 
-const tempUint8Vec4 = new Uint8Array(4);
 const tempFloat32 = new Float32Array(1);
 const tempVec4a = math.vec4([0, 0, 0, 1]);
-const tempVec4b = math.vec4([0, 0, 0, 1]);
-const tempVec4c = math.vec4([0, 0, 0, 1]);
 const tempVec3fa = new Float32Array(3);
 
 const tempVec3a = math.vec3();