@xeokit/xeokit-sdk 2.6.86-beta.0 → 2.6.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.86-beta.0",
+  "version": "2.6.87",
   "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,6 +52,7 @@
   },
   "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

@@ -0,0 +1,86 @@
+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);
+    }
+}
+
+/**
+ * {@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).
+ *
+ * ## Overview
+ * The WebAssembly build of CxConverter is still in alfa stage, so it may not work as expected. This documentation will be updated as the library and the plugin evolve. The example below shows how to use the plugin:
+ * ````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);
+
+        /**
+         * 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 };

package/src/plugins/CxConverterIFCLoaderPlugin/index.js

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

package/src/plugins/index.js

@@ -17,6 +17,7 @@ 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 "./CityJSONLoaderPlugin/index.js";
 export * from "./DotBIMLoaderPlugin/index.js";

package/src/plugins/lib/html/MenuEvent.js

@@ -67,7 +67,7 @@ export function addContextMenuListener(elem, callback, failCallback = () => {})
         event.stopPropagation();
     };
     
-    if (os.isIphoneSafari()) {
+    if (os.isIphoneOrIpadSafari()) {
         elem.addEventListener('touchstart', touchStartHandler);
         elem.addEventListener('touchmove', touchMoveHandler);
         elem.addEventListener('touchend', touchEndHandler);
@@ -77,7 +77,7 @@ export function addContextMenuListener(elem, callback, failCallback = () => {})
     }
 
     return function removeContextMenuListener() {
-        if (os.isIphoneSafari()) {
+        if (os.isIphoneOrIpadSafari()) {
             elem.removeEventListener('touchstart', touchStartHandler);
             elem.removeEventListener('touchmove', touchMoveHandler);
             elem.removeEventListener('touchend', touchEndHandler);

package/src/viewer/scene/CameraControl/lib/handlers/TouchPickHandler.js

@@ -92,12 +92,13 @@ class TouchPickHandler {
                 const rightClickPageY = touches[0].pageY;
 
                 states.longTouchTimeout = setTimeout(() => {
-                    controllers.cameraControl.fire("rightClick", { // For context menus
-                        pagePos: [Math.round(rightClickPageX), Math.round(rightClickPageY)],
-                        canvasPos: [Math.round(rightClickClientX), Math.round(rightClickClientY)],
-                        event: e
-                    }, true);
-
+                    if (configs.active && configs.pointerEnabled) {
+                        controllers.cameraControl.fire("rightClick", { // For context menus
+                            pagePos: [Math.round(rightClickPageX), Math.round(rightClickPageY)],
+                            canvasPos: [Math.round(rightClickClientX), Math.round(rightClickClientY)],
+                            event: e
+                        }, true);
+                    }
                     states.longTouchTimeout = null;
                 }, configs.longTapTimeout);
 

package/src/viewer/utils/os.js

@@ -6,6 +6,15 @@ const os = {
 
         return isIphone && isSafari;
     },
+    isIphoneOrIpadSafari() {
+        const userAgent = window.navigator.userAgent;
+        const isIphoneOrIpad = /iPhone|iPad/i.test(userAgent) || (
+            // iPad detection: Check for touch support and macOS-like user agent
+            /Macintosh/i.test(userAgent) && navigator.maxTouchPoints && navigator.maxTouchPoints > 2
+        );
+        const isSafari = /Safari/i.test(userAgent) && !/Chrome/i.test(userAgent);
+        return isIphoneOrIpad && isSafari;
+    },
     isTouchDevice() {
         return (
             'ontouchstart' in window || //works for most devices

package/dist/xeokit-sdk.es5.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xeokit-sdk.es5.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/dist/xeokit-sdk.min.es5.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xeokit-sdk.min.es5.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}