@xeokit/xeokit-sdk 2.6.9 → 2.6.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.9",
+  "version": "2.6.13",
   "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/AngleMeasurementsControl.js

@@ -72,6 +72,16 @@ export class AngleMeasurementsControl extends Component {
     reset() {
     }
 
+    /**
+     * Gets the {@link AngleMeasurement} under construction by this AngleMeasurementsControl, if any.
+     *
+     * @returns {null|AngleMeasurement}
+     * @abstract
+     */
+    get currentMeasurement() {
+        return null;
+    }
+
     /**
      * Destroys this AngleMeasurementsMouseControl.
      *

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.js

@@ -440,6 +440,15 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         this._mouseState = MOUSE_FINDING_ORIGIN;
     }
 
+    /**
+     * Gets the {@link AngleMeasurement} under construction by this AngleMeasurementsMouseControl, if any.
+     *
+     * @returns {null|AngleMeasurement}
+     */
+    get currentMeasurement() {
+        return this._currentAngleMeasurement;
+    }
+
     /**
      * Destroys this AngleMeasurementsMouseControl.
      */

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsTouchControl.js

@@ -908,6 +908,15 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
         }
     }
 
+    /**
+     * Gets the {@link AngleMeasurement} under construction by this AngleMeasurementsTouchControl, if any.
+     *
+     * @returns {null|AngleMeasurement}
+     */
+    get currentMeasurement() {
+        return this._currentAngleMeasurement;
+    }
+
     /**
      * Destroys this AngleMeasurementsTouchControl.
      */

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js

@@ -14,6 +14,14 @@ const lengthWire = (x1, y1, x2, y2) => {
     return Math.sqrt(a * a + b * b);
 };
 
+function determineMeasurementOrientation(A, B, distance) {
+    const yDiff = Math.abs(B[1] - A[1]);
+
+    return yDiff > distance ? 'Vertical' : 'Horizontal';
+}
+
+// function findDistance
+
 /**
  * @desc Measures the distance between two 3D points.
  *
@@ -42,17 +50,16 @@ class DistanceMeasurement extends Component {
         this._eventSubs = {};
 
         var scene = this.plugin.viewer.scene;
-
         this._originMarker = new Marker(scene, cfg.origin);
         this._targetMarker = new Marker(scene, cfg.target);
 
         this._originWorld = math.vec3();
         this._targetWorld = math.vec3();
 
-        this._wp = new Float64Array(24);
-        this._vp = new Float64Array(24);
+        this._wp = new Float64Array(24); //world position
+        this._vp = new Float64Array(24); //view position
         this._pp = new Float64Array(24);
-        this._cp = new Float64Array(8);
+        this._cp = new Float64Array(8); //canvas position
 
         this._xAxisLabelCulled = false;
         this._yAxisLabelCulled = false;
@@ -226,6 +233,7 @@ class DistanceMeasurement extends Component {
             onContextMenu
         });
 
+        this._measurementOrientation = 'Horizontal';
         this._wpDirty = false;
         this._vpDirty = false;
         this._cpDirty = false;
@@ -240,18 +248,22 @@ class DistanceMeasurement extends Component {
         this._yAxisVisible = false;
         this._zAxisVisible = false;
         this._axisEnabled = true;
+        this._xLabelEnabled = false;
+        this._yLabelEnabled = false;
+        this._zLabelEnabled = false;
+        this._lengthLabelEnabled = false;
         this._labelsVisible = false;
         this._labelsOnWires = false;
         this._clickable = false;
 
         this._originMarker.on("worldPos", (value) => {
-            this._originWorld.set(value || [0, 0, 0]);
+            this._originWorld.set(value || [0,0,0]); 
             this._wpDirty = true;
             this._needUpdate(0); // No lag
         });
 
         this._targetMarker.on("worldPos", (value) => {
-            this._targetWorld.set(value || [0, 0, 0]);
+            this._targetWorld.set(value || [0,0,0]); 
             this._wpDirty = true;
             this._needUpdate(0); // No lag
         });
@@ -300,6 +312,10 @@ class DistanceMeasurement extends Component {
         this.xAxisVisible = cfg.xAxisVisible;
         this.yAxisVisible = cfg.yAxisVisible;
         this.zAxisVisible = cfg.zAxisVisible;
+        this.xLabelEnabled = cfg.xLabelEnabled;
+        this.yLabelEnabled = cfg.yLabelEnabled;
+        this.zLabelEnabled = cfg.zLabelEnabled;
+        this.lengthLabelEnabled = cfg.lengthLabelEnabled;
         this.labelsVisible = cfg.labelsVisible;
         this.labelsOnWires = cfg.labelsOnWires;
     }
@@ -314,25 +330,50 @@ class DistanceMeasurement extends Component {
 
         if (this._wpDirty) {
 
-            this._wp[0] = this._originWorld[0];
-            this._wp[1] = this._originWorld[1];
-            this._wp[2] = this._originWorld[2];
-            this._wp[3] = 1.0;
-
-            this._wp[4] = this._targetWorld[0];
-            this._wp[5] = this._originWorld[1];
-            this._wp[6] = this._originWorld[2];
-            this._wp[7] = 1.0;
-
-            this._wp[8] = this._targetWorld[0];
-            this._wp[9] = this._targetWorld[1];
-            this._wp[10] = this._originWorld[2];
-            this._wp[11] = 1.0;
-
-            this._wp[12] = this._targetWorld[0];
-            this._wp[13] = this._targetWorld[1];
-            this._wp[14] = this._targetWorld[2];
-            this._wp[15] = 1.0;
+            this._measurementOrientation = determineMeasurementOrientation(this._originWorld, this._targetWorld, 1);
+            if(this._measurementOrientation === 'Vertical'){
+                this._wp[0] = this._originWorld[0];
+                this._wp[1] = this._originWorld[1];
+                this._wp[2] = this._originWorld[2];
+                this._wp[3] = 1.0;
+
+                this._wp[4] = this._originWorld[0]; //x-axis
+                this._wp[5] = this._originWorld[1];
+                this._wp[6] = this._originWorld[2];
+                this._wp[7] = 1.0;
+
+                this._wp[8] = this._originWorld[0]; //x-axis
+                this._wp[9] = this._targetWorld[1]; //y-axis
+                this._wp[10] = this._originWorld[2];
+                this._wp[11] = 1.0;
+
+                this._wp[12] = this._targetWorld[0];
+                this._wp[13] = this._targetWorld[1];
+                this._wp[14] = this._targetWorld[2];
+                this._wp[15] = 1.0;
+            }
+            else {
+                this._wp[0] = this._originWorld[0];
+                this._wp[1] = this._originWorld[1];
+                this._wp[2] = this._originWorld[2];
+                this._wp[3] = 1.0;
+
+                this._wp[4] = this._targetWorld[0];
+                this._wp[5] = this._originWorld[1];
+                this._wp[6] = this._originWorld[2];
+                this._wp[7] = 1.0;
+
+                this._wp[8] = this._targetWorld[0];
+                this._wp[9] = this._targetWorld[1];
+                this._wp[10] = this._originWorld[2];
+                this._wp[11] = 1.0;
+
+                this._wp[12] = this._targetWorld[0];
+                this._wp[13] = this._targetWorld[1];
+                this._wp[14] = this._targetWorld[2];
+                this._wp[15] = 1.0;
+            }
+            
 
             this._wpDirty = false;
             this._vpDirty = true;
@@ -503,7 +544,14 @@ class DistanceMeasurement extends Component {
                 }
 
                 if (!this._zAxisLabelCulled) {
-                    this._zAxisLabel.setText(tilde + Math.abs((this._targetWorld[2] - this._originWorld[2]) * scale).toFixed(2) + unitAbbrev);
+                    if(this._measurementOrientation === 'Vertical') {
+                        this._zAxisLabel.setPrefix("");
+                        this._zAxisLabel.setText(tilde + Math.abs(math.lenVec3(math.subVec3(this._targetWorld, [this._originWorld[0], this._targetWorld[1], this._originWorld[2]], distVec3)) * scale).toFixed(2) + unitAbbrev);
+                    }
+                    else {
+                        this._zAxisLabel.setPrefix("Z");
+                        this._zAxisLabel.setText(tilde + Math.abs((this._targetWorld[2] - this._originWorld[2]) * scale).toFixed(2) + unitAbbrev);
+                    }
                     this._zAxisLabel.setCulled(!this.axisVisible);
                 } else {
                     this._zAxisLabel.setCulled(true);
@@ -623,7 +671,7 @@ class DistanceMeasurement extends Component {
         this._originDot.setVisible(this._visible && this._originVisible);
         this._targetDot.setVisible(this._visible && this._targetVisible);
         this._lengthWire.setVisible(this._visible && this._wireVisible);
-        this._lengthLabel.setVisible(this._visible && this._wireVisible);
+        this._lengthLabel.setVisible(this._visible && this._wireVisible && this._lengthLabelEnabled);
 
         const xAxisVisible = this._visible && this._axisVisible && this._xAxisVisible;
         const yAxisVisible = this._visible && this._axisVisible && this._yAxisVisible;
@@ -633,9 +681,9 @@ class DistanceMeasurement extends Component {
         this._yAxisWire.setVisible(yAxisVisible);
         this._zAxisWire.setVisible(zAxisVisible);
 
-        this._xAxisLabel.setVisible(xAxisVisible && !this._xAxisLabelCulled);
-        this._yAxisLabel.setVisible(yAxisVisible && !this._yAxisLabelCulled);
-        this._zAxisLabel.setVisible(zAxisVisible && !this._zAxisLabelCulled);
+        this._xAxisLabel.setVisible(xAxisVisible && !this._xAxisLabelCulled && this._EnabledVisible);
+        this._yAxisLabel.setVisible(yAxisVisible && !this._yAxisLabelCulled && this._yLabelEnabled);
+        this._zAxisLabel.setVisible(zAxisVisible && !this._zAxisLabelCulled && this._zLabelEnabled);
 
         this._cpDirty = true;
 
@@ -705,9 +753,9 @@ class DistanceMeasurement extends Component {
         this._xAxisWire.setVisible(axisVisible && this._xAxisVisible);
         this._yAxisWire.setVisible(axisVisible && this._yAxisVisible);
         this._zAxisWire.setVisible(axisVisible && this._zAxisVisible);
-        this._xAxisLabel.setVisible(axisVisible && !this._xAxisLabelCulled&& this._xAxisVisible);
-        this._yAxisLabel.setVisible(axisVisible && !this._yAxisLabelCulled&& this._xAxisVisible);
-        this._zAxisLabel.setVisible(axisVisible && !this._zAxisLabelCulled&& this._xAxisVisible);
+        this._xAxisLabel.setVisible(axisVisible && !this._xAxisLabelCulled&& this._xAxisVisible && this._xLabelEnabled);
+        this._yAxisLabel.setVisible(axisVisible && !this._yAxisLabelCulled&& this._xAxisVisible && this._yLabelEnabled);
+        this._zAxisLabel.setVisible(axisVisible && !this._zAxisLabelCulled&& this._xAxisVisible && this._zLabelEnabled);
         this._cpDirty = true;
         this._needUpdate();
     }
@@ -767,7 +815,7 @@ class DistanceMeasurement extends Component {
         this._xAxisVisible = value;
         const axisVisible = this._visible && this._axisVisible && this._xAxisVisible && this._axisEnabled;
         this._xAxisWire.setVisible(axisVisible);
-        this._xAxisLabel.setVisible(axisVisible && !this._xAxisLabelCulled);
+        this._xAxisLabel.setVisible(axisVisible && !this._xAxisLabelCulled && this._xLabelEnabled);
         this._cpDirty = true;
         this._needUpdate();
     }
@@ -795,7 +843,7 @@ class DistanceMeasurement extends Component {
         this._yAxisVisible = value;
         const axisVisible = this._visible && this._axisVisible && this._yAxisVisible && this._axisEnabled;
         this._yAxisWire.setVisible(axisVisible);
-        this._yAxisLabel.setVisible(axisVisible && !this._yAxisLabelCulled);
+        this._yAxisLabel.setVisible(axisVisible && !this._yAxisLabelCulled && this._yLabelEnabled);
         this._cpDirty = true;
         this._needUpdate();
     }
@@ -823,7 +871,7 @@ class DistanceMeasurement extends Component {
         this._zAxisVisible = value;
         const axisVisible = this._visible && this._axisVisible && this._zAxisVisible && this._axisEnabled;
         this._zAxisWire.setVisible(axisVisible);
-        this._zAxisLabel.setVisible(axisVisible && !this._zAxisLabelCulled);
+        this._zAxisLabel.setVisible(axisVisible && !this._zAxisLabelCulled && this._zLabelEnabled);
         this._cpDirty = true;
         this._needUpdate();
     }
@@ -848,7 +896,7 @@ class DistanceMeasurement extends Component {
         value = value !== undefined ? Boolean(value) : this.plugin.defaultWireVisible;
         this._wireVisible = value;
         var wireVisible = this._visible && this._wireVisible;
-        this._lengthLabel.setVisible(wireVisible);
+        this._lengthLabel.setVisible(wireVisible && this._lengthLabelEnabled);
         this._lengthWire.setVisible(wireVisible);
     }
 
@@ -862,7 +910,7 @@ class DistanceMeasurement extends Component {
     }
 
     /**
-     * Sets if the labels are visible.
+     * Sets if the labels are visible except the length label.
      *
      * @type {Boolean}
      */
@@ -870,10 +918,10 @@ class DistanceMeasurement extends Component {
         value = value !== undefined ? Boolean(value) : this.plugin.defaultLabelsVisible;
         this._labelsVisible = value;
         var labelsVisible = this._visible && this._labelsVisible;
-        this._xAxisLabel.setVisible(labelsVisible && !this._xAxisLabelCulled && this._clickable && this._axisEnabled);
-        this._yAxisLabel.setVisible(labelsVisible && !this._yAxisLabelCulled && this._clickable && this._axisEnabled);
-        this._zAxisLabel.setVisible(labelsVisible && !this._zAxisLabelCulled && this._clickable && this._axisEnabled);
-        this._lengthLabel.setVisible(labelsVisible);
+        this._xAxisLabel.setVisible(labelsVisible && !this._xAxisLabelCulled && this._clickable && this._axisEnabled && this._xLabelEnabled);
+        this._yAxisLabel.setVisible(labelsVisible && !this._yAxisLabelCulled && this._clickable && this._axisEnabled && this._yLabelEnabled);
+        this._zAxisLabel.setVisible(labelsVisible && !this._zAxisLabelCulled && this._clickable && this._axisEnabled && this._zLabelEnabled);
+        this._lengthLabel.setVisible(labelsVisible && this._lengthLabelEnabled);
         this._cpDirty = true;
         this._needUpdate();
     }
@@ -887,6 +935,98 @@ class DistanceMeasurement extends Component {
         return this._labelsVisible;
     }
 
+    /**
+     * Sets if the x label is enabled.
+     *
+     * @type {Boolean}
+     */
+    set xLabelEnabled(value) {
+        value = value !== undefined ? Boolean(value) : this.plugin.defaultXLabelEnabled;
+        this._xLabelEnabled = value;
+        var labelsVisible = this._visible && this._labelsVisible;
+        this._xAxisLabel.setVisible(labelsVisible && !this._xAxisLabelCulled && this._clickable && this._axisEnabled && this._xLabelEnabled);
+        this._cpDirty = true;
+        this._needUpdate();
+    }
+
+    /**
+     * Gets if the x label is enabled.
+     *
+     * @type {Boolean}
+     */
+    get xLabelEnabled(){
+        return this._xLabelEnabled;
+    }
+
+    /**
+     * Sets if the y label is enabled.
+     *
+     * @type {Boolean}
+     */
+    set yLabelEnabled(value) {
+        value = value !== undefined ? Boolean(value) : this.plugin.defaultYLabelEnabled;
+        this._yLabelEnabled = value;
+        var labelsVisible = this._visible && this._labelsVisible;
+        this._yAxisLabel.setVisible(labelsVisible && !this._yAxisLabelCulled && this._clickable && this._axisEnabled && this._yLabelEnabled);
+        this._cpDirty = true;
+        this._needUpdate();
+    }
+
+    /**
+     * Gets if the y label is enabled.
+     *
+     * @type {Boolean}
+     */
+    get yLabelEnabled(){
+        return this._yLabelEnabled;
+    }
+
+    /**
+     * Sets if the z label is enabled.
+     *
+     * @type {Boolean}
+     */
+    set zLabelEnabled(value) {
+        value = value !== undefined ? Boolean(value) : this.plugin.defaultZLabelEnabled;
+        this._zLabelEnabled = value;
+        var labelsVisible = this._visible && this._labelsVisible;
+        this._zAxisLabel.setVisible(labelsVisible && !this._zAxisLabelCulled && this._clickable && this._axisEnabled && this._zLabelEnabled);
+        this._cpDirty = true;
+        this._needUpdate();
+    }
+
+    /**
+     * Gets if the z label is enabled.
+     *
+     * @type {Boolean}
+     */
+    get zLabelEnabled(){
+        return this._zLabelEnabled;
+    }
+
+    /**
+     * Sets if the length label is enabled.
+     *
+     * @type {Boolean}
+     */
+    set lengthLabelEnabled(value) {
+        value = value !== undefined ? Boolean(value) : this.plugin.defaultLengthLabelEnabled;
+        this._lengthLabelEnabled = value;
+        var labelsVisible = this._visible && this._labelsVisible;
+        this._lengthLabel.setVisible(labelsVisible && !this._lengthAxisLabelCulled && this._clickable && this._axisEnabled && this._lengthLabelEnabled);
+        this._cpDirty = true;
+        this._needUpdate();
+    }
+
+    /**
+     * Gets if the length label is enabled.
+     *
+     * @type {Boolean}
+     */
+    get lengthLabelEnabled(){
+        return this._lengthLabelEnabled;
+    }
+
     /**
      * Sets if labels should be positioned on the wires.
      *

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsControl.js

@@ -72,6 +72,17 @@ export class DistanceMeasurementsControl extends Component {
     reset() {
     }
 
+    /**
+     * Gets the {@link DistanceMeasurement} under construction by this DistanceMeasurementsControl, if any.
+     *
+     * @returns {null|DistanceMeasurement}
+     *
+     * @abstract
+     */
+    get currentMeasurement() {
+        return null;
+    }
+
     /**
      * Destroys this DistanceMeasurementsControl.
      *

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -397,6 +397,17 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
             this._currentDistanceMeasurement.destroy();
             this._currentDistanceMeasurement = null;
         }
+
+        this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
+    }
+
+    /**
+     * Gets the {@link DistanceMeasurement} under construction by this DistanceMeasurementsMouseControl, if any.
+     *
+     * @returns {null|DistanceMeasurement}
+     */
+    get currentMeasurement() {
+        return this._currentDistanceMeasurement;
     }
 
     /**

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsPlugin.js

@@ -276,6 +276,10 @@ class DistanceMeasurementsPlugin extends Plugin {
      * @param {boolean} [cfg.defaultTargetVisible=true] The default value of the DistanceMeasurements `targetVisible` property.
      * @param {boolean} [cfg.defaultWireVisible=true] The default value of the DistanceMeasurements `wireVisible` property.
      * @param {boolean} [cfg.defaultLabelsVisible=true] The default value of the DistanceMeasurements `labelsVisible` property.
+     * @param {boolean} [cfg.defaultXLabelEnabled=true] The default value of the DistanceMeasurements `xLabelEnabled` property.
+     * @param {boolean} [cfg.defaultYLabelEnabled=true] The default value of the DistanceMeasurements `yLabelEnabled` property.
+     * @param {boolean} [cfg.defaultZLabelEnabled=true] The default value of the DistanceMeasurements `zLabelEnabled` property.
+     * @param {boolean} [cfg.defaultLengthLabelEnabled=true] The default value of the DistanceMeasurements `lengthLabelEnabled` property.
      * @param {boolean} [cfg.defaultAxisVisible=true] The default value of the DistanceMeasurements `axisVisible` property.
      * @param {boolean} [cfg.defaultXAxisVisible=true] The default value of the DistanceMeasurements `xAxisVisible` property.
      * @param {boolean} [cfg.defaultYAxisVisible=true] The default value of the DistanceMeasurements `yAxisVisible` property.
@@ -298,11 +302,14 @@ class DistanceMeasurementsPlugin extends Plugin {
         this._measurements = {};
 
         this.labelMinAxisLength = cfg.labelMinAxisLength;
-
         this.defaultVisible = cfg.defaultVisible !== false;
         this.defaultOriginVisible = cfg.defaultOriginVisible !== false;
         this.defaultTargetVisible = cfg.defaultTargetVisible !== false;
         this.defaultWireVisible = cfg.defaultWireVisible !== false;
+        this.defaultXLabelEnabled = cfg.defaultXLabelEnabled !== false;
+        this.defaultYLabelEnabled = cfg.defaultYLabelEnabled !== false;
+        this.defaultZLabelEnabled = cfg.defaultZLabelEnabled !== false;
+        this.defaultLengthLabelEnabled = cfg.defaultLengthLabelEnabled !== false;
         this.defaultLabelsVisible = cfg.defaultLabelsVisible !== false;
         this.defaultAxisVisible = cfg.defaultAxisVisible !== false;
         this.defaultXAxisVisible = cfg.defaultXAxisVisible !== false;
@@ -431,7 +438,12 @@ class DistanceMeasurementsPlugin extends Plugin {
      * @param {Boolean} [params.xAxisVisible=true] Whether to initially show the X-axis-aligned wires between {@link DistanceMeasurement#origin} and {@link DistanceMeasurement#target}.
      * @param {Boolean} [params.yAxisVisible=true] Whether to initially show the Y-axis-aligned wires between {@link DistanceMeasurement#origin} and {@link DistanceMeasurement#target}.
      * @param {Boolean} [params.zAxisVisible=true] Whether to initially show the Z-axis-aligned wires between {@link DistanceMeasurement#origin} and {@link DistanceMeasurement#target}.
+     * @param {Boolean} [params.xLabelEnabled=true] Whether to initially show the x label.
+     * @param {Boolean} [params.yLabelEnabled=true] Whether to initially show the y label.
+     * @param {Boolean} [params.zLabelEnabled=true] Whether to initially show the z label.
+     * @param {Boolean} [params.lengthLabelEnabled=true] Whether to initially show the length label.
      * @param {Boolean} [params.labelsVisible=true] Whether to initially show the labels.
+     * @param {Boolean} [params.lengthLabelVisible=true] Whether to initially show the labels.
      * @param {string} [params.color] The color of the length dot, wire and label.
      * @param {Boolean} [params.labelsOnWires=true] Determines if labels will be set on wires or one below the other.
      * @returns {DistanceMeasurement} The new {@link DistanceMeasurement}.
@@ -461,6 +473,10 @@ class DistanceMeasurementsPlugin extends Plugin {
             xAxisVisible: params.xAxisVisible !== false && this.defaultXAxisVisible !== false,
             yAxisVisible: params.yAxisVisible !== false && this.defaultYAxisVisible !== false,
             zAxisVisible: params.zAxisVisible !== false && this.defaultZAxisVisible !== false,
+            xLabelEnabled: params.xLabelEnabled !== false && this.defaultXLabelEnabled !== false,
+            yLabelEnabled: params.yLabelEnabled !== false && this.defaultYLabelEnabled !== false,
+            zLabelEnabled: params.zLabelEnabled !== false && this.defaultZLabelEnabled !== false,
+            lengthLabelEnabled: params.lengthLabelEnabled !== false && this.defaultLengthLabelEnabled !== false,
             labelsVisible: params.labelsVisible !== false && this.defaultLabelsVisible !== false,
             originVisible: params.originVisible,
             targetVisible: params.targetVisible,
@@ -471,6 +487,7 @@ class DistanceMeasurementsPlugin extends Plugin {
             onContextMenu: this._onContextMenu
         });
         this._measurements[measurement.id] = measurement;
+        measurement.clickable = true;
         measurement.on("destroyed", () => {
             delete this._measurements[measurement.id];
         });

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsTouchControl.js

@@ -666,6 +666,10 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                         this._currentDistanceMeasurement.targetVisible = true;
                         this._currentDistanceMeasurement.wireVisible = true;
                         this._currentDistanceMeasurement.labelsVisible = true;
+                        this._currentDistanceMeasurement.xAxisVisible = true;
+                        this._currentDistanceMeasurement.yAxisVisible = true;
+                        this._currentDistanceMeasurement.zAxisVisible = true;
+                        this._currentDistanceMeasurement.clickable = true;
                         this.distanceMeasurementsPlugin.fire("measurementEnd", this._currentDistanceMeasurement);
                         this._currentDistanceMeasurement = null;
                     } else {
@@ -681,6 +685,7 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
                     break;
 
                 case WAITING_FOR_TARGET_LONG_TOUCH_END:
+                    console.log('long touch');
                     if (this.pointerLens) {
                         this.pointerLens.visible = false;
                     }
@@ -748,6 +753,16 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
             this._currentDistanceMeasurement.destroy();
             this._currentDistanceMeasurement = null;
         }
+        this._mouseState = WAITING_FOR_ORIGIN_TOUCH_START;
+    }
+
+    /**
+     * Gets the {@link DistanceMeasurement} under construction by this DistanceMeasurementsTouchControl, if any.
+     *
+     * @returns {null|DistanceMeasurement}
+     */
+    get currentMeasurement() {
+        return this._currentDistanceMeasurement;
     }
 
     /**

package/src/plugins/DotBIMLoaderPlugin/DotBIMDefaultDataSource.js

@@ -0,0 +1,29 @@
+import {utils} from "../../viewer/scene/utils.js";
+
+/**
+ * Default data access strategy for {@link DotBIMLoaderPlugin}.
+ *
+ * This just loads assets using XMLHttpRequest.
+ */
+export class DotBIMDefaultDataSource {
+
+    constructor() {
+    }
+
+    /**
+     * Gets .BIM JSON.
+     *
+     * @param {String|Number} dotBIMSrc Identifies the .BIM JSON asset.
+     * @param {Function} ok Fired on successful loading of the .BIM JSON asset.
+     * @param {Function} error Fired on error while loading the .BIM JSON asset.
+     */
+    getDotBIM(dotBIMSrc, ok, error) {
+        utils.loadJSON(dotBIMSrc,
+            (json) => {
+                ok(json);
+            },
+            function (errMsg) {
+                error(errMsg);
+            });
+    }
+}