@xeokit/xeokit-sdk 2.6.0-beta-9 → 2.6.0-beta-11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.0-beta-9",
+  "version": "2.6.0-beta-11",
   "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

@@ -48,6 +48,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
      *
      * @param {AngleMeasurementsPlugin} angleMeasurementsPlugin The AngleMeasurementsPlugin to control.
      * @param {*} [cfg] Configuration
+     * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-space coordinates to page coordinates.
      * @param {PointerLens} [cfg.pointerLens] A PointerLens to use to provide a magnified view of the cursor when snapping is enabled.
      * @param {boolean} [cfg.snapping=true] Whether to initially enable snap-to-vertex and snap-to-edge for this AngleMeasurementsMouseControl.
      */
@@ -55,6 +56,8 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
 
         super(angleMeasurementsPlugin.viewer.scene);
 
+        this._canvasToPagePos = cfg.canvasToPagePos;
+
         this.pointerLens = cfg.pointerLens;
 
         this._active = false;
@@ -193,6 +196,8 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
         const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
 
+        const pagePos = math.vec2();
+
         this._onMouseHoverSurface = cameraControl.on(
             this._snapping
                 ? "hoverSnapOrSurface"
@@ -224,9 +229,14 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                 mouseHoverCanvasPos.set(canvasPos);
                 switch (this._mouseState) {
                     case MOUSE_FINDING_ORIGIN:
-                        this.markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
-                        this.markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
-
+                        if (this._canvasToPagePos) {
+                            this._canvasToPagePos(canvas, canvasPos, pagePos);
+                            this.markerDiv.style.left = `${pagePos[0] - 5}px`;
+                            this.markerDiv.style.top = `${pagePos[1] - 5}px`;
+                        } else {
+                            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/DistanceMeasurement.js

@@ -353,7 +353,7 @@ class DistanceMeasurement extends Component {
 
         if (this._sectionPlanesDirty) {
 
-            if (this._isSliced(this._wp)) {
+            if (this._isSliced(this._originWorld) || this._isSliced(this._targetWorld)) {
                 this._xAxisLabel.setCulled(true);
                 this._yAxisLabel.setCulled(true);
                 this._zAxisLabel.setCulled(true);

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -47,6 +47,7 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
      *
      * @param {DistanceMeasurementsPlugin} distanceMeasurementsPlugin The AngleMeasurementsPlugin to control.
      * @param [cfg] Configuration
+     * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-space coordinates to page coordinates.
      * @param {PointerLens} [cfg.pointerLens] A PointerLens to use to provide a magnified view of the cursor when snapping is enabled.
      * @param {boolean} [cfg.snapping=true] Whether to initially enable snap-to-vertex and snap-to-edge for this DistanceMeasurementsMouseControl.
      */
@@ -54,6 +55,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
 
         super(distanceMeasurementsPlugin.viewer.scene);
 
+        this._canvasToPagePos = cfg.canvasToPagePos;
+
         this.pointerLens = cfg.pointerLens;
 
         this._active = false;
@@ -200,6 +203,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
         const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
         const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
 
+        const pagePos = math.vec2();
+
         this._onCameraControlHoverSnapOrSurface = cameraControl.on(
             this._snapping
                 ? "hoverSnapOrSurface"
@@ -210,8 +215,14 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                 pointerCanvasPos.set(event.canvasPos);
                 if (this._mouseState === MOUSE_FIRST_CLICK_EXPECTED) {
 
-                    this._markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
-                    this._markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
+                    if (this._canvasToPagePos) {
+                        this._canvasToPagePos(canvas, canvasPos, pagePos);
+                        this._markerDiv.style.left = `${pagePos[0] - 5}px`;
+                        this._markerDiv.style.top = `${pagePos[1] - 5}px`;
+                    } else {
+                        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) {