@xeokit/xeokit-sdk 2.6.3 → 2.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.3",
+  "version": "2.6.6",
   "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/extras/ContextMenu/ContextMenu.js

@@ -766,6 +766,27 @@ class ContextMenu {
                                     self._updateItemsEnabledStatus();
                                 }
                             });
+                            item.itemElement.addEventListener("mouseup", (event) => {
+                                if (event.which !== 3) {
+                                    return;
+                                }
+                                event.preventDefault();
+                                if (!self._context) {
+                                    return;
+                                }
+                                if (item.enabled === false) {
+                                    return;
+                                }
+                                if (item.doAction) {
+                                    item.doAction(self._context);
+                                }
+                                if (this._hideOnAction) {
+                                    self.hide();
+                                } else {
+                                    self._updateItemsTitles();
+                                    self._updateItemsEnabledStatus();
+                                }
+                            });
                             item.itemElement.addEventListener("mouseenter", (event) => {
                                 event.preventDefault();
                                 if (item.enabled === false) {

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsTouchControl.js

@@ -58,8 +58,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
         this._onCanvasTouchStart = null;
         this._onCanvasTouchEnd = null;
         this._longTouchTimeoutMs = 300;
-        this._snapToEdge = cfg.snapToEdge !== false;
-        this._snapToVertex = cfg.snapToVertex !== false;
+        this._snapping = cfg.snapping !== false;
         this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
 
         this._attachPlugin(angleMeasurementsPlugin, cfg);
@@ -89,39 +88,35 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
     }
 
     /**
-     * Sets whether snap-to-vertex is enabled for this AngleMeasurementsTouchControl.
-     * This is `true` by default.
-     * @param snapToVertex
-     */
-    set snapToVertex(snapToVertex) {
-        this._snapToVertex = snapToVertex;
-    }
-
-    /**
-     * Gets whether snap-to-vertex is enabled for this AngleMeasurementsTouchControl.
-     * This is `true` by default.
-     * @returns {*}
-     */
-    get snapToVertex() {
-        return this._snapToVertex;
-    }
-
-    /**
-     * Sets whether snap-to-edge is enabled for this AngleMeasurementsTouchControl.
+     * Sets whether snap-to-vertex and snap-to-edge are enabled for this AngleMeasurementsMouseControl.
+     *
      * This is `true` by default.
-     * @param snapToEdge
+     *
+     * Internally, this deactivates then activates the AngleMeasurementsMouseControl when changed, which means that
+     * it will destroy any AngleMeasurements currently under construction, and incurs some overhead, since it unbinds
+     * and rebinds various input handlers.
+     *
+     * @param {boolean} snapping Whether to enable snap-to-vertex and snap-edge for this AngleMeasurementsMouseControl.
      */
-    set snapToEdge(snapToEdge) {
-        this._snapToEdge = snapToEdge;
+    set snapping(snapping) {
+        if (snapping !== this._snapping) {
+            this._snapping = snapping;
+            this.deactivate();
+            this.activate();
+        } else {
+            this._snapping = snapping;
+        }
     }
 
     /**
-     * Gets whether snap-to-edge is enabled for this AngleMeasurementsTouchControl.
+     * Gets whether snap-to-vertex and snap-to-edge are enabled for this AngleMeasurementsMouseControl.
+     *
      * This is `true` by default.
-     * @returns {*}
+     *
+     * @returns {boolean} Whether snap-to-vertex and snap-to-edge are enabled for this AngleMeasurementsMouseControl.
      */
-    get snapToEdge() {
-        return this._snapToEdge;
+    get snapping() {
+        return this._snapping;
     }
 
     /**
@@ -151,11 +146,11 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
 
         let touchId = null;
 
-        const disableCameraMouseControl = () => {
+        const disableCameraNavigation = () => {
             this.plugin.viewer.cameraControl.active = false;
         }
 
-        const enableCameraMouseControl = () => {
+        const enableCameraNavigation = () => {
             this.plugin.viewer.cameraControl.active = true;
         }
 
@@ -168,7 +163,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                 this._currentAngleMeasurement.destroy();
                 this._currentAngleMeasurement = null;
             }
-            enableCameraMouseControl();
+            enableCameraNavigation();
             this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
         }
 
@@ -200,8 +195,8 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
                     const snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && snapPickResult.snapped) {
                         pointerWorldPos.set(snapPickResult.worldPos);
@@ -275,7 +270,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                         // }
                         this._touchState = WAITING_FOR_ORIGIN_LONG_TOUCH_END;
                       //  console.log("touchstart: this._touchState= WAITING_FOR_ORIGIN_TOUCH_START -> WAITING_FOR_ORIGIN_LONG_TOUCH_END")
-                        disableCameraMouseControl();
+                        disableCameraNavigation();
                     }, this._longTouchTimeoutMs);
                     this._touchState = WAITING_FOR_ORIGIN_QUICK_TOUCH_END;
                     //console.log("touchstart: this._touchState= WAITING_FOR_ORIGIN_TOUCH_START -> WAITING_FOR_ORIGIN_QUICK_TOUCH_END")
@@ -312,8 +307,8 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
 
                             const snapPickResult = scene.pick({
                                 canvasPos: touchMoveCanvasPos,
-                                snapToVertex: this._snapToVertex,
-                                snapToEdge: this._snapToEdge
+                                snapToVertex: this._snapping,
+                                snapToEdge: this._snapping
                             });
                             if (snapPickResult && snapPickResult.snapped) {
                                 if (this.pointerLens) {
@@ -365,7 +360,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                             this._touchState = WAITING_FOR_CORNER_LONG_TOUCH_END;
                            // console.log("touchstart: this._touchState= WAITING_FOR_CORNER_TOUCH_START -> WAITING_FOR_CORNER_LONG_TOUCH_END")
 
-                            disableCameraMouseControl();
+                            disableCameraNavigation();
 
                         }, this._longTouchTimeoutMs);
 
@@ -405,8 +400,8 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
 
                             const snapPickResult = scene.pick({
                                 canvasPos: touchMoveCanvasPos,
-                                snapToVertex: this._snapToVertex,
-                                snapToEdge: this._snapToEdge
+                                snapToVertex: this._snapping,
+                                snapToEdge: this._snapping
                             });
                             if (snapPickResult && snapPickResult.snapped) {
                                 if (this.pointerLens) {
@@ -458,7 +453,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                             this._touchState = WAITING_FOR_TARGET_LONG_TOUCH_END;
                            // console.log("touchstart: this._touchState= WAITING_FOR_TARGET_TOUCH_START -> WAITING_FOR_TARGET_LONG_TOUCH_END")
 
-                            disableCameraMouseControl();
+                            disableCameraNavigation();
 
                         }, this._longTouchTimeoutMs);
 
@@ -519,8 +514,8 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
                     snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && (snapPickResult.snapped)) {
                         if (this.pointerLens) {
@@ -568,8 +563,8 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
                     snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && snapPickResult.worldPos) {
                         if (this.pointerLens) {
@@ -624,8 +619,8 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
                     snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && snapPickResult.worldPos) {
                         if (this.pointerLens) {
@@ -740,7 +735,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                       //  console.log("touchend: this._touchState= WAITING_FOR_ORIGIN_QUICK_TOUCH_END -> WAITING_FOR_ORIGIN_TOUCH_START")
                     }
                 }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_ORIGIN_LONG_TOUCH_END:
@@ -758,7 +753,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                         this._touchState = WAITING_FOR_CORNER_TOUCH_START;
                        // console.log("touchend: this._touchState= WAITING_FOR_ORIGIN_LONG_TOUCH_END (picked, begin measurement) -> WAITING_FOR_CORNER_TOUCH_START")
                     }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_CORNER_QUICK_TOUCH_END: {
@@ -795,7 +790,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
 
                 }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_CORNER_LONG_TOUCH_END:
@@ -804,7 +799,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
                     this._touchState = WAITING_FOR_TARGET_TOUCH_START;
                   //  console.log("touchend: this._touchState= WAITING_FOR_CORNER_LONG_TOUCH_END  -> WAITING_FOR_ORIGIN_TOUCH_START")
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_TARGET_QUICK_TOUCH_END: {
@@ -840,7 +835,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
                    // console.log("touchend: this._touchState= WAITING_FOR_TARGET_TOUCH_START -> WAITING_FOR_ORIGIN_TOUCH_START")
                 }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_TARGET_LONG_TOUCH_END:
@@ -861,7 +856,7 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                         this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
                        // console.log("touchend: this._touchState= WAITING_FOR_TARGET_LONG_TOUCH_END  -> WAITING_FOR_ORIGIN_TOUCH_START")
                     }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
             }
 

package/src/plugins/BCFViewpointsPlugin/BCFViewpointsPlugin.js

@@ -757,7 +757,7 @@ class BCFViewpointsPlugin extends Plugin {
                 const view_setup_hints = bcfViewpoint.components.visibility.view_setup_hints;
                 if (view_setup_hints) {
                     if (view_setup_hints.spaces_visible === false) {
-                        scene.setObjectsVisible(viewer.metaScene.getObjectIDsByType("IfcSpace"), true);
+                        scene.setObjectsVisible(viewer.metaScene.getObjectIDsByType("IfcSpace"), false);
                     }
                     if (view_setup_hints.spaces_translucent !== undefined) {
                         scene.setObjectsXRayed(viewer.metaScene.getObjectIDsByType("IfcSpace"), true);

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -147,7 +147,7 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
      * it will destroy any DistanceMeasurements currently under construction, and incurs some overhead, since it unbinds
      * and rebinds various input handlers.
      *
-     * @param {boolean} snapping Whether to enable snap-to-vertex and snap-edge for this DistanceMeasurementsMouseControl.
+     * @param snapping
      */
     set snapping(snapping) {
         if (snapping !== this._snapping) {
@@ -163,13 +163,12 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
      * Gets whether snap-to-vertex and snap-to-edge are enabled for this DistanceMeasurementsMouseControl.
      *
      * This is `true` by default.
-     *
-     * @returns {boolean} Whether snap-to-vertex and snap-to-edge are enabled for this DistanceMeasurementsMouseControl.
+     * @returns {*}
      */
     get snapping() {
         return this._snapping;
     }
-
+    
     /**
      * Activates this DistanceMeasurementsMouseControl, ready to respond to input.
      */
@@ -204,12 +203,12 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
         const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
 
         const pagePos = math.vec2();
-
+        
         this._onCameraControlHoverSnapOrSurface = cameraControl.on(
             this._snapping
                 ? "hoverSnapOrSurface"
                 : "hoverSurface", event => {
-               const canvasPos = event.snappedCanvasPos ||event.canvasPos;
+                const canvasPos = event.snappedCanvasPos || event.canvasPos;
                 mouseHovering = true;
                 pointerWorldPos.set(event.worldPos);
                 pointerCanvasPos.set(event.canvasPos);
@@ -237,7 +236,7 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                     } else {
                         if (this.pointerLens) {
                             this.pointerLens.visible = true;
-                            this.pointerLens.canvasPos =  event.canvasPos;
+                            this.pointerLens.canvasPos = event.canvasPos;
                             this.pointerLens.snappedCanvasPos = event.canvasPos;
                             this.pointerLens.snapped = false;
                         }
@@ -271,7 +270,7 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
             pointerDownCanvasY = e.clientY;
         });
 
-        canvas.addEventListener("mouseup", this._onMouseUp =(e) => {
+        canvas.addEventListener("mouseup", this._onMouseUp = (e) => {
             if (e.which !== 1) {
                 return;
             }
@@ -326,21 +325,21 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
             this._snapping
                 ? "hoverSnapOrSurfaceOff"
                 : "hoverOff", event => {
-            if (this.pointerLens) {
-                this.pointerLens.visible = true;
-                this.pointerLens.canvasPos =  event.canvasPos;
-                this.pointerLens.snappedCanvasPos = event.snappedCanvasPos || event.canvasPos;
-            }
-            mouseHovering = false;
-            this._markerDiv.style.left = `-100px`;
-            this._markerDiv.style.top = `-100px`;
-            if (this._currentDistanceMeasurement) {
-                this._currentDistanceMeasurement.wireVisible = false;
-                this._currentDistanceMeasurement.targetVisible = false;
-                this._currentDistanceMeasurement.axisVisible = false;
-            }
-            canvas.style.cursor = "default";
-        });
+                if (this.pointerLens) {
+                    this.pointerLens.visible = true;
+                    this.pointerLens.canvasPos = event.canvasPos;
+                    this.pointerLens.snappedCanvasPos = event.snappedCanvasPos || event.canvasPos;
+                }
+                mouseHovering = false;
+                this._markerDiv.style.left = `-100px`;
+                this._markerDiv.style.top = `-100px`;
+                if (this._currentDistanceMeasurement) {
+                    this._currentDistanceMeasurement.wireVisible = false;
+                    this._currentDistanceMeasurement.targetVisible = false;
+                    this._currentDistanceMeasurement.axisVisible = false;
+                }
+                canvas.style.cursor = "default";
+            });
 
         this._active = true;
     }

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsTouchControl.js

@@ -63,8 +63,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
         this._onCanvasTouchStart = null;
         this._onCanvasTouchEnd = null;
         this._longTouchTimeoutMs = 300;
-        this._snapToEdge = cfg.snapToEdge !== false;
-        this._snapToVertex = cfg.snapToVertex !== false;
+        this._snapping = cfg.snapping !== false;
         this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
 
         this._attachPlugin(distanceMeasurementsPlugin, cfg);
@@ -94,39 +93,35 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
     }
 
     /**
-     * Sets whether snap-to-vertex is enabled for this DistanceMeasurementsTouchControl.
-     * This is `true` by default.
-     * @param snapToVertex
-     */
-    set snapToVertex(snapToVertex) {
-        this._snapToVertex = snapToVertex;
-    }
-
-    /**
-     * Gets whether snap-to-vertex is enabled for this DistanceMeasurementsTouchControl.
-     * This is `true` by default.
-     * @returns {*}
-     */
-    get snapToVertex() {
-        return this._snapToVertex;
-    }
-
-    /**
-     * Sets whether snap-to-edge is enabled for this DistanceMeasurementsTouchControl.
+     * Sets whether snap-to-vertex and snap-to-edge are enabled for this DistanceMeasurementsTouchControl.
+     *
      * This is `true` by default.
-     * @param snapToEdge
+     *
+     * Internally, this deactivates then activates the DistanceMeasurementsTouchControl when changed, which means that
+     * it will destroy any DistanceMeasurements currently under construction, and incurs some overhead, since it unbinds
+     * and rebinds various input handlers.
+     *
+     * @param {boolean} snapping Whether to enable snap-to-vertex and snap-edge for this DistanceMeasurementsTouchControl.
      */
-    set snapToEdge(snapToEdge) {
-        this._snapToEdge = snapToEdge;
+    set snapping(snapping) {
+        if (snapping !== this._snapping) {
+            this._snapping = snapping;
+            this.deactivate();
+            this.activate();
+        } else {
+            this._snapping = snapping;
+        }
     }
 
     /**
-     * Gets whether snap-to-edge is enabled for this DistanceMeasurementsTouchControl.
+     * Gets whether snap-to-vertex and snap-to-edge are enabled for this DistanceMeasurementsTouchControl.
+     *
      * This is `true` by default.
-     * @returns {*}
+     *
+     * @returns {boolean} Whether snap-to-vertex and snap-to-edge are enabled for this DistanceMeasurementsTouchControl.
      */
-    get snapToEdge() {
-        return this._snapToEdge;
+    get snapping() {
+        return this._snapping;
     }
 
     /**
@@ -156,11 +151,11 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
 
         let touchId = null;
 
-        const disableCameraMouseControl = () => {
+        const disableCameraNavigation = () => {
             this.plugin.viewer.cameraControl.active = false;
         }
 
-        const enableCameraMouseControl = () => {
+        const enableCameraNavigation = () => {
             this.plugin.viewer.cameraControl.active = true;
         }
 
@@ -173,7 +168,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                 this._currentDistanceMeasurement.destroy();
                 this._currentDistanceMeasurement = null;
             }
-            enableCameraMouseControl();
+            enableCameraNavigation();
             this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
         }
 
@@ -205,8 +200,8 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                     }
                     const snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapping: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && snapPickResult.snapped) {
                         pointerWorldPos.set(snapPickResult.worldPos);
@@ -276,7 +271,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                         // }
                         this._touchState = WAITING_FOR_ORIGIN_LONG_TOUCH_END;
                         // console.log("touchstart: this._touchState= WAITING_FOR_ORIGIN_TOUCH_START -> WAITING_FOR_ORIGIN_LONG_TOUCH_END")
-                        disableCameraMouseControl();
+                        disableCameraNavigation();
                     }, this._longTouchTimeoutMs);
                     this._touchState = WAITING_FOR_ORIGIN_QUICK_TOUCH_END;
                     // console.log("touchstart: this._touchState= WAITING_FOR_ORIGIN_TOUCH_START -> WAITING_FOR_ORIGIN_QUICK_TOUCH_END")
@@ -314,8 +309,8 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
 
                             const snapPickResult = scene.pick({
                                 canvasPos: touchMoveCanvasPos,
-                                snapToVertex: this._snapToVertex,
-                                snapToEdge: this._snapToEdge
+                                snapToVertex: this._snapping,
+                                snapToEdge: this._snapping
                             });
                             if (snapPickResult && snapPickResult.snapped) {
                                 if (this.pointerLens) {
@@ -359,7 +354,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                             this._touchState = WAITING_FOR_TARGET_LONG_TOUCH_END;
                             // console.log("touchstart: this._touchState= WAITING_FOR_TARGET_TOUCH_START -> WAITING_FOR_TARGET_LONG_TOUCH_END")
 
-                            disableCameraMouseControl();
+                            disableCameraNavigation();
 
                         }, this._longTouchTimeoutMs);
 
@@ -419,10 +414,8 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                     }
                     snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-
-
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && (snapPickResult.snapped)) {
                         if (this.pointerLens) {
@@ -523,8 +516,8 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                     }
                     snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && snapPickResult.worldPos) {
                         if (this.pointerLens) {
@@ -633,7 +626,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                         //  console.log("touchend: this._touchState= WAITING_FOR_ORIGIN_QUICK_TOUCH_END -> WAITING_FOR_ORIGIN_TOUCH_START")
                     }
                 }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_ORIGIN_LONG_TOUCH_END:
@@ -651,7 +644,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                         this._touchState = WAITING_FOR_TARGET_TOUCH_START;
                         //  console.log("touchend: this._touchState= WAITING_FOR_ORIGIN_LONG_TOUCH_END (picked, begin measurement) -> WAITING_FOR_TARGET_TOUCH_START")
                     }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_TARGET_QUICK_TOUCH_END: {
@@ -684,7 +677,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                     this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
                     //  console.log("touchend: this._touchState= WAITING_FOR_TARGET_TOUCH_START -> WAITING_FOR_ORIGIN_TOUCH_START")
                 }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_TARGET_LONG_TOUCH_END:
@@ -705,7 +698,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                         this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
                         //  console.log("touchend: this._touchState= WAITING_FOR_TARGET_LONG_TOUCH_END  -> WAITING_FOR_ORIGIN_TOUCH_START")
                     }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
             }
 

package/src/viewer/scene/mesh/occlusion/OcclusionRenderer.js

@@ -73,6 +73,10 @@ OcclusionRenderer.prototype.drawMesh = function (frameCtx, mesh) {
     const geometryState = mesh._geometry._state;
     const origin = mesh.origin;
 
+    if (materialState.alpha < 1.0) {
+        return;
+    }
+
     if (frameCtx.lastProgramId !== this._program.id) {
         frameCtx.lastProgramId = this._program.id;
         this._bindProgram(frameCtx);

package/src/viewer/scene/model/SceneModelTransform.js

@@ -67,7 +67,7 @@ export class SceneModelTransform {
         this._childTransforms.push(childTransform);
         childTransform._parentTransform = this;
         childTransform._transformDirty();
-        childTransform._setAABBDirty();
+        childTransform._setSubtreeAABBsDirty(this);
     }
 
     _addMesh(mesh) {

package/types/plugins/AngleMeasurementsPlugin/AngleMeasurementsControl.d.ts

@@ -8,6 +8,7 @@ import {AngleMeasurementsPlugin} from "./AngleMeasurementsPlugin";
  * Once the AngleMeasurementControl is activated, the first click on any {@link Entity} begins constructing a {@link AngleMeasurement}, fixing its origin to that Entity. The next click on any Entity will complete the AngleMeasurement, fixing its target to that second Entity. The AngleMeasurementControl will then wait for the next click on any Entity, to begin constructing another AngleMeasurement, and so on, until deactivated.
  */
 export declare class AngleMeasurementsControl extends Component {
+
     /**
      * The {@link AngleMeasurementsPlugin} that owns this AngleMeasurementsControl.
      * @type {AngleMeasurementsPlugin}
@@ -86,4 +87,12 @@ export declare class AngleMeasurementsControl extends Component {
      * @param scope  Scope for the callback
      */
     on(event: "measurementStart", callback: (measurement: AngleMeasurement) => void, scope?: any): string
+
+    /**
+     * Fires when the control is (de)activated
+     * @param event The activation event
+     * @param callback Called fired on the event
+     * @param scope  Scope for the callback
+     */
+    on(event: "activated", callback: (activated: boolean) => void, scope?: any): string
 }

package/types/plugins/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.d.ts

@@ -1,7 +1,6 @@
 import { AngleMeasurementsControl } from "./AngleMeasurementsControl.js";
-import { math } from "../../viewer/scene/math/math.js";
 import {AngleMeasurementsPlugin} from "./AngleMeasurementsPlugin";
-import {PointerLens} from "../../extras/PointerLens/PointerLens";
+import {PointerLens} from "../../extras/";
 
 /**
  * Creates {@link AngleMeasurement}s in an {@link AngleMeasurementsPlugin} from mouse input.

package/types/plugins/AngleMeasurementsPlugin/AngleMeasurementsPlugin.d.ts

@@ -3,12 +3,16 @@ import { AngleMeasurement } from "./AngleMeasurement";
 import { AngleMeasurementsControl } from "./AngleMeasurementsControl";
 
 export declare type AngleMeasurementsPluginConfiguration = {
+
   /** Optional ID for this plugin, so that we can find it within {@link Viewer.plugins}. */
   id?: string;
+
   /** Container DOM element for markers and labels. Defaults to ````document.body````. */
   container?: HTMLElement;
+
   /** The default color of the dots, wire and label. */
   defaultColor?: string;
+
   /** If set, the wires, dots and labels will have this zIndex (+1 for dots and +2 for labels). */
   zIndex?: number;
 };