@xeokit/xeokit-sdk 2.6.78-rc2-no-las → 2.6.78

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.78-rc2-no-las",
+  "version": "2.6.78",
   "description": "3D BIM IFC Viewer SDK for AEC engineering applications. Open Source JavaScript Toolkit based on pure WebGL for top performance, real-world coordinates and full double precision",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",
   "types": "./types/index.d.ts",
   "scripts": {
-    "build": "rollup --config rollup.config.js",
+    "build": "rollup --config rollup.config.js; rollup --config rollup.minified.config.js",
     "dev-build": "rollup --config rollup.dev.config.js",
     "docs": "rm -Rf ./docs/*; ./node_modules/.bin/esdoc",
     "typedocs": "rm -Rf ./docs/*; typedoc --tsconfig tsconfig.json",
+    "publish": "npm publish --access public",
     "changelog": "git fetch; auto-changelog --commit-limit false --package --template changelog-template.hbs",
     "test": "npx percy exec -- npx playwright test"
   },
@@ -56,10 +57,7 @@
     "@loaders.gl/core": "^4.3.3",
     "@loaders.gl/gltf": "^4.3.3",
     "@loaders.gl/las": "^4.3.3",
-    "@rollup/plugin-replace": "^6.0.2",
-    "core-js": "^3.42.0",
-    "html2canvas": "^1.4.1",
-    "pako": "^2.1.0"
+    "html2canvas": "^1.4.1"
   },
   "devDependencies": {
     "@babel/core": "^7.18.6",
@@ -68,7 +66,6 @@
     "@percy/playwright": "^1.0.7",
     "@playwright/test": "^1.49.1",
     "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-node-resolve": "^13.2.1",
     "@types/node": "^22.10.6",
     "auto-changelog": "^2.4.0",

package/src/plugins/CxConverterIFCLoaderPlugin/CxConverterIFCLoaderPlugin.js

@@ -1,25 +1,25 @@
-// import { Plugin } from "../../viewer/Plugin.js";
-// import { GLTFLoaderPlugin } from "../GLTFLoaderPlugin/GLTFLoaderPlugin.js";
-// import { ifc2gltf } from "@creooxag/cxconverter";
+import { Plugin } from "../../viewer/Plugin.js";
+import { GLTFLoaderPlugin } from "../GLTFLoaderPlugin/GLTFLoaderPlugin.js";
+import { ifc2gltf } from "@creooxag/cxconverter";
 
-// /**
-//  * Fetches a file from the given URL and returns its contents as text.
-//  *
-//  * @param {string} url - The URL to fetch the file from.
-//  * @returns {Promise<string>} A promise that resolves to the file contents.
-//  * @private
-//  */
-// async function fetchFile(url) {
-//     try {
-//         const response = await fetch(url);
-//         if (!response.ok) {
-//             throw new Error(`HTTP error! Status: ${response.status}`);
-//         }
-//         return response.text();
-//     } catch (error) {
-//         console.error('Error fetching file:', error);
-//     }
-// }
+/**
+ * Fetches a file from the given URL and returns its contents as text.
+ *
+ * @param {string} url - The URL to fetch the file from.
+ * @returns {Promise<string>} A promise that resolves to the file contents.
+ * @private
+ */
+async function fetchFile(url) {
+    try {
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`HTTP error! Status: ${response.status}`);
+        }
+        return response.text();
+    } catch (error) {
+        console.error('Error fetching file:', error);
+    }
+}
 
 /**
  * {@link Viewer} plugin that uses [CxConverter](https://github.com/Creoox/cxconverter) to load BIM models directly from IFC files, using its WebAssembly buid from [npm package](https://www.npmjs.com/package/@creooxag/cxconverter).
@@ -29,58 +29,58 @@
  * ````javascript
  * import { CxConverterIFCLoaderPlugin, Viewer } from "../../dist/xeokit-sdk.es.js";
  * const cxConverterIFCLoaderPlugin = new CxConverterIFCLoaderPlugin(viewer);
- *
+ * 
  * const sceneModel = await cxConverterIFCLoaderPlugin.load({
  *        src: "../../assets/models/ifc/Duplex.ifc"
- * });
+ * }); 
  * ````
     See the code in action [here](https://xeokit.github.io/xeokit-sdk/examples/buildings/#cxConverterIFC_vbo_Duplex).
  */
 
-// class CxConverterIFCLoaderPlugin extends Plugin {
-//     /**
-//      * @constructor
-//      * @param {Viewer} viewer The Viewer.
-//      * @param {Object} [cfg={}] Plugin configuration.
-//      */
-//     constructor(viewer, cfg = {}) {
-//         super("ifcLoader", viewer, cfg);
+class CxConverterIFCLoaderPlugin extends Plugin {
+    /**
+     * @constructor
+     * @param {Viewer} viewer The Viewer.
+     * @param {Object} [cfg={}] Plugin configuration.
+     */
+    constructor(viewer, cfg = {}) {
+        super("ifcLoader", viewer, cfg);
 
-//         /**
-//          * The GLTFLoaderPlugin used internally to load the converted GLTF.
-//          * @type {GLTFLoaderPlugin}
-//          */
-//         this.gltfLoader = new GLTFLoaderPlugin(this.viewer);
-//     }
+        /**
+         * The GLTFLoaderPlugin used internally to load the converted GLTF.
+         * @type {GLTFLoaderPlugin}
+         */
+        this.gltfLoader = new GLTFLoaderPlugin(this.viewer);
+    }
 
-//     /**
-//      * Loads an IFC model from the given source.
-//      *
-//      * @param {Object} [params={}] Loading parameters.
-//      * @param {string} params.src Path to an IFC file.
-//      * @param {Function} [params.progressCallback] Callback to track loading progress.
-//      * @param {Function} [params.progressTextCallback] Callback to track loading progress with text updates.
-//      * @returns {Promise<SceneModel>} A promise that resolves to the loaded SceneModel.
-//      */
-//     async load(params = {}) {
-//         if (!params.src) {
-//             this.error("load() param expected: src");
-//         }
-//         const data = await fetchFile(params.src);
-//         const { gltf, metaData } = await ifc2gltf(
-//             data,
-//             {
-//                 remote: true,
-//                 progressCallback: params.progressCallback,
-//                 progressTextCallback: params.progressTextCallback
-//             }
-//         );
-//         const sceneModel = this.gltfLoader.load({
-//             id: "myModel",
-//             gltf: gltf,
-//             metaModelJSON: metaData
-//         });
-//         return sceneModel;
-//     }
-// }
-// export { CxConverterIFCLoaderPlugin };
+    /**
+     * Loads an IFC model from the given source.
+     *
+     * @param {Object} [params={}] Loading parameters.
+     * @param {string} params.src Path to an IFC file.
+     * @param {Function} [params.progressCallback] Callback to track loading progress.
+     * @param {Function} [params.progressTextCallback] Callback to track loading progress with text updates.
+     * @returns {Promise<SceneModel>} A promise that resolves to the loaded SceneModel.
+     */
+    async load(params = {}) {
+        if (!params.src) {
+            this.error("load() param expected: src");
+        }
+        const data = await fetchFile(params.src);
+        const { gltf, metaData } = await ifc2gltf(
+            data,
+            {
+                remote: true,
+                progressCallback: params.progressCallback,
+                progressTextCallback: params.progressTextCallback
+            }
+        );
+        const sceneModel = this.gltfLoader.load({
+            id: "myModel",
+            gltf: gltf,
+            metaModelJSON: metaData
+        });
+        return sceneModel;
+    }
+}
+export { CxConverterIFCLoaderPlugin };

package/src/plugins/CxConverterIFCLoaderPlugin/index.js

@@ -1 +1 @@
-// export * from "./CxConverterIFCLoaderPlugin.js";
+export * from "./CxConverterIFCLoaderPlugin.js";

package/src/plugins/LASLoaderPlugin/index.js

@@ -1 +1 @@
-// export * from "./LASLoaderPlugin.js";
+export * from "./LASLoaderPlugin.js";

package/src/plugins/XKTLoaderPlugin/parsers/ParserV1.js

@@ -9,13 +9,13 @@
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 const decompressColor = (function () {
     const color2 = new Float32Array(3);

package/src/plugins/XKTLoaderPlugin/parsers/ParserV10.js

@@ -3,15 +3,15 @@
 */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 import {geometryCompressionUtils} from "../../../viewer/scene/math/geometryCompressionUtils.js";
 import {JPEGMediaType, PNGMediaType} from "../../../viewer/scene/constants/constants.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 const tempVec4a = math.vec4();
 const tempVec4b = math.vec4();

package/src/plugins/XKTLoaderPlugin/parsers/ParserV12.js

@@ -3,16 +3,16 @@
 */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 import {geometryCompressionUtils} from "../../../viewer/scene/math/geometryCompressionUtils.js";
 import {JPEGMediaType, PNGMediaType} from "../../../viewer/scene/constants/constants.js";
 import { buildVectorTextGeometry } from "../../../viewer/index.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 const tempVec4a = math.vec4();
 const tempVec4b = math.vec4();
@@ -526,11 +526,11 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
                                     text: axisLabel,
                                     size: 2
                                 });
-
+                                
                                 geometryArrays.decompressedPositions = ifcLabel.positions;
                                 geometryArrays.geometryIndices = ifcLabel.indices;
                                 geometryArrays.geometryPositions = null;
-
+    
                                 geometryValid = (geometryArrays.decompressedPositions.length > 0 && geometryArrays.geometryIndices.length > 0);
                                 break;
                             default:
@@ -564,7 +564,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
                                     }
                                     geometryArrays.geometryPositions = null;
                                 }
-
+                                
                                 geometryArraysCache[geometryId] = geometryArrays;
                             }
                         }
@@ -723,7 +723,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
                                 text: axisLabel,
                                 size: 2
                             });
-
+                            
                             geometryPositions = ifcLabel.positions;
                             geometryIndices = ifcLabel.indices;
 

package/src/plugins/XKTLoaderPlugin/parsers/ParserV2.js

@@ -9,13 +9,13 @@ DEPRECATED
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 function extract(elements) {
     return {

package/src/plugins/XKTLoaderPlugin/parsers/ParserV3.js

@@ -7,13 +7,13 @@ Parser for .XKT Format V3
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 function extract(elements) {
     return {

package/src/plugins/XKTLoaderPlugin/parsers/ParserV4.js

@@ -7,12 +7,12 @@ Parser for .XKT Format V4
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 function extract(elements) {
     return {

package/src/plugins/XKTLoaderPlugin/parsers/ParserV5.js

@@ -7,12 +7,12 @@
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 function extract(elements) {
     return {

package/src/plugins/XKTLoaderPlugin/parsers/ParserV6.js

@@ -5,14 +5,14 @@
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 import {geometryCompressionUtils} from "../../../viewer/scene/math/geometryCompressionUtils.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 function extract(elements) {
 

package/src/plugins/XKTLoaderPlugin/parsers/ParserV7.js

@@ -5,14 +5,14 @@
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 import {geometryCompressionUtils} from "../../../viewer/scene/math/geometryCompressionUtils.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 function extract(elements) {
 

package/src/plugins/XKTLoaderPlugin/parsers/ParserV8.js

@@ -5,14 +5,14 @@
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 import {geometryCompressionUtils} from "../../../viewer/scene/math/geometryCompressionUtils.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//     pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 const tempVec4a = math.vec4();
 const tempVec4b = math.vec4();

package/src/plugins/XKTLoaderPlugin/parsers/ParserV9.js

@@ -5,14 +5,14 @@
  */
 
 import {utils} from "../../../viewer/scene/utils.js";
-import pako from 'pako/dist/pako.esm.mjs';
+import * as p from "./lib/pako.js";
 import {math} from "../../../viewer/scene/math/math.js";
 import {geometryCompressionUtils} from "../../../viewer/scene/math/geometryCompressionUtils.js";
 
-// let pako = window.pako || p;
-// if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
-//    pako = pako.default;
-// }
+let pako = window.pako || p;
+if (!pako.inflate) {  // See https://github.com/nodeca/pako/issues/97
+    pako = pako.default;
+}
 
 const tempVec4a = math.vec4();
 const tempVec4b = math.vec4();

package/src/plugins/index.js

@@ -17,8 +17,8 @@ export * from "./ViewCullPlugin/index.js";
 export * from "./XKTLoaderPlugin/index.js";
 export * from "./XML3DLoaderPlugin/index.js";
 export * from "./WebIFCLoaderPlugin/index.js";
-// export * from "./CxConverterIFCLoaderPlugin/index.js";
-// export * from "./LASLoaderPlugin/index.js";
+export * from "./CxConverterIFCLoaderPlugin/index.js";
+export * from "./LASLoaderPlugin/index.js";
 export * from "./CityJSONLoaderPlugin/index.js";
 export * from "./DotBIMLoaderPlugin/index.js";
 export * from "./ZonesPlugin/index.js";

package/src/viewer/scene/Entity.js

@@ -491,6 +491,12 @@ class Entity {
     getEachVertex(callback) {
     }
 
+    /**
+     * Gets the complete geometry of this entity.
+     */
+    getGeometryData() {
+    }
+
     /**
      * Destroys this Entity.
      */

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

@@ -687,6 +687,32 @@ export class SceneModelEntity {
         }
     }
 
+    getGeometryData() {
+        let positionsBase = 0;
+        const positions = [];
+        const indices = [];
+
+        for (let i = 0, len = this.meshes.length; i < len; i++) {
+            const mesh = this.meshes[i];
+
+            if (mesh.layer.readGeometryData) {
+                const meshGeom = mesh.layer.readGeometryData(mesh.portionId);
+    
+                for (let j = 0, len = meshGeom.indices.length; j < len; j++) {
+                    indices.push(meshGeom.indices[j]+positionsBase);
+                }
+    
+                for (let j = 0, len = meshGeom.positions.length; j < len; j++) {
+                    positions.push(meshGeom.positions[j]);
+                }
+    
+                positionsBase += meshGeom.positions.length / 3;                
+            }
+        }
+
+        return { indices, positions };
+    }
+
     /**
      * Returns the volume of this SceneModelEntity.
      *

package/src/viewer/scene/model/vbo/batching/triangles/VBOBatchingTrianglesLayer.js

@@ -869,6 +869,50 @@ export class VBOBatchingTrianglesLayer {
         return {count, offset}
     }
 
+    readGeometryData(portionId) {
+        if (!this._finalized) {
+            throw "Not finalized";
+        }
+
+        const portion = this._portions[portionId];
+        const state = this._state;
+        const sceneModelMatrix = this.model.matrix;
+        const positionsDecodeMatrix = state.positionsDecodeMatrix;
+
+        const origin = math.vec4();
+        origin.set(state.origin, 0); origin[3] = 1;
+        math.mulMat4v4(sceneModelMatrix, origin, origin);
+
+        const indices = state.indicesBuf.getData(
+            portion.indicesBaseIndex, portion.numIndices
+        ).map(i => i - portion.vertsBaseIndex);
+
+        const matrix = math.mulMat4(
+            sceneModelMatrix,
+            positionsDecodeMatrix,
+            new Array(16)
+        );
+
+        matrix[12] += origin[0];
+        matrix[13] += origin[1];
+        matrix[14] += origin[2];
+
+        const positionsQuantized = state.positionsBuf.getData(
+            portion.vertsBaseIndex, portion.numVerts
+        );
+
+        const positions = math.transformPositions3(
+            matrix,
+            positionsQuantized,
+            new Array(positionsQuantized.length)
+        );
+
+        // const aabb = math.positions3ToAABB3(positions);
+        // console.log({aabbToniBatching: aabb});
+
+        return { indices, positions };
+    }
+
     // ---------------------- COLOR RENDERING -----------------------------------
 
     drawColorOpaque(renderFlags, frameCtx) {

package/src/viewer/scene/model/vbo/instancing/triangles/VBOInstancingTrianglesLayer.js

@@ -785,6 +785,64 @@ export class VBOInstancingTrianglesLayer {
         this._state.modelMatrixCol2Buf.setData(tempFloat32Vec4, offset);
     }
 
+    readGeometryData(portionId) {
+        if (!this._finalized) {
+            throw "Not finalized";
+        }
+
+        const state = this._state;
+        const sceneModelMatrix = this.model.matrix;
+
+        const col0 = state.modelMatrixCol0Buf.getData(portionId, 1);
+        const col1 = state.modelMatrixCol1Buf.getData(portionId, 1);
+        const col2 = state.modelMatrixCol2Buf.getData(portionId, 1);
+
+        const portionMatrix = [
+            col0[0], col1[0], col2[0], 0,
+            col0[1], col1[1], col2[1], 0,
+            col0[2], col1[2], col2[2], 0,
+            col0[3], col1[3], col2[3], 1,
+        ];
+
+        const positionsDecodeMatrix = state.positionsDecodeMatrix;
+
+        const origin = math.vec4();
+        origin.set(state.origin, 0);
+        origin[3] = 1;
+        math.mulMat4v4(sceneModelMatrix, origin, origin);
+
+        const indices = state.indicesBuf.getData();
+
+        const matrix = math.mulMat4(
+            portionMatrix,
+            positionsDecodeMatrix,
+            new Array(16)
+        );
+
+        math.mulMat4(
+            sceneModelMatrix,
+            matrix,
+            matrix
+        );
+
+        matrix[12] += origin[0];
+        matrix[13] += origin[1];
+        matrix[14] += origin[2];
+
+        const positionsQuantized = state.positionsBuf.getData();
+
+        const positions = math.transformPositions3(
+            matrix,
+            positionsQuantized,
+            new Array(positionsQuantized.length)
+        );
+
+        // const aabb = math.positions3ToAABB3(positions);
+        // console.log({aabbToniInstancing: aabb});
+
+        return { indices, positions };
+    }
+
     // ---------------------- COLOR RENDERING -----------------------------------
 
     drawColorOpaque(renderFlags, frameCtx) {