@xeokit/xeokit-sdk 2.6.0-beta-6 → 2.6.0-beta-8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.0-beta-6",
+  "version": "2.6.0-beta-8",
   "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/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.js

@@ -189,6 +189,10 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         const mouseWorldPos = math.vec3();
         const mouseHoverCanvasPos = math.vec2();
         this._currentAngleMeasurement = null;
+
+        const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
+        const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
+
         this._onMouseHoverSurface = cameraControl.on(
             this._snapping
                 ? "hoverSnapOrSurface"
@@ -220,13 +224,9 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                 mouseHoverCanvasPos.set(canvasPos);
                 switch (this._mouseState) {
                     case MOUSE_FINDING_ORIGIN:
-                        const canvasBoundRect = canvas.getBoundingClientRect();
-                        const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft;
-                        const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
-                        const canvasLeftEdge = canvasBoundRect.left + scrollLeft;
-                        const canvasTopEdge = canvasBoundRect.top + scrollTop;
-                        this.markerDiv.style.left = `${canvasLeftEdge + canvasPos[0] - 5}px`;
-                        this.markerDiv.style.top = `${canvasTopEdge + canvasPos[1] - 5}px`;
+                        this.markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
+                        this.markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
+
                         break;
                     case MOUSE_FINDING_CORNER:
                         if (this._currentAngleMeasurement) {

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -197,6 +197,9 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
 
         this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
 
+        const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
+        const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
+
         this._onCameraControlHoverSnapOrSurface = cameraControl.on(
             this._snapping
                 ? "hoverSnapOrSurface"
@@ -207,16 +210,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                 pointerCanvasPos.set(event.canvasPos);
                 if (this._mouseState === MOUSE_FIRST_CLICK_EXPECTED) {
 
-                   // const canvasBoundary = getCanvasBoundary();
-
-                    const canvasBoundRect = canvas.getBoundingClientRect();
-                    const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft;
-                    const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
-                    const canvasLeftEdge = canvasBoundRect.left + scrollLeft;
-                    const canvasTopEdge = canvasBoundRect.top + scrollTop;
-
-                    this._markerDiv.style.left = `${canvasLeftEdge + canvasPos[0] - 5}px`;
-                    this._markerDiv.style.top = `${canvasTopEdge + canvasPos[1] - 5}px`;
+                    this._markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
+                    this._markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
 
                     this._markerDiv.style.background = "pink";
                     if (event.snappedToVertex || event.snappedToEdge) {

package/src/plugins/GLTFLoaderPlugin/GLTFDefaultDataSource.js

@@ -1,5 +1,5 @@
 import {utils} from "../../viewer/scene/utils.js";
-import {core} from "../../viewer/scene/core";
+import {core} from "../../viewer/scene/core.js";
 
 /**
  * Default data access strategy for {@link GLTFLoaderPlugin}.

package/src/viewer/Plugin.js

@@ -1,5 +1,5 @@
 import {Map} from "./scene/utils/Map.js";
-import {core} from "./scene/core";
+import {core} from "./scene/core.js";
 
 /**
  @desc Base class for {@link Viewer} plugin classes.

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 '../../node_modules/html2canvas/dist/html2canvas.esm.js';
 
 /**
  * The 3D Viewer at the heart of the xeokit SDK.

package/src/viewer/scene/CameraControl/lib/CameraUpdater.js

@@ -103,6 +103,9 @@ class CameraUpdater {
                         }
                     }
                 }
+            } else {
+              dollyDistFactor = 1;
+              followPointerWorldPos = null;
             }
 
             const dollyDeltaForDist = (updates.dollyDelta * dollyDistFactor);
@@ -309,4 +312,4 @@ class CameraUpdater {
     }
 }
 
-export {CameraUpdater};
+export {CameraUpdater};

package/src/viewer/scene/model/dtx/triangles/DTXTrianglesLayer.js

@@ -860,7 +860,9 @@ export class DTXTrianglesLayer {
         // Color
 
         let f0;
-        if (!visible || culled || xrayed) { // Highlight & select are layered on top of color - not mutually exclusive
+        if (!visible || culled || xrayed
+            || (highlighted && !this.model.scene.highlightMaterial.glowThrough)
+            || (selected && !this.model.scene.selectedMaterial.glowThrough)) {
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (transparent) {

package/src/viewer/scene/model/vbo/batching/triangles/renderers/EdgesEmphasisRenderer.js

@@ -1,5 +1,5 @@
 import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
-import {EdgesRenderer} from "./EdgesRenderer";
+import {EdgesRenderer} from "./EdgesRenderer.js";
 
 
 /**

package/src/viewer/scene/utils/FileLoader.js

@@ -1,6 +1,6 @@
 import {Cache} from './Cache.js';
 import {Loader} from './Loader.js';
-import {core} from "../core";
+import {core} from "../core.js";
 
 const loading = {};
 

package/src/viewer/scene/utils.js

@@ -1,7 +1,7 @@
 /**
  * @private
  */
-import {core} from "./core";
+import {core} from "./core.js";
 
 function xmlToJson(node, attributeRenamer) {
     if (node.nodeType === node.TEXT_NODE) {