@xeokit/xeokit-sdk 2.6.90 → 2.6.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.90",
+  "version": "2.6.91",
   "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,10 +52,10 @@
   },
   "homepage": "https://xeokit.io",
   "dependencies": {
-    "@loaders.gl/core": "^4.3.3",
-    "@loaders.gl/gltf": "^4.3.3",
-    "@loaders.gl/las": "^4.3.3",
-    "html2canvas": "^1.4.1"
+    "@loaders.gl/core": "4.3.4",
+    "@loaders.gl/gltf": "4.3.4",
+    "@loaders.gl/las": "4.3.4",
+    "html2canvas": "1.4.1"
   },
   "devDependencies": {
     "@babel/core": "^7.18.6",

package/src/external.js

@@ -0,0 +1,4 @@
+export { parse } from "@loaders.gl/core";
+export { GLTFLoader, postProcessGLTF } from "@loaders.gl/gltf";
+export { LASLoader } from "@loaders.gl/las";
+export { default as html2canvas } from "html2canvas/dist/html2canvas.esm.js";

package/src/index.js

@@ -1,3 +1,3 @@
 export * from "./extras/index.js";
 export * from "./plugins/index.js";
-export * from "./viewer/index.js";
+export * from "./viewer/index.js";

package/src/plugins/GLTFLoaderPlugin/GLTFSceneModelLoader.js

@@ -1,5 +1,5 @@
-import { parse } from '@loaders.gl/core';
-import { GLTFLoader, postProcessGLTF } from '@loaders.gl/gltf';
+import { parse } from "../../external.js";
+import { GLTFLoader, postProcessGLTF } from "../../external.js";
 import { sRGBEncoding } from "../../viewer/scene/constants/constants.js";
 import { core } from "../../viewer/scene/core.js";
 import { math } from "../../viewer/scene/math/math.js";

package/src/plugins/LASLoaderPlugin/LASLoaderPlugin.js

@@ -3,9 +3,9 @@ import {SceneModel} from "../../viewer/scene/model/index.js";
 import {Plugin} from "../../viewer/Plugin.js";
 import {LASDefaultDataSource} from "./LASDefaultDataSource.js";
 import {math} from "../../viewer/index.js";
-import {parse} from '@loaders.gl/core';
-import {LASLoader} from '@loaders.gl/las';
-import {loadLASHeader} from "./loadLASHeader";
+import {parse} from "../../external.js";
+import {LASLoader} from "../../external.js";
+import {loadLASHeader} from "./loadLASHeader.js";
 
 const MAX_VERTICES = 500000; // TODO: Rough estimate
 

package/src/viewer/Viewer.js

@@ -3,7 +3,7 @@ import {CameraFlightAnimation} from "./scene/camera/CameraFlightAnimation.js";
 import {CameraControl} from "./scene/CameraControl/CameraControl.js";
 import {MetaScene} from "./metadata/MetaScene.js";
 import {LocaleService} from "./localization/LocaleService.js";
-import html2canvas from 'html2canvas/dist/html2canvas.esm.js';
+import {html2canvas} from '../external.js';
 import {math} from "./scene/math/math.js";
 import {transformToNode} from "../plugins/lib/ui/index.js";
 

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

@@ -20,6 +20,7 @@ class MouseMiscHandler {
 
         document.addEventListener("mousemove", this._mouseMoveHandler = (e) => {
             getCanvasPosFromEvent(e, canvas, states.pointerCanvasPos);
+            states.mouseover = true; // Added to fix XCD-386: The zoom speed slows down when zooming into an empty space for the first time on a relatively large model, and it cannot be reset without reloading
         });
 
         canvas.addEventListener("mousedown", this._mouseDownHandler = (e) => {

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

@@ -5,26 +5,15 @@ import {math} from "../../../math/math.js";
 
 const canvasPos = math.vec2();
 
-const getCanvasPosFromEvent = function (event, canvasPos) {
+const getCanvasPosFromEvent = function(event, canvas, canvasPos) {
     if (!event) {
         event = window.event;
         canvasPos[0] = event.x;
         canvasPos[1] = event.y;
     } else {
-        let element = event.target;
-        let totalOffsetLeft = 0;
-        let totalOffsetTop = 0;
-        let totalScrollX = 0;
-        let totalScrollY = 0;
-        while (element.offsetParent) {
-          totalOffsetLeft += element.offsetLeft;
-          totalOffsetTop += element.offsetTop;
-          totalScrollX += element.scrollLeft;
-          totalScrollY += element.scrollTop;
-          element = element.offsetParent;
-        }
-        canvasPos[0] = event.pageX + totalScrollX - totalOffsetLeft;
-        canvasPos[1] = event.pageY + totalScrollY - totalOffsetTop;
+        const canvasRect = canvas.getBoundingClientRect();
+        canvasPos[0] = event.clientX - canvasRect.left;
+        canvasPos[1] = event.clientY - canvasRect.top;
     }
     return canvasPos;
 };
@@ -296,7 +285,7 @@ class MousePanRotateDollyHandler {
             }
             switch (e.which) {
                 case 3: // Right button
-                    getCanvasPosFromEvent(e, canvasPos);
+                    getCanvasPosFromEvent(e, canvas, canvasPos);
                     const x = canvasPos[0];
                     const y = canvasPos[1];
                     if (Math.abs(x - lastXDown) < 3 && Math.abs(y - lastYDown) < 3) {
@@ -347,6 +336,10 @@ class MousePanRotateDollyHandler {
             updates.dollyDelta += -normalizedDelta * secsElapsed * configs.mouseWheelDollyRate;
 
             if (mouseMovedOnCanvasSinceLastWheel) {
+                if ((states.pointerCanvasPos[0] === 0) && (states.pointerCanvasPos[1] === 0)) {
+                    // Dirty fix to initiate states.pointerCanvasPos if a wheel over an empty space is the first action in a scene
+                    getCanvasPosFromEvent(e, canvas, states.pointerCanvasPos); // Added to fix XCD-386: The zoom speed slows down when zooming into an empty space for the first time on a relatively large model, and it cannot be reset without reloading
+                }
                 states.followPointerDirty = true;
                 mouseMovedOnCanvasSinceLastWheel = false;
             }

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

@@ -1,21 +1,14 @@
 import {math} from "../../../math/math.js";
 
-const getCanvasPosFromEvent = function (event, canvasPos) {
+const getCanvasPosFromEvent = function(event, canvas, canvasPos) {
     if (!event) {
         event = window.event;
         canvasPos[0] = event.x;
         canvasPos[1] = event.y;
     } else {
-        let element = event.target;
-        let totalOffsetLeft = 0;
-        let totalOffsetTop = 0;
-        while (element.offsetParent) {
-            totalOffsetLeft += element.offsetLeft;
-            totalOffsetTop += element.offsetTop;
-            element = element.offsetParent;
-        }
-        canvasPos[0] = event.pageX - totalOffsetLeft;
-        canvasPos[1] = event.pageY - totalOffsetTop;
+        const canvasRect = canvas.getBoundingClientRect();
+        canvasPos[0] = event.clientX - canvasRect.left;
+        canvasPos[1] = event.clientY - canvasRect.top;
     }
     return canvasPos;
 };
@@ -69,7 +62,7 @@ class TouchPanRotateAndDollyHandler {
 
                 tapStartTime = states.touchStartTime;
 
-                getCanvasPosFromEvent(touches[0], tapStartCanvasPos);
+                getCanvasPosFromEvent(touches[0], canvas, tapStartCanvasPos);
 
                 if (configs.followPointer) {
 
@@ -111,7 +104,7 @@ class TouchPanRotateAndDollyHandler {
             }
 
             for (let i = 0, len = touches.length; i < len; ++i) {
-                getCanvasPosFromEvent(touches[i], lastCanvasTouchPosList[i]);
+                getCanvasPosFromEvent(touches[i], canvas, lastCanvasTouchPosList[i]);
             }
 
             numTouches = touches.length;
@@ -159,7 +152,7 @@ class TouchPanRotateAndDollyHandler {
 
             if (numTouches === 1) {
 
-                getCanvasPosFromEvent(touches[0], tapCanvasPos0);
+                getCanvasPosFromEvent(touches[0], canvas, tapCanvasPos0);
 
                 //-----------------------------------------------------------------------------------------------
                 // Drag rotation
@@ -220,8 +213,8 @@ class TouchPanRotateAndDollyHandler {
                 const touch0 = touches[0];
                 const touch1 = touches[1];
 
-                getCanvasPosFromEvent(touch0, tapCanvasPos0);
-                getCanvasPosFromEvent(touch1, tapCanvasPos1);
+                getCanvasPosFromEvent(touch0, canvas, tapCanvasPos0);
+                getCanvasPosFromEvent(touch1, canvas, tapCanvasPos1);
 
                 const lastMiddleTouch = math.geometricMeanVec2(lastCanvasTouchPosList[0], lastCanvasTouchPosList[1]);
                 const currentMiddleTouch = math.geometricMeanVec2(tapCanvasPos0, tapCanvasPos1);
@@ -243,6 +236,7 @@ class TouchPanRotateAndDollyHandler {
                 const dollyDelta = (d2 - d1) * configs.touchDollyRate;
 
                 updates.dollyDelta = dollyDelta;
+                states.followPointerDirty = true; // Added to fix XCD-386: The zoom speed slows down when zooming into an empty space for the first time on a relatively large model, and it cannot be reset without reloading
 
                 if (Math.abs(dollyDelta) < 1.0) {
 
@@ -269,7 +263,7 @@ class TouchPanRotateAndDollyHandler {
             }
 
             for (let i = 0; i < numTouches; ++i) {
-                getCanvasPosFromEvent(touches[i], lastCanvasTouchPosList[i]);
+                getCanvasPosFromEvent(touches[i], canvas, lastCanvasTouchPosList[i]);
             }
         });
     }

package/types/viewer/Viewer.d.ts

@@ -51,8 +51,8 @@ export declare type ViewerConfiguration = {
   alphaDepthMask?: boolean;
   /** Whether to enable {@link Entity.offset}. For best performance, only set this ````true```` when you need to use {@link Entity.offset}. */
   entityOffsetsEnabled?: boolean;
-  /** Whether to enable full-precision accuracy when surface picking with {@link Scene.pick}. */
-  pickSurfacePrecisionEnabled?: boolean;
+  /** Whether to enable full-precision accuracy when surface picking with {@link Scene#pick}. Note that when ````true````, this configuration will increase the amount of browser memory used by the Viewer. The ````pickSurfacePrecision```` option for ````Scene#pick```` only works if this is set ````true````. */
+  readableGeometryEnabled?: boolean;
   /** Whether to enable logarithmic depth buffer. */
   logarithmicDepthBufferEnabled?: boolean;
   /** Whether to enable base color texture rendering. */