@xeokit/xeokit-sdk 2.6.87 → 2.6.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.87",
+  "version": "2.6.88",
   "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",
@@ -52,7 +52,6 @@
   },
   "homepage": "https://xeokit.io",
   "dependencies": {
-    "@creooxag/cxconverter": "^0.0.3-alpha",
     "@loaders.gl/core": "^4.3.3",
     "@loaders.gl/gltf": "^4.3.3",
     "@loaders.gl/las": "^4.3.3",

package/src/plugins/CxConverterIFCLoaderPlugin/CxConverterIFCLoaderPlugin.js

@@ -1,6 +1,5 @@
 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.
@@ -51,6 +50,15 @@ class CxConverterIFCLoaderPlugin extends Plugin {
          * @type {GLTFLoaderPlugin}
          */
         this.gltfLoader = new GLTFLoaderPlugin(this.viewer);
+        this.cxConverterModule = null;
+    }
+
+    /**
+     * Sets the CxConverter module to be used by this plugin.
+     * @param {Object} module The CxConverter module.
+     */
+    setCxConverterModule(module) {
+        this.cxConverterModule = module;
     }
 
     /**
@@ -63,11 +71,14 @@ class CxConverterIFCLoaderPlugin extends Plugin {
      * @returns {Promise<SceneModel>} A promise that resolves to the loaded SceneModel.
      */
     async load(params = {}) {
+        if (!this.cxConverterModule) {
+            throw new Error("CxConverter module is not set. Use setCxConverterModule() to set it.");
+        }
         if (!params.src) {
             this.error("load() param expected: src");
         }
         const data = await fetchFile(params.src);
-        const { gltf, metaData } = await ifc2gltf(
+        const { gltf, metaData } = await this.cxConverterModule.ifc2gltf(
             data,
             {
                 remote: true,

package/src/plugins/DotBIMLoaderPlugin/DotBIMLoaderPlugin.js

@@ -432,7 +432,7 @@ export class DotBIMLoaderPlugin extends Plugin {
 
                     parseDBMesh(dbMeshId, element);
 
-                    const meshId = `${objectId}-mesh`;
+                    const meshId = `${objectId}-mesh-${dbMeshId}`;
 
                     let color = element.color ? [element.color.r / 255.0, element.color.g / 255.0, element.color.b / 255.0] : [1, 1, 1];
                     let opacity = element.color ? element.color.a / 255.0 : 1.0;
@@ -505,7 +505,7 @@ export class DotBIMLoaderPlugin extends Plugin {
                             positions: trianglesCoordinates,
                             indices: [...Array(trianglesCoordinates.length / 3).keys()]
                         });
-                        const meshId = `${objectId}-mesh-${faceColor}`;
+                        const meshId = `${objectId}-mesh-${dbMeshId}-${faceColor}`;
                         const faceColorArray = faceColor.split(',').map(Number);
 
                         let color = [faceColorArray[0] / 255.0, faceColorArray[1] / 255.0, faceColorArray[2] / 255.0];

package/src/plugins/NavCubePlugin/NavCubePlugin.js

@@ -295,25 +295,9 @@ class NavCubePlugin extends Plugin {
             lastY = posY;
         }
 
-        function getCoordsWithinElement(event) {
-            var coords = [0, 0];
-            if (!event) {
-                event = window.event;
-                coords[0] = event.x;
-                coords[1] = event.y;
-            } else {
-                var element = event.target;
-                var totalOffsetLeft = 0;
-                var totalOffsetTop = 0;
-                while (element.offsetParent) {
-                    totalOffsetLeft += element.offsetLeft;
-                    totalOffsetTop += element.offsetTop;
-                    element = element.offsetParent;
-                }
-                coords[0] = event.pageX - totalOffsetLeft;
-                coords[1] = event.pageY - totalOffsetTop;
-            }
-            return coords;
+        function getCoordsWithinElement(clientCoords) {
+            const { left, top } = self._navCubeCanvas.getBoundingClientRect();
+            return [clientCoords.clientX - left, clientCoords.clientY - top];
         }
 
         {
@@ -349,7 +333,7 @@ class NavCubePlugin extends Plugin {
                 downY = e.y;
                 lastX = e.clientX;
                 lastY = e.clientY;
-                var canvasPos = getCoordsWithinElement(e);
+                var canvasPos = getCoordsWithinElement({clientX: e.clientX, clientY: e.clientY});
                 var hit = navCubeScene.pick({
                     canvasPos: canvasPos
                 });
@@ -369,7 +353,7 @@ class NavCubePlugin extends Plugin {
                 if (downX === null) {
                     return;
                 }
-                var canvasPos = getCoordsWithinElement(e);
+                var canvasPos = getCoordsWithinElement({clientX: e.clientX, clientY: e.clientY});
                 var hit = navCubeScene.pick({
                     canvasPos: canvasPos,
                     pickSurface: true
@@ -442,7 +426,7 @@ class NavCubePlugin extends Plugin {
                 if (!over) {
                     return;
                 }
-                var canvasPos = getCoordsWithinElement(e);
+                var canvasPos = getCoordsWithinElement({clientX: e.clientX, clientY: e.clientY});
                 var hit = navCubeScene.pick({
                     canvasPos: canvasPos,
                     pickSurface: true
@@ -472,6 +456,55 @@ class NavCubePlugin extends Plugin {
                     }
                 }
             });
+            
+            self._navCubeCanvas.addEventListener("touchstart", self._onTouchStart = function (e) {
+                if (e.touches.length > 0) {
+                    downX = e.touches[0].clientX;
+                    downY = e.touches[0].clientY;
+                    lastX = e.touches[0].clientX;
+                    lastY = e.touches[0].clientY;
+                    var canvasPos = getCoordsWithinElement({clientX: e.touches[0].clientX, clientY: e.touches[0].clientY});
+                    var hit = navCubeScene.pick({
+                        canvasPos: canvasPos
+                    });
+                    if (hit) {
+                        down = true;
+                    } else {
+                        down = false;
+                    }
+                }
+            }, 
+            {
+                passive: false
+            });
+
+            self._navCubeCanvas.addEventListener("touchmove", self._onTouchMove = function (e) {
+                e.preventDefault();
+                var touch = e.touches[0];
+                var posX = touch.clientX;
+                var posY = touch.clientY;
+
+                var currentElement = document.elementFromPoint(posX, posY);
+                over = (self._navCubeCanvas === currentElement);
+
+                if (!over) {
+                    return;
+                }
+                if (down) {
+                    actionMove(posX, posY);
+                    return;
+                }
+            }, 
+            {
+                passive: false
+            });
+
+            self._navCubeCanvas.addEventListener("touchend", self._onTouchEnd = function (e) {
+                down = false;
+                if (downX === null) {
+                    return;
+                } 
+            });
 
             var flyTo = (function () {
                 var center = math.vec3();
@@ -730,6 +763,10 @@ class NavCubePlugin extends Plugin {
             this._navCubeCanvas.removeEventListener("mousemove", this._onMouseMove);
             this._navCubeCanvas.removeEventListener("mouseup", this._onMouseUp);
 
+            this._navCubeCanvas.removeEventListener("touchstart", this._onTouchStart);
+            this._navCubeCanvas.removeEventListener("touchmove", this._onTouchMove);
+            this._navCubeCanvas.removeEventListener("touchend", this._onTouchEnd);
+
             this._navCubeCanvas = null;
             this._cubeTextureCanvas.destroy();
             this._cubeTextureCanvas = null;
@@ -739,6 +776,10 @@ class NavCubePlugin extends Plugin {
             this._onMouseDown = null;
             this._onMouseMove = null;
             this._onMouseUp = null;
+
+            this._onTouchStart = null;
+            this._onTouchMove = null;
+            this._onTouchEnd = null;
         }
 
         this._navCubeScene.destroy();

package/src/plugins/SectionPlanesPlugin/SectionPlanesPlugin.js

@@ -329,7 +329,8 @@ class SectionPlanesPlugin extends Plugin {
                                      })(),
                                      setQuaternion: q => { rootNode.quaternion = q; },
                                      setScale: s => { rootNode.scale = s; },
-                                     setVisible: v => { rootNode.visible = v; }
+                                     setVisible: v => { rootNode.visible = v; },
+                                     destroy: () => { rootNode.destroy() }
                                  };
                              })();
                              let unbindSectionPlane = () => { };
@@ -348,6 +349,7 @@ class SectionPlanesPlugin extends Plugin {
                                  _destroy: () => {
                                      unbindSectionPlane();
                                      ctrl.destroy();
+                                     planeRoot.destroy();
                                  },
                                  setCulled:  c => { culled = c;  updateVisible(); },
                                  setVisible: v => { visible = v; updateVisible(); },

package/types/plugins/lib/ui/index.d.ts

@@ -1,12 +1,15 @@
 import { Viewer } from "../../../viewer";
 import { PointerCircle } from "../../../extras/PointerCircle";
 
+type Vec2 = number[]
+type Vec3 = number[]
+type Ray2WorldPos<T> = (origin: Vec3, direction: Vec3) => T | null;
+
 type Cleanup = () => void;
 
 type OnCancel = () => void;
-type OnChange = () => void;
-type OnCommit = () => void;
+type OnChange<T> = (canvasPos: Vec2, worldPos: T | null) => void;
+type OnCommit<T> = (canvasPos: Vec2, worldPos: T | null) => void;
 
-type Ray2WorldPos = (origin: number[], direction: number[]) => boolean | number[];
 
-declare function touchPointSelector(viewer: Viewer, pointerCircle: PointerCircle, ray2WorldPos: Ray2WorldPos): (onCancel: OnCancel, onChange: OnChange, onCommit: OnCommit) => Cleanup;
+declare function touchPointSelector<T>(viewer: Viewer, pointerCircle: PointerCircle, ray2WorldPos: Ray2WorldPos<T>): (onCancel: OnCancel, onChange: OnChange<T>, onCommit: OnCommit<T>) => Cleanup;