@xeokit/xeokit-sdk 2.6.35 → 2.6.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.35",
+  "version": "2.6.36",
   "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/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsTouchControl.js

@@ -172,8 +172,13 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
             }
 
             const touch = event.touches[0];
-            const touchX = touch.clientX;
-            const touchY = touch.clientY;
+
+            // Get the canvas's bounding rectangle
+            const rect = canvas.getBoundingClientRect();
+
+            // Calculate the touch position relative to the canvas
+            const touchX = touch.clientX - rect.left;
+            const touchY = touch.clientY - rect.top;
 
             touchStartCanvasPos.set([touchX, touchY]);
             touchMoveCanvasPos.set([touchX, touchY]);
@@ -381,9 +386,14 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
             }
 
             const touch = event.touches[0];
-            const touchX = touch.clientX;
-            const touchY = touch.clientY;
 
+            // Get the canvas's bounding rectangle
+            const rect = canvas.getBoundingClientRect();
+
+            // Calculate the touch position relative to the canvas
+            const touchX = touch.clientX - rect.left;
+            const touchY = touch.clientY - rect.top;
+            
             if (touch.identifier !== touchId) {
                 return;
             }
@@ -553,8 +563,13 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
             }
 
             const touch = event.changedTouches[0];
-            const touchX = touch.clientX;
-            const touchY = touch.clientY;
+
+            // Get the canvas's bounding rectangle
+            const rect = canvas.getBoundingClientRect();
+
+            // Calculate the touch position relative to the canvas
+            const touchX = touch.clientX - rect.left;
+            const touchY = touch.clientY - rect.top;
 
             if (touch.identifier !== touchId) {
                 return;

package/src/plugins/DotBIMLoaderPlugin/DotBIMLoaderPlugin.js

@@ -347,7 +347,6 @@ export class DotBIMLoaderPlugin extends Plugin {
             const fileData = ctx.fileData;
             const sceneModel = ctx.sceneModel;
 
-            const dbMeshIndices = {};
             const dbMeshLoaded = {};
 
             const ifcProjectId = math.createUUID();
@@ -385,17 +384,14 @@ export class DotBIMLoaderPlugin extends Plugin {
                 propertySets: []
             };
 
-            for (let i = 0, len = fileData.meshes.length; i < len; i++) {
-                const dbMesh = fileData.meshes[i];
-                dbMeshIndices[dbMesh.mesh_id] = i;
-            }
-
-            const parseDBMesh = (dbMeshId) => {
+            const parseDBMesh = (dbMeshId, element) => {
                 if (dbMeshLoaded[dbMeshId]) {
                     return;
                 }
-                const dbMeshIndex = dbMeshIndices[dbMeshId];
-                const dbMesh = fileData.meshes[dbMeshIndex];
+
+                const dbMesh = fileData.meshes.find(obj => {
+                    return obj.mesh_id === element.mesh_id;
+                });
                 sceneModel.createGeometry({
                     id: dbMeshId,
                     primitive: "triangles",
@@ -434,7 +430,7 @@ export class DotBIMLoaderPlugin extends Plugin {
 
                 if (element.face_colors === undefined) {
 
-                    parseDBMesh(dbMeshId);
+                    parseDBMesh(dbMeshId, element);
 
                     const meshId = `${objectId}-mesh`;
 
@@ -477,7 +473,9 @@ export class DotBIMLoaderPlugin extends Plugin {
                     let faceColors = element.face_colors;
                     let coloredTrianglesDictionary = {};
                     let currentTriangleIndicesCount = 0;
-                    let dbMesh = fileData.meshes[element.mesh_id];
+                    let dbMesh = fileData.meshes.find(obj => {
+                        return obj.mesh_id === element.mesh_id;
+                    });
                     for (let i = 0, len = faceColors.length; i < len; i+=4) {
                         let faceColor = [faceColors[i], faceColors[i+1], faceColors[i+2], faceColors[i+3]];
                         if (coloredTrianglesDictionary[faceColor] === undefined) {

package/src/plugins/XKTLoaderPlugin/XKTLoaderPlugin.js

@@ -15,6 +15,7 @@ import {ParserV7} from "./parsers/ParserV7.js";
 import {ParserV8} from "./parsers/ParserV8.js";
 import {ParserV9} from "./parsers/ParserV9.js";
 import {ParserV10} from "./parsers/ParserV10.js";
+import {ParserV11} from "./parsers/ParserV11.js";
 
 
 const parsers = {};
@@ -29,6 +30,7 @@ parsers[ParserV7.version] = ParserV7;
 parsers[ParserV8.version] = ParserV8;
 parsers[ParserV9.version] = ParserV9;
 parsers[ParserV10.version] = ParserV10;
+parsers[ParserV11.version] = ParserV11;
 
 /**
  * {@link Viewer} plugin that loads models from xeokit's optimized *````.XKT````* format.
@@ -1146,6 +1148,12 @@ class XKTLoaderPlugin extends Plugin {
             return;
         }
         //   this.log("Loading .xkt V" + xktVersion);
+
+        if (parser.parseArrayBuffer) {
+            parser.parseArrayBuffer(this.viewer, options, arrayBuffer, sceneModel, metaModel, manifestCtx);
+            return;
+        }
+
         const numElements = dataView.getUint32(4, true);
         const elements = [];
         let byteOffset = (numElements + 2) * 4;