@xeokit/xeokit-sdk 2.6.5 → 2.6.7

package/dist/xeokit-sdk.es.js

@@ -13082,8 +13082,7 @@ 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$1;
 
         this._attachPlugin(angleMeasurementsPlugin, cfg);
@@ -13113,39 +13112,35 @@ 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;
     }
 
     /**
@@ -13175,11 +13170,11 @@ 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;
         };
 
@@ -13192,7 +13187,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                 this._currentAngleMeasurement.destroy();
                 this._currentAngleMeasurement = null;
             }
-            enableCameraMouseControl();
+            enableCameraNavigation();
             this._touchState = WAITING_FOR_ORIGIN_TOUCH_START$1;
         };
 
@@ -13224,8 +13219,8 @@ 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);
@@ -13299,7 +13294,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                         // }
                         this._touchState = WAITING_FOR_ORIGIN_LONG_TOUCH_END$1;
                       //  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$1;
                     //console.log("touchstart: this._touchState= WAITING_FOR_ORIGIN_TOUCH_START -> WAITING_FOR_ORIGIN_QUICK_TOUCH_END")
@@ -13336,8 +13331,8 @@ 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) {
@@ -13389,7 +13384,7 @@ 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);
 
@@ -13429,8 +13424,8 @@ 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) {
@@ -13482,7 +13477,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                             this._touchState = WAITING_FOR_TARGET_LONG_TOUCH_END$1;
                            // console.log("touchstart: this._touchState= WAITING_FOR_TARGET_TOUCH_START -> WAITING_FOR_TARGET_LONG_TOUCH_END")
 
-                            disableCameraMouseControl();
+                            disableCameraNavigation();
 
                         }, this._longTouchTimeoutMs);
 
@@ -13543,8 +13538,8 @@ 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) {
@@ -13592,8 +13587,8 @@ 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) {
@@ -13648,8 +13643,8 @@ 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) {
@@ -13761,7 +13756,7 @@ 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$1:
@@ -13779,7 +13774,7 @@ 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: {
@@ -13816,7 +13811,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
 
                 }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
 
                 case WAITING_FOR_CORNER_LONG_TOUCH_END:
@@ -13825,7 +13820,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     }
                     this._touchState = WAITING_FOR_TARGET_TOUCH_START$1;
                   //  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$1: {
@@ -13861,7 +13856,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                     this._touchState = WAITING_FOR_ORIGIN_TOUCH_START$1;
                    // 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$1:
@@ -13882,7 +13877,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
                         this._touchState = WAITING_FOR_ORIGIN_TOUCH_START$1;
                        // console.log("touchend: this._touchState= WAITING_FOR_TARGET_LONG_TOUCH_END  -> WAITING_FOR_ORIGIN_TOUCH_START")
                     }
-                    enableCameraMouseControl();
+                    enableCameraNavigation();
                     break;
             }
 
@@ -28406,6 +28401,206 @@ class SAO extends Component {
     }
 }
 
+/**
+ * @desc Configures cross-section slices for a {@link Scene}.
+ *
+ * ## Overview
+ *
+ * Cross-sections allow to create an additional colored slice for used clipping planes. It is only a visual effect
+ * calculated by shaders. It makes it easier to see the intersection between the model and the clipping plane this way.
+ *
+ * ## Usage
+ *
+ * In the example below, we'll configure CrossSections to manipulate the slice representation.
+ *
+ * ````javascript
+ * //------------------------------------------------------------------------------------------------------------------
+ * // Import the modules we need for this example
+ * //------------------------------------------------------------------------------------------------------------------
+ *
+ * import {PhongMaterial, Viewer, math, SectionPlanesPlugin, XKTLoaderPlugin, Mesh, ReadableGeometry, buildPolylineGeometryFromCurve, SplineCurve} from "../../dist/xeokit-sdk.es.js";
+ *
+ * //------------------------------------------------------------------------------------------------------------------
+ * // Create a Viewer and arrange the camera
+ * //------------------------------------------------------------------------------------------------------------------
+ *
+ * const viewer = new Viewer({
+ *   canvasId: "myCanvas",
+ *   transparent: true
+ * });
+ *
+ * viewer.camera.eye = [-2.341298674548419, 22.43987089731119, 7.236688436028655];
+ * viewer.camera.look = [4.399999999999963, 3.7240000000000606, 8.899000000000006];
+ * viewer.camera.up = [0.9102954845584759, 0.34781746407929504, 0.22446635042673466];
+ *
+ * const cameraControl = viewer.cameraControl;
+ * cameraControl.navMode = "orbit";
+ * cameraControl.followPointer = true;
+ *
+ * //----------------------------------------------------------------------------------------------------------------------
+ * // Create a xeokit loader plugin, load a model, fit to view
+ * //----------------------------------------------------------------------------------------------------------------------
+ *
+ * const xktLoader = new XKTLoaderPlugin(viewer);
+ *
+ * var t0 = performance.now();
+ *
+ * document.getElementById("time").innerHTML = "Loading model...";
+ *
+ * const sceneModel = xktLoader.load({
+ *   id: "myModel",
+ *   src: "../../assets/models/xkt/v10/glTF-Embedded/Duplex_A_20110505.glTFEmbedded.xkt",
+ *   edges: true
+ * });
+ *
+ * sceneModel.on("loaded", () => {
+ *   var t1 = performance.now();
+ *   document.getElementById("time").innerHTML = "Model loaded in " + Math.floor(t1 - t0) / 1000.0 + " seconds<br>Objects: " + sceneModel.numEntities;
+ *
+ *   let path = new SplineCurve(viewer.scene, {
+ *     points: [
+ *       [0, 0, -10],
+ *       [0, 0, -3],
+ *       [10, 0, 10],
+ *       [10, 0, 30],
+ *     ],
+ *   });
+ *
+ *   new Mesh(viewer.scene, {
+ *     geometry: new ReadableGeometry(viewer.scene, buildPolylineGeometryFromCurve({
+ *       id: "SplineCurve",
+ *       curve: path,
+ *       divisions: 50,
+ *     })),
+ *     material: new PhongMaterial(viewer.scene, {
+ *       emissive: [1, 0, 0]
+ *     })
+ *   });
+ *
+ *   //------------------------------------------------------------------------------------------------------------------
+ *   // Create a moving SectionPlane, that moves through the table models
+ *   //------------------------------------------------------------------------------------------------------------------
+ *
+ *   const sectionPlanes = new SectionPlanesPlugin(viewer, {
+ *     overviewCanvasId: "mySectionPlanesOverviewCanvas",
+ *     overviewVisible: true
+ *   });
+ *
+ *   let currentPoint = path.getPoint(0);
+ *   let currentDirection = path.getTangent(0);
+ *
+ *   const sectionPlane = sectionPlanes.createSectionPlane({
+ *     id: "mySectionPlane",
+ *     pos: currentPoint,
+ *     dir: currentDirection
+ *   });
+ *
+ *   sectionPlanes.showControl(sectionPlane.id);
+ *
+ *   //------------------------------------------------------------------------------------------------------------------
+ *   // Controlling SectionPlane position and direction
+ *   //------------------------------------------------------------------------------------------------------------------
+ *
+ *   let currentT = 0.0;
+ *   document.getElementById("section_path").oninput = function() {
+ *     currentT = Number(document.getElementById("section_path").value);
+ *     currentPoint = path.getPoint(currentT);
+ *     currentDirection = path.getTangent(currentT);
+ *     sectionPlane.pos = currentPoint;
+ *     sectionPlane.dir = currentDirection;
+ *   };
+ *
+ *   window.viewer = viewer;
+ *
+ *   //------------------------------------------------------------------------------------------------------------------
+ *   // Controlling CrossSections settings
+ *   //------------------------------------------------------------------------------------------------------------------
+ *
+ *   viewer.scene.crossSections.sliceThickness = 0.05;
+ *   viewer.scene.crossSections.sliceColor = [0.0, 0.0, 0.0, 1.0];
+ * });
+ * ````
+ *
+ * [[Run this example](https://xeokit.github.io/xeokit-sdk/examples/slicing/#SectionPlanesPlugin_Duplex_SectionPath_CrossSections)]
+ *
+ */
+class CrossSections extends Component {
+
+    /** @private */
+    constructor(owner, cfg = {}) {
+
+        super(owner, cfg);
+
+        this.sliceColor = cfg.sliceColor;
+        this.sliceThickness  = cfg.sliceThickness;
+    }
+
+    /**
+     * Sets the thickness of a slice created by a section.
+     *
+     * Default value is ````0.0````.
+     *
+     * @type {Number}
+     */
+    set sliceThickness(value) {
+        if (value === undefined || value === null) {
+            value = 0.0;
+        }
+        if (this._sliceThickness === value) {
+            return;
+        }
+        this._sliceThickness = value;
+        this.glRedraw();
+    }
+
+    /**
+     * Gets the thickness of a slice created by a section.
+     *
+     * Default value is ````0.0````.
+     *
+     * @type {Number}
+     */
+    get sliceThickness() {
+        return this._sliceThickness;
+    }
+
+    /**
+     * Sets the color of a slice created by a section.
+     *
+     * Default value is ````[0.0, 0.0, 0.0, 1.0]````.
+     *
+     * @type {Number}
+     */
+    set sliceColor(value) {
+        if (value === undefined || value === null) {
+            value = [0.0, 0.0, 0.0, 1.0];
+        }
+        if (this._sliceColor === value) {
+            return;
+        }
+        this._sliceColor = value;
+        this.glRedraw();
+    }
+
+    /**
+     * Gets the color of a slice created by a section.
+     *
+     * Default value is ````[0.0, 0.0, 0.0, 1.0]````.
+     *
+     * @type {Number}
+     */
+    get sliceColor() {
+        return this._sliceColor;
+    }
+
+    /**
+     * Destroys this component.
+     */
+    destroy() {
+        super.destroy();
+    }
+}
+
 const PRESETS$1 = {
     "default": {
         pointSize: 4,
@@ -29792,6 +29987,14 @@ class Scene extends Component {
             enabled: cfg.saoEnabled
         });
 
+        /** Configures Cross Sections for this Scene.
+         * @type {CrossSections}
+         * @final
+         */
+        this.crossSections = new CrossSections(this, {
+
+        });
+
         this.ticksPerRender = cfg.ticksPerRender;
         this.ticksPerOcclusionTest = cfg.ticksPerOcclusionTest;
         this.passes = cfg.passes;
@@ -50054,6 +50257,10 @@ class VBORenderer {
             const sectionPlanes = scene._sectionPlanesState.sectionPlanes;
             const baseIndex = layerIndex * numSectionPlanes;
             const renderFlags = model.renderFlags;
+            if (scene.crossSections) {
+                gl.uniform4fv(this._uSliceColor, scene.crossSections.sliceColor);
+                gl.uniform1f(this._uSliceThickness, scene.crossSections.sliceThickness);
+            }
             for (let sectionPlaneIndex = 0; sectionPlaneIndex < numAllocatedSectionPlanes; sectionPlaneIndex++) {
                 const sectionPlaneUniforms = this._uSectionPlanes[sectionPlaneIndex];
                 if (sectionPlaneUniforms) {
@@ -50215,6 +50422,11 @@ class VBORenderer {
 
         this._uPointSize = program.getLocation("pointSize");
         this._uNearPlaneHeight = program.getLocation("nearPlaneHeight");
+
+        if (scene.crossSections) {
+            this._uSliceColor = program.getLocation("sliceColor");
+            this._uSliceThickness = program.getLocation("sliceThickness");
+        }
     }
 
     _bindProgram(frameCtx) {
@@ -50754,7 +50966,7 @@ class TrianglesColorRenderer$1 extends TrianglesBatchingRenderer {
 
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
-           src.push("vFragDepth = 1.0 + clipPos.w;");
+            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         if (clipping) {
@@ -50809,11 +51021,14 @@ class TrianglesColorRenderer$1 extends TrianglesBatchingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
-
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
@@ -50823,9 +51038,12 @@ class TrianglesColorRenderer$1 extends TrianglesBatchingRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-                src.push("  if (dist > 0.0) { ");
-                src.push("      discard;");
-                src.push("  }");
+            src.push("  if (dist > sliceThickness) { ");
+            src.push("      discard;");
+            src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
 
@@ -50842,9 +51060,9 @@ class TrianglesColorRenderer$1 extends TrianglesBatchingRenderer {
             src.push("   float blendFactor       = uSAOParams[3];");
             src.push("   vec2 uv                 = vec2(gl_FragCoord.x / viewportWidth, gl_FragCoord.y / viewportHeight);");
             src.push("   float ambient           = smoothstep(blendCutoff, 1.0, unpackRGBToFloat(texture(uOcclusionTexture, uv))) * blendFactor;");
-            src.push("   outColor            = vec4(vColor.rgb * ambient, 1.0);");
+            src.push("   outColor            = vec4(newColor.rgb * ambient, 1.0);");
         } else {
-            src.push("   outColor            = vColor;");
+            src.push("   outColor            = newColor;");
         }
 
         src.push("}");
@@ -50977,6 +51195,8 @@ class TrianglesFlatColorRenderer$1 extends TrianglesBatchingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
 
         this._addMatricesUniformBlockLines(src);
@@ -51005,7 +51225,8 @@ class TrianglesFlatColorRenderer$1 extends TrianglesBatchingRenderer {
         src.push("out vec4 outColor;");
 
         src.push("void main(void) {");
-
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
@@ -51015,9 +51236,12 @@ class TrianglesFlatColorRenderer$1 extends TrianglesBatchingRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { ");
+            src.push("  if (dist > sliceThickness) { ");
             src.push("      discard;");
             src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
 
@@ -51061,7 +51285,7 @@ class TrianglesFlatColorRenderer$1 extends TrianglesBatchingRenderer {
             src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
         }
 
-        src.push("vec4 fragColor =  vec4((lightAmbient.rgb * lightAmbient.a * vColor.rgb) + (reflectedColor * vColor.rgb), vColor.a);");
+        src.push("vec4 fragColor =  vec4((lightAmbient.rgb * lightAmbient.a * newColor.rgb) + (reflectedColor * newColor.rgb), newColor.a);");
 
         if (this._withSAO) {
             // Doing SAO blend in the main solid fill draw shader just so that edge lines can be drawn over the top
@@ -51104,7 +51328,7 @@ class TrianglesSilhouetteRenderer$1 extends TrianglesBatchingRenderer {
         const src = [];
         src.push("#version 300 es");
         src.push("// Triangles batching silhouette vertex shader");
-        
+
         src.push("uniform int renderPass;");
 
         src.push("in vec3 position;");
@@ -51156,7 +51380,7 @@ class TrianglesSilhouetteRenderer$1 extends TrianglesBatchingRenderer {
         src.push("vColor = vec4(silhouetteColor.r, silhouetteColor.g, silhouetteColor.b, min(silhouetteColor.a, color.a ));");
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
-           src.push("vFragDepth = 1.0 + clipPos.w;");
+            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
@@ -51174,7 +51398,7 @@ class TrianglesSilhouetteRenderer$1 extends TrianglesBatchingRenderer {
         const src = [];
         src.push("#version 300 es");
         src.push("// Triangles batching silhouette fragment shader");
-        
+
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -51195,26 +51419,35 @@ class TrianglesSilhouetteRenderer$1 extends TrianglesBatchingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
             src.push("  float dist = 0.0;");
-            for (i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
+            for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
                 src.push("if (sectionPlaneActive" + i + ") {");
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { discard; }");
+            src.push("  if (dist > sliceThickness) { ");
+            src.push("      discard;");
+            src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("outColor = vColor;");
+        src.push("outColor = newColor;");
         src.push("}");
         return src;
     }
@@ -51300,7 +51533,7 @@ class EdgesEmphasisRenderer$1 extends EdgesRenderer$1 {
 
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
-           src.push("vFragDepth = 1.0 + clipPos.w;");
+            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
@@ -51317,7 +51550,7 @@ class EdgesEmphasisRenderer$1 extends EdgesRenderer$1 {
         const src = [];
         src.push("#version 300 es");
         src.push("// EdgesEmphasisRenderer fragment shader");
-        
+
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -51430,7 +51663,7 @@ class EdgesColorRenderer$1 extends EdgesRenderer$1 {
 
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
-           src.push("vFragDepth = 1.0 + clipPos.w;");
+            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
@@ -53183,6 +53416,8 @@ class TrianglesColorTextureRenderer$1 extends TrianglesBatchingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         this._addMatricesUniformBlockLines(src);
         src.push("uniform vec4 lightAmbient;");
@@ -53210,7 +53445,8 @@ class TrianglesColorTextureRenderer$1 extends TrianglesBatchingRenderer {
         src.push("out vec4 outColor;");
 
         src.push("void main(void) {");
-
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
@@ -53220,9 +53456,12 @@ class TrianglesColorTextureRenderer$1 extends TrianglesBatchingRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { ");
+            src.push("  if (dist > sliceThickness) { ");
             src.push("      discard;");
             src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
 
@@ -53266,7 +53505,7 @@ class TrianglesColorTextureRenderer$1 extends TrianglesBatchingRenderer {
             src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
         }
 
-        src.push("vec4 color =  vec4((lightAmbient.rgb * lightAmbient.a * vColor.rgb) + (reflectedColor * vColor.rgb), vColor.a);");
+        src.push("vec4 color =  vec4((lightAmbient.rgb * lightAmbient.a * newColor.rgb) + (reflectedColor * newColor.rgb), newColor.a);");
         if (gammaOutput) {
             src.push("vec4 colorTexel = color * sRGBToLinear(texture(uColorMap, vUV));");
         } else {
@@ -56047,11 +56286,14 @@ class TrianglesColorRenderer extends TrianglesInstancingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
-
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
@@ -56061,9 +56303,12 @@ class TrianglesColorRenderer extends TrianglesInstancingRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { ");
+            src.push("  if (dist > sliceThickness) { ");
             src.push("      discard;");
             src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
 
@@ -56081,9 +56326,9 @@ class TrianglesColorRenderer extends TrianglesInstancingRenderer {
             src.push("   float blendFactor       = uSAOParams[3];");
             src.push("   vec2 uv                 = vec2(gl_FragCoord.x / viewportWidth, gl_FragCoord.y / viewportHeight);");
             src.push("   float ambient           = smoothstep(blendCutoff, 1.0, unpackRGBToFloat(texture(uOcclusionTexture, uv))) * blendFactor;");
-            src.push("   outColor                = vec4(vColor.rgb * ambient, 1.0);");
+            src.push("   outColor                = vec4(newColor.rgb * ambient, 1.0);");
         } else {
-            src.push("    outColor           = vColor;");
+            src.push("    outColor           = newColor;");
         }
         src.push("}");
         return src;
@@ -56108,7 +56353,7 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
         const src = [];
         src.push("#version 300 es");
         src.push("// Instancing geometry flat-shading drawing vertex shader");
-        
+
         src.push("uniform int renderPass;");
 
         src.push("in vec3 position;");
@@ -56133,7 +56378,7 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
             src.push("}");
             src.push("out float isPerspective;");
         }
-        
+
         if (clipping) {
             src.push("out vec4 vWorldPosition;");
             src.push("out float vFlags;");
@@ -56165,7 +56410,7 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
 
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
-           src.push("vFragDepth = 1.0 + clipPos.w;");
+            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
 
@@ -56190,7 +56435,7 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
         const src = [];
         src.push("#version 300 es");
         src.push("// Instancing geometry flat-shading drawing fragment shader");
-        
+
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -56199,9 +56444,9 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled) {
-                src.push("in float isPerspective;");
-                src.push("uniform float logDepthBufFC;");
-                src.push("in float vFragDepth;");
+            src.push("in float isPerspective;");
+            src.push("uniform float logDepthBufFC;");
+            src.push("in float vFragDepth;");
         }
         if (this._withSAO) {
             src.push("uniform sampler2D uOcclusionTexture;");
@@ -56224,6 +56469,8 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
 
         this._addMatricesUniformBlockLines(src);
@@ -56253,7 +56500,8 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
         src.push("out vec4 outColor;");
 
         src.push("void main(void) {");
-
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
@@ -56263,9 +56511,12 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { ");
+            src.push("  if (dist > sliceThickness) { ");
             src.push("      discard;");
             src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
 
@@ -56308,7 +56559,7 @@ class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
             src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
         }
 
-        src.push("vec4 fragColor = vec4((lightAmbient.rgb * lightAmbient.a * vColor.rgb) + (reflectedColor * vColor.rgb), vColor.a);");
+        src.push("vec4 fragColor = vec4((lightAmbient.rgb * lightAmbient.a * newColor.rgb) + (reflectedColor * newColor.rgb), newColor.a);");
 
         if (this._withSAO) {
             // Doing SAO blend in the main solid fill draw shader just so that edge lines can be drawn over the top
@@ -56350,7 +56601,7 @@ class TrianglesSilhouetteRenderer extends TrianglesInstancingRenderer {
         const src = [];
         src.push("#version 300 es");
         src.push("// Instancing silhouette vertex shader");
-        
+
         src.push("uniform int renderPass;");
 
         src.push("in vec3 position;");
@@ -56409,7 +56660,7 @@ class TrianglesSilhouetteRenderer extends TrianglesInstancingRenderer {
         src.push("vColor = vec4(silhouetteColor.r, silhouetteColor.g, silhouetteColor.b, min(silhouetteColor.a, float(color.a) / 255.0));");
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
-           src.push("vFragDepth = 1.0 + clipPos.w;");
+            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
@@ -56425,7 +56676,7 @@ class TrianglesSilhouetteRenderer extends TrianglesInstancingRenderer {
         const src = [];
         src.push("#version 300 es");
         src.push("// Instancing fill fragment shader");
-        
+
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -56446,10 +56697,14 @@ class TrianglesSilhouetteRenderer extends TrianglesInstancingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
@@ -56459,13 +56714,18 @@ class TrianglesSilhouetteRenderer extends TrianglesInstancingRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("if (dist > 0.0) { discard; }");
+            src.push("  if (dist > sliceThickness) { ");
+            src.push("      discard;");
+            src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("outColor = vColor;");
+        src.push("outColor = newColor;");
         src.push("}");
         return src;
     }
@@ -58495,6 +58755,8 @@ class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         this._addMatricesUniformBlockLines(src);
 
@@ -58523,7 +58785,8 @@ class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
         src.push("out vec4 outColor;");
 
         src.push("void main(void) {");
-
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
             src.push("  if (clippable) {");
@@ -58533,9 +58796,12 @@ class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { ");
+            src.push("  if (dist > sliceThickness) { ");
             src.push("      discard;");
             src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
 
@@ -58578,7 +58844,7 @@ class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
             src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
         }
 
-        src.push("vec4 color =  vec4((lightAmbient.rgb * lightAmbient.a * vColor.rgb) + (reflectedColor * vColor.rgb), vColor.a);");
+        src.push("vec4 color =  vec4((lightAmbient.rgb * lightAmbient.a * newColor.rgb) + (reflectedColor * newColor.rgb), newColor.a);");
         if (gammaOutput) {
             src.push("vec4 colorTexel = color * sRGBToLinear(texture(uColorMap, vUV));");
         } else {
@@ -58595,9 +58861,9 @@ class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
             src.push("   float blendFactor       = uSAOParams[3];");
             src.push("   vec2 uv                 = vec2(gl_FragCoord.x / viewportWidth, gl_FragCoord.y / viewportHeight);");
             src.push("   float ambient           = smoothstep(blendCutoff, 1.0, unpackRGBToFloat(texture(uOcclusionTexture, uv))) * blendFactor;");
-            src.push("   outColor                = vec4(vColor.rgb * colorTexel.rgb * ambient, opacity);");
+            src.push("   outColor                = vec4(newColor.rgb * colorTexel.rgb * ambient, opacity);");
         } else {
-            src.push("   outColor                = vec4(vColor.rgb * colorTexel.rgb, opacity);");
+            src.push("   outColor                = vec4(newColor.rgb * colorTexel.rgb, opacity);");
         }
 
         if (gammaOutput) {
@@ -80419,7 +80685,7 @@ class SceneModelTransform {
         this._childTransforms.push(childTransform);
         childTransform._parentTransform = this;
         childTransform._transformDirty();
-        childTransform._setAABBDirty();
+        childTransform._setSubtreeAABBsDirty(this);
     }
 
     _addMesh(mesh) {
@@ -87075,7 +87341,7 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
      * 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) {
@@ -87091,13 +87357,12 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
      * 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.
      */
@@ -87132,12 +87397,12 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
         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);
@@ -87165,7 +87430,7 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
                     } 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;
                         }
@@ -87199,7 +87464,7 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
             pointerDownCanvasY = e.clientY;
         });
 
-        canvas.addEventListener("mouseup", this._onMouseUp =(e) => {
+        canvas.addEventListener("mouseup", this._onMouseUp = (e) => {
             if (e.which !== 1) {
                 return;
             }
@@ -87254,21 +87519,21 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
             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;
     }
@@ -87943,8 +88208,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
         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);
@@ -87974,39 +88238,35 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
     }
 
     /**
-     * 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;
     }
 
     /**
@@ -88036,11 +88296,11 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
 
         let touchId = null;
 
-        const disableCameraMouseControl = () => {
+        const disableCameraNavigation = () => {
             this.plugin.viewer.cameraControl.active = false;
         };
 
-        const enableCameraMouseControl = () => {
+        const enableCameraNavigation = () => {
             this.plugin.viewer.cameraControl.active = true;
         };
 
@@ -88053,7 +88313,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                 this._currentDistanceMeasurement.destroy();
                 this._currentDistanceMeasurement = null;
             }
-            enableCameraMouseControl();
+            enableCameraNavigation();
             this._touchState = WAITING_FOR_ORIGIN_TOUCH_START;
         };
 
@@ -88085,8 +88345,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                     }
                     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);
@@ -88156,7 +88416,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                         // }
                         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")
@@ -88194,8 +88454,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
 
                             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) {
@@ -88239,7 +88499,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                             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);
 
@@ -88299,10 +88559,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                     }
                     snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-
-
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && (snapPickResult.snapped)) {
                         if (this.pointerLens) {
@@ -88403,8 +88661,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                     }
                     snapPickResult = scene.pick({
                         canvasPos: touchMoveCanvasPos,
-                        snapToVertex: this._snapToVertex,
-                        snapToEdge: this._snapToEdge
+                        snapToVertex: this._snapping,
+                        snapToEdge: this._snapping
                     });
                     if (snapPickResult && snapPickResult.worldPos) {
                         if (this.pointerLens) {
@@ -88510,7 +88768,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                         //  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:
@@ -88528,7 +88786,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                         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: {
@@ -88561,7 +88819,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                     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:
@@ -88582,7 +88840,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                         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;
             }