@xeokit/xeokit-sdk 2.6.9 → 2.6.13

package/dist/xeokit-sdk.cjs.js

@@ -10460,7 +10460,7 @@ const tempVec4b$6 = math.vec4();
  * });
  *
  * // Create the Marker, associated with our Mesh Entity
- * const myMarker = new Marker({
+ * const myMarker = new Marker(viewer, {
  *      entity: entity,
  *      worldPos: [10,0,0],
  *      occludable: true
@@ -10589,7 +10589,7 @@ class Marker extends Component {
                 return;
             }
             if (this._onEntityDestroyed !== null) {
-                this._entity.off(this._onEntityDestroyed);
+                this._entity.model.off(this._onEntityDestroyed);
                 this._onEntityDestroyed = null;
             }
             if (this._onEntityModelDestroyed !== null) {
@@ -10605,7 +10605,7 @@ class Marker extends Component {
                     this._onEntityModelDestroyed = null;
                 });
             } else {
-                this._onEntityDestroyed = this._entity.on("destroyed", () => {
+                this._onEntityDestroyed = this._entity.model.on("destroyed", () => {
                     this._entity = null;
                     this._onEntityDestroyed = null;
                 });
@@ -10771,6 +10771,16 @@ class Marker extends Component {
     }
 }
 
+const os = {
+    isIphoneSafari() {
+        const userAgent = window.navigator.userAgent;
+        const isIphone = /iPhone/i.test(userAgent);
+        const isSafari = /Safari/i.test(userAgent) && !/Chrome/i.test(userAgent);
+
+        return isIphone && isSafari;
+    }
+};
+
 /** @private */
 class Wire {
 
@@ -10883,11 +10893,42 @@ class Wire {
         }
 
         if (cfg.onContextMenu) {
-            wireClickable.addEventListener('contextmenu', (event) => {
-                cfg.onContextMenu(event, this);
-                event.preventDefault();
-                event.stopPropagation();
-            });
+            if(os.isIphoneSafari()){
+                wireClickable.addEventListener('touchstart', (event) => {
+                    event.preventDefault();
+                    if(this._timeout){
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }
+                    this._timeout = setTimeout(() => {
+                        event.clientX = event.touches[0].clientX;
+                        event.clientY = event.touches[0].clientY;
+                        cfg.onContextMenu(event, this);
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }, 500);
+                });
+
+                wireClickable.addEventListener('touchend', (event) => {
+                    event.preventDefault();
+                    //stops short touches from calling the timeout
+                    if(this._timeout) {
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }
+                } );
+
+            }
+            else {
+                wireClickable.addEventListener('contextmenu', (event) => {
+                    console.log(event);
+                    cfg.onContextMenu(event, this);
+                    event.preventDefault();
+                    event.stopPropagation();
+                    console.log("Label context menu");
+                });
+            }
+            
         }
 
         this._x1 = 0;
@@ -10962,7 +11003,7 @@ class Wire {
     }
 
     setClickable(clickable) {
-        this._wireClickable.style["pointer-events"] = (!!clickable) ? "all" : "none";
+        this._wireClickable.style["pointer-events"] = (clickable) ? "all" : "none";
     }
 
     setHighlighted(highlighted) {
@@ -11082,11 +11123,42 @@ class Dot {
         }
 
         if (cfg.onContextMenu) {
-            dotClickable.addEventListener('contextmenu', (event) => {
-                cfg.onContextMenu(event, this);
-                event.preventDefault();
-                event.stopPropagation();
-            });
+            if(os.isIphoneSafari()){
+                dotClickable.addEventListener('touchstart', (event) => {
+                    event.preventDefault();
+                    if(this._timeout){
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }
+                    this._timeout = setTimeout(() => {
+                        event.clientX = event.touches[0].clientX;
+                        event.clientY = event.touches[0].clientY;
+                        cfg.onContextMenu(event, this);
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }, 500);
+                });
+
+                dotClickable.addEventListener('touchend', (event) => {
+                    event.preventDefault();
+                    //stops short touches from calling the timeout
+                    if(this._timeout) {
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }
+                } );
+
+            }
+            else {
+                dotClickable.addEventListener('contextmenu', (event) => {
+                    console.log(event);
+                    cfg.onContextMenu(event, this);
+                    event.preventDefault();
+                    event.stopPropagation();
+                    console.log("Label context menu");
+                });
+            }
+            
         }
         
         this.setPos(cfg.x || 0, cfg.y || 0);
@@ -11135,7 +11207,7 @@ class Dot {
     }
 
     setClickable(clickable) {
-        this._dotClickable.style["pointer-events"] = (!!clickable) ? "all" : "none";
+        this._dotClickable.style["pointer-events"] = (clickable) ? "all" : "none";
     }
 
     setHighlighted(highlighted) {
@@ -11176,6 +11248,7 @@ class Label {
 
         this._label = document.createElement('div');
         this._label.className += this._label.className ? ' viewer-ruler-label' : 'viewer-ruler-label';
+        this._timeout = null;
 
         var label = this._label;
         var style = label.style;
@@ -11245,12 +11318,42 @@ class Label {
         }
 
         if (cfg.onContextMenu) {
-            label.addEventListener('contextmenu', (event) => {
-                cfg.onContextMenu(event, this);
-                event.preventDefault();
-                event.stopPropagation();
-                console.log("Label context menu");
-            });
+            if(os.isIphoneSafari()){
+                label.addEventListener('touchstart', (event) => {
+                    event.preventDefault();
+                    if(this._timeout){
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }
+                    this._timeout = setTimeout(() => {
+                        event.clientX = event.touches[0].clientX;
+                        event.clientY = event.touches[0].clientY;
+                        cfg.onContextMenu(event, this);
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }, 500);
+                });
+
+                label.addEventListener('touchend', (event) => {
+                    event.preventDefault();
+                    //stops short touches from calling the timeout
+                    if(this._timeout) {
+                        clearTimeout(this._timeout);
+                        this._timeout = null;
+                    }
+                } );
+
+            }
+            else {
+                label.addEventListener('contextmenu', (event) => {
+                    console.log(event);
+                    cfg.onContextMenu(event, this);
+                    event.preventDefault();
+                    event.stopPropagation();
+                    console.log("Label context menu");
+                });
+            }
+            
         }
     }
 
@@ -11325,7 +11428,14 @@ class Label {
     }
 
     setClickable(clickable) {
-        this._label.style["pointer-events"] = (!!clickable) ? "all" : "none";
+        this._label.style["pointer-events"] = (clickable) ? "all" : "none";
+    }
+
+    setPrefix(prefix) {
+        if(this._prefix === prefix){
+            return;
+        }
+        this._prefix = prefix;
     }
 
     destroy() {
@@ -11333,6 +11443,8 @@ class Label {
             this._label.parentElement.removeChild(this._label);
         }
     }
+
+    
 }
 
 var originVec = math.vec3();
@@ -12130,6 +12242,16 @@ 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.
      *
@@ -12580,6 +12702,15 @@ 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.
      */
@@ -13933,6 +14064,15 @@ 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.
      */
@@ -81028,10 +81168,11 @@ class SceneModelTransform {
 const tempVec3a$a = math.vec3();
 
 const tempOBB3 = math.OBB3();
+const tempQuaternion = math.vec4();
 
 const DEFAULT_SCALE = math.vec3([1, 1, 1]);
 const DEFAULT_POSITION = math.vec3([0, 0, 0]);
-const DEFAULT_ROTATION = math.vec3([0, 0, 0]);
+math.vec3([0, 0, 0]);
 const DEFAULT_QUATERNION = math.identityQuaternion();
 const DEFAULT_MATRIX = math.identityMat4();
 
@@ -83708,6 +83849,7 @@ class SceneModel extends Component {
      * @param {Number[]} [cfg.position=[0,0,0]] Local 3D position of the mesh. Overridden by ````transformId````.
      * @param {Number[]} [cfg.scale=[1,1,1]] Scale of the mesh.  Overridden by ````transformId````.
      * @param {Number[]} [cfg.rotation=[0,0,0]] Rotation of the mesh as Euler angles given in degrees, for each of the X, Y and Z axis.  Overridden by ````transformId````.
+     * @param {Number[]} [cfg.quaternion] Rotation of the mesh as a quaternion.  Overridden by ````rotation````.
      * @param {Number[]} [cfg.matrix=[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1]] Mesh modelling transform matrix. Overrides the ````position````, ````scale```` and ````rotation```` parameters. Also  overridden by ````transformId````.
      * @param {Number[]} [cfg.color=[1,1,1]] RGB color in range ````[0..1, 0..1, 0..1]````. Overridden by texture set ````colorTexture````. Overrides ````colors```` and ````colorsCompressed````.
      * @param {Number} [cfg.opacity=1] Opacity in range ````[0..1]````. Overridden by texture set ````colorTexture````.
@@ -83782,12 +83924,15 @@ class SceneModel extends Component {
 
             if (cfg.matrix) {
                 cfg.meshMatrix = cfg.matrix;
-            } else if (cfg.scale || cfg.rotation || cfg.position) {
+            } else if (cfg.scale || cfg.rotation || cfg.position || cfg.quaternion) {
                 const scale = cfg.scale || DEFAULT_SCALE;
                 const position = cfg.position || DEFAULT_POSITION;
-                const rotation = cfg.rotation || DEFAULT_ROTATION;
-                math.eulerToQuaternion(rotation, "XYZ", DEFAULT_QUATERNION);
-                cfg.meshMatrix = math.composeMat4(position, DEFAULT_QUATERNION, scale, math.mat4());
+                if (cfg.rotation) {
+                    math.eulerToQuaternion(cfg.rotation, "XYZ", tempQuaternion);
+                    cfg.meshMatrix = math.composeMat4(position, tempQuaternion, scale, math.mat4());
+                } else {
+                    cfg.meshMatrix = math.composeMat4(position, cfg.quaternion || DEFAULT_QUATERNION, scale, math.mat4());
+                }
             }
 
             if (cfg.positionsDecodeBoundary) {
@@ -83975,13 +84120,16 @@ class SceneModel extends Component {
                 // MATRIX
 
                 if (cfg.matrix) {
-                    cfg.meshMatrix = cfg.matrix.slice();
-                } else {
+                    cfg.meshMatrix = cfg.matrix;
+                } else if (cfg.scale || cfg.rotation || cfg.position || cfg.quaternion) {
                     const scale = cfg.scale || DEFAULT_SCALE;
                     const position = cfg.position || DEFAULT_POSITION;
-                    const rotation = cfg.rotation || DEFAULT_ROTATION;
-                    math.eulerToQuaternion(rotation, "XYZ", DEFAULT_QUATERNION);
-                    cfg.meshMatrix = math.composeMat4(position, DEFAULT_QUATERNION, scale, math.mat4());
+                    if (cfg.rotation) {
+                        math.eulerToQuaternion(cfg.rotation, "XYZ", tempQuaternion);
+                        cfg.meshMatrix = math.composeMat4(position, tempQuaternion, scale, math.mat4());
+                    } else {
+                        cfg.meshMatrix = math.composeMat4(position, cfg.quaternion || DEFAULT_QUATERNION, scale, math.mat4());
+                    }
                 }
 
                 math.AABB3ToOBB3(cfg.geometry.aabb, tempOBB3);
@@ -86134,6 +86282,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.
  *
@@ -86162,17 +86318,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;
@@ -86346,6 +86501,7 @@ class DistanceMeasurement extends Component {
             onContextMenu
         });
 
+        this._measurementOrientation = 'Horizontal';
         this._wpDirty = false;
         this._vpDirty = false;
         this._cpDirty = false;
@@ -86360,18 +86516,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
         });
@@ -86420,6 +86580,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;
     }
@@ -86434,25 +86598,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._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._targetWorld[0];
-            this._wp[5] = this._originWorld[1];
-            this._wp[6] = this._originWorld[2];
-            this._wp[7] = 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._targetWorld[0];
-            this._wp[9] = this._targetWorld[1];
-            this._wp[10] = this._originWorld[2];
-            this._wp[11] = 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;
+                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;
@@ -86623,7 +86812,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);
@@ -86743,7 +86939,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;
@@ -86753,9 +86949,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;
 
@@ -86825,9 +87021,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();
     }
@@ -86887,7 +87083,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();
     }
@@ -86915,7 +87111,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();
     }
@@ -86943,7 +87139,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();
     }
@@ -86968,7 +87164,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);
     }
 
@@ -86982,7 +87178,7 @@ class DistanceMeasurement extends Component {
     }
 
     /**
-     * Sets if the labels are visible.
+     * Sets if the labels are visible except the length label.
      *
      * @type {Boolean}
      */
@@ -86990,10 +87186,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();
     }
@@ -87007,6 +87203,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.
      *
@@ -87189,6 +87477,17 @@ 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.
      *
@@ -87595,6 +87894,17 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
             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;
     }
 
     /**
@@ -87882,6 +88192,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.
@@ -87904,11 +88218,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;
@@ -88037,7 +88354,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}.
@@ -88067,6 +88389,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,
@@ -88077,6 +88403,7 @@ class DistanceMeasurementsPlugin extends Plugin {
             onContextMenu: this._onContextMenu
         });
         this._measurements[measurement.id] = measurement;
+        measurement.clickable = true;
         measurement.on("destroyed", () => {
             delete this._measurements[measurement.id];
         });
@@ -88812,6 +89139,10 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                         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 {
@@ -88827,6 +89158,7 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
                     break;
 
                 case WAITING_FOR_TARGET_LONG_TOUCH_END:
+                    console.log('long touch');
                     if (this.pointerLens) {
                         this.pointerLens.visible = false;
                     }
@@ -88894,6 +89226,16 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
             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;
     }
 
     /**
@@ -96618,8 +96960,8 @@ function getCanvasPosFromEvent$2(event, canvas, canvasPos) {
         canvasPos[1] = event.y;
     } else {
         const { left, top } = canvas.getBoundingClientRect();
-        canvasPos[0] = event.clientX - left - window.scrollX;
-        canvasPos[1] = event.clientY - top - window.scrollY;
+        canvasPos[0] = event.clientX - left;
+        canvasPos[1] = event.clientY - top;
     }
     return canvasPos;
 }
@@ -115813,6 +116155,7 @@ function parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok) {
     }).then((gltfData) => {
         const ctx = {
             src: src,
+            entityId: options.entityId,
             metaModelCorrections: metaModelJSON ? getMetaModelCorrections(metaModelJSON) : null,
             loadBuffer: options.loadBuffer,
             basePath: options.basePath,
@@ -116252,29 +116595,9 @@ function loadNode(ctx, node, depth, matrix) {
                     meshCfg.origin = origin;
                 }
 
-                // if (createEntity) {
-                //     if (createEntity.colorize) {
-                //         meshCfg.color = createEntity.colorize;
-                //     }
-                //     if (createEntity.opacity !== undefined && createEntity.opacity !== null) {
-                //         meshCfg.opacity = createEntity.opacity;
-                //     }
-                // }
-
                 sceneModel.createMesh(meshCfg);
                 deferredMeshIds.push(meshCfg.id);
             }
-            // if (createEntity) {
-            //     sceneModel.createEntity(utils.apply(createEntity, {
-            //         meshIds: deferredMeshIds,
-            //         isObject: true
-            //     }));
-            // } else {
-            //     sceneModel.createEntity({
-            //         meshIds: deferredMeshIds,
-            //         isObject: true
-            //     });
-            // }
         }
     }
 
@@ -116288,48 +116611,62 @@ function loadNode(ctx, node, depth, matrix) {
 
     // Post-order visit scene node
 
-    const nodeName = node.name;
-    if (((nodeName !== undefined && nodeName !== null) || depth === 0) && deferredMeshIds.length > 0) {
-        if (nodeName === undefined || nodeName === null) {
-            ctx.log(`Warning: 'name' properties not found on glTF scene nodes - will randomly-generate object IDs in XKT`);
+    if (ctx.entityId) {
+        if (depth ===0) {
+            sceneModel.createEntity({
+                id: ctx.entityId,
+                meshIds: deferredMeshIds,
+                isObject: true
+            });
+            deferredMeshIds.length = 0;
         }
-        let entityId = nodeName; // Fall back on generated ID when `name` not found on glTF scene node(s)
-        // if (!!entityId && sceneModel.entities[entityId]) {
-        //     ctx.log(`Warning: Two or more glTF nodes found with same 'name' attribute: '${nodeName} - will randomly-generating an object ID in XKT`);
-        // }
-        // while (!entityId || sceneModel.entities[entityId]) {
-        //     entityId = "entity-" + ctx.nextId++;
-        // }
-        if (ctx.metaModelCorrections) {
-            // Merging meshes into XKTObjects that map to metaobjects
-            const rootMetaObject = ctx.metaModelCorrections.eachChildRoot[entityId];
-            if (rootMetaObject) {
-                const rootMetaObjectStats = ctx.metaModelCorrections.eachRootStats[rootMetaObject.id];
-                rootMetaObjectStats.countChildren++;
-                if (rootMetaObjectStats.countChildren >= rootMetaObjectStats.numChildren) {
-                    sceneModel.createEntity({
-                        id: rootMetaObject.id,
-                        meshIds: deferredMeshIds
-                    });
-                    deferredMeshIds.length = 0;
+    } else {
+        const nodeName = node.name;
+        if (((nodeName !== undefined && nodeName !== null) || depth === 0) && deferredMeshIds.length > 0) {
+            if (nodeName === undefined || nodeName === null) {
+                ctx.log(`Warning: 'name' properties not found on glTF scene nodes - will randomly-generate object IDs in XKT`);
+            }
+            let entityId = nodeName; // Fall back on generated ID when `name` not found on glTF scene node(s)
+            // if (!!entityId && sceneModel.entities[entityId]) {
+            //     ctx.log(`Warning: Two or more glTF nodes found with same 'name' attribute: '${nodeName} - will randomly-generating an object ID in XKT`);
+            // }
+            // while (!entityId || sceneModel.entities[entityId]) {
+            //     entityId = "entity-" + ctx.nextId++;
+            // }
+            if (ctx.metaModelCorrections) {
+                // Merging meshes into XKTObjects that map to metaobjects
+                const rootMetaObject = ctx.metaModelCorrections.eachChildRoot[entityId];
+                if (rootMetaObject) {
+                    const rootMetaObjectStats = ctx.metaModelCorrections.eachRootStats[rootMetaObject.id];
+                    rootMetaObjectStats.countChildren++;
+                    if (rootMetaObjectStats.countChildren >= rootMetaObjectStats.numChildren) {
+                        sceneModel.createEntity({
+                            id: rootMetaObject.id,
+                            meshIds: deferredMeshIds,
+                            isObject: true
+                        });
+                        deferredMeshIds.length = 0;
+                    }
+                } else {
+                    const metaObject = ctx.metaModelCorrections.metaObjectsMap[entityId];
+                    if (metaObject) {
+                        sceneModel.createEntity({
+                            id: entityId,
+                            meshIds: deferredMeshIds,
+                            isObject: true
+                        });
+                        deferredMeshIds.length = 0;
+                    }
                 }
             } else {
-                const metaObject = ctx.metaModelCorrections.metaObjectsMap[entityId];
-                if (metaObject) {
-                    sceneModel.createEntity({
-                        id: entityId,
-                        meshIds: deferredMeshIds
-                    });
-                    deferredMeshIds.length = 0;
-                }
+                // Create an XKTObject from the meshes at each named glTF node, don't care about metaobjects
+                sceneModel.createEntity({
+                    id: entityId,
+                    meshIds: deferredMeshIds,
+                    isObject: true
+                });
+                deferredMeshIds.length = 0;
             }
-        } else {
-            // Create an XKTObject from the meshes at each named glTF node, don't care about metaobjects
-            sceneModel.createEntity({
-                id: entityId,
-                meshIds: deferredMeshIds
-            });
-            deferredMeshIds.length = 0;
         }
     }
 }
@@ -116506,6 +116843,79 @@ const IFCObjectDefaults = {
  *      excludeTypes: ["IfcSpace"]
  * });
  * ````
+ *
+ * ## Showing a glTF model in TreeViewPlugin when metadata is not available
+ *
+ * When GLTFLoaderPlugin loads a glTF model, it creates an object Entity for each `node` in the glTF `scene` hierarchy that has a
+ * `name` attribute, giving the Entity an ID that has the value of the `name` attribute.
+ *
+ * Those name attributes are created by converter tools, such as by [IFC2GLTFCxConverter](https://github.com/Creoox/creoox-ifc2gltfcxconverter) when it generates glTF from IFC files. However, those name attributes are not
+ * ordinarily present in glTF that comes from other sources, such as LiDAR scanners. For such glTF models, GLTFLoaderPlugin
+ * will create Entities, but they will have randomly-generated IDs, and therefore cannot be associated with MetaObjects in any
+ * MetaModels that we create alongside the model.
+ *
+ * For glTF models containing `nodes` that don't have `name` attributes, we can use the `load()` method's `elementId` parameter
+ * to make GLTFLoaderPlugin load the entire model into a single Entity that gets this ID.
+ *
+ * In conjunction with that parameter, we can then use the `load()` method's `metaModelJSON` parameter to create a MetaModel that
+ * contains a MetaObject that corresponds to that Entity.
+ *
+ * When we've done that, then xeokit's {@link TreeViewPlugin} is able to have a node that represents the glTF model and controls
+ * the visibility of that Entity (ie. to control the visibility of the entire model).
+ *
+ * The snippet below shows how this is done.
+ *
+ * ````javascript
+ * import {Viewer, GLTFLoaderPlugin, NavCubePlugin, TreeViewPlugin} from "../../dist/xeokit-sdk.es.js";
+ *
+ * const viewer = new Viewer({
+ *     canvasId: "myCanvas",
+ *     transparent: true
+ * });
+ *
+ * new TreeViewPlugin(viewer, {
+ *     containerElement: document.getElementById("treeViewContainer"),
+ *     hierarchy: "containment"
+ * });
+ *
+ * const gltfLoader = new GLTFLoaderPlugin(viewer);
+ *
+ * const sceneModel = gltfLoader.load({ // Creates a SceneModel with ID "myScanModel"
+ *     id: "myScanModel",
+ *     src: "public-use-sample-apartment.glb",
+ *
+ *     //-------------------------------------------------------------------------
+ *     // Specify an `elementId` parameter, which causes the
+ *     // entire model to be loaded into a single Entity that gets this ID.
+ *     //-------------------------------------------------------------------------
+ *
+ *     entityId: "3toKckUfH2jBmd$7uhJHa4", // Creates an Entity with this ID
+ *
+ *     //-------------------------------------------------------------------------
+ *     // Specify a `metaModelJSON` parameter, which creates a
+ *     // MetaModel with two MetaObjects, one of which corresponds
+ *     // to our Entity. Then the TreeViewPlugin is able to have a node
+ *     // that can represent the model and control the visibility of the Entity.
+ *     //--------------------------------------------------------------------------
+ *
+ *    metaModelJSON: { // Creates a MetaModel with ID "myScanModel"
+ *         "metaObjects": [
+ *             {
+ *                 "id": "3toKckUfH2jBmd$7uhJHa6", // Creates a MetaObject with this ID
+ *                 "name": "My Project",
+ *                 "type": "Default",
+ *                 "parent": null
+ *             },
+ *             {
+ *                 "id": "3toKckUfH2jBmd$7uhJHa4", // Creates a MetaObject with this ID (same ID as our Entity)
+ *                 "name": "My Scan",
+ *                 "type": "Default",
+ *                 "parent": "3toKckUfH2jBmd$7uhJHa6"
+ *             }
+ *         ]
+ *     }
+ * });
+ * ````
  * @class GLTFLoaderPlugin
  */
 class GLTFLoaderPlugin extends Plugin {
@@ -116600,6 +117010,7 @@ class GLTFLoaderPlugin extends Plugin {
      * represent the returned model. Set false to always use vertex buffer objects (VBOs). Note that DTX is only applicable
      * to non-textured triangle meshes, and that VBOs are always used for meshes that have textures, line segments, or point
      * primitives. Only works while {@link DTX#enabled} is also ````true````.
+     * @param {String} [params.entityId] When supplied, causes the entire model to be loaded into a single {@link Entity} that gets this ID.
      * @returns {Entity} Entity representing the model, which will have {@link Entity#isModel} set ````true```` and will be registered by {@link Entity#id} in {@link Scene#models}
      */
     load(params = {}) {
@@ -134772,6 +135183,60 @@ const MAX_VERTICES = 500000; // TODO: Rough estimate
  * });
  * ````
  *
+ * ## Showing a LAS/LAZ model in TreeViewPlugin
+ *
+ * We can use the `load()` method's `elementId` parameter
+ * to make LASLoaderPlugin load the entire model into a single Entity that gets this ID.
+ *
+ * In conjunction with that parameter, we can then use the `load()` method's `metaModelJSON` parameter to create a MetaModel that
+ * contains a MetaObject that corresponds to that Entity.
+ *
+ * When we've done that, then xeokit's {@link TreeViewPlugin} is able to have a node that represents the model and controls
+ * the visibility of that Entity (ie. to control the visibility of the entire model).
+ *
+ * The snippet below shows how this is done.
+ *
+ * ````javascript
+ * import {Viewer, LASLoaderPlugin, NavCubePlugin, TreeViewPlugin} from "../../dist/xeokit-sdk.es.js";
+ *
+ * const viewer = new Viewer({
+ *     canvasId: "myCanvas",
+ *     transparent: true
+ * });
+ *
+ * new TreeViewPlugin(viewer, {
+ *     containerElement: document.getElementById("treeViewContainer"),
+ *     hierarchy: "containment"
+ * });
+ *
+ * const lasLoader = new LASLoaderPlugin(viewer);
+ *
+ * const sceneModel = lasLoader.load({  // Creates a SceneModel with ID "myScanModel"
+ *     id: "myScanModel",
+ *     src: "../../assets/models/las/Nalls_Pumpkin_Hill.laz",
+ *     rotation: [-90, 0, 0],
+ *
+ *     entityId: "3toKckUfH2jBmd$7uhJHa4", // Creates an Entity with this ID
+ *
+ *     metaModelJSON: { // Creates a MetaModel with ID "myScanModel"
+ *         "metaObjects": [
+ *             {
+ *                 "id": "3toKckUfH2jBmd$7uhJHa6", // Creates this MetaObject with this ID
+ *                 "name": "My Project",
+ *                 "type": "Default",
+ *                 "parent": null
+ *             },
+ *             {
+ *                 "id": "3toKckUfH2jBmd$7uhJHa4", // Creates this MetaObject with this ID
+ *                 "name": "My Scan",
+ *                 "type": "Default",
+ *                 "parent": "3toKckUfH2jBmd$7uhJHa6"
+ *             }
+ *         ]
+ *     }
+ * });
+ * ````
+ *
  * @class LASLoaderPlugin
  * @since 2.0.17
  */
@@ -135122,7 +135587,7 @@ class LASLoaderPlugin extends Plugin {
                     }
                      */
 
-                    const pointsObjectId = math.createUUID();
+                    const pointsObjectId = params.entityId || math.createUUID();
 
                     sceneModel.createEntity({
                         id: pointsObjectId,
@@ -135132,7 +135597,10 @@ class LASLoaderPlugin extends Plugin {
 
                     sceneModel.finalize();
 
-                    if (params.loadMetadata !== false) {
+                    if (params.metaModelJSON) {
+                        const metaModelId = sceneModel.id;
+                        this.viewer.metaScene.createMetaModel(metaModelId, params.metaModelJSON, options);
+                    } else if (params.loadMetadata !== false) {
                         const rootMetaObjectId = math.createUUID();
                         const metadata = {
                             projectId: "",
@@ -136630,6 +137098,566 @@ class CityJSONLoaderPlugin extends Plugin {
     }
 }
 
+/**
+ * Default data access strategy for {@link DotBIMLoaderPlugin}.
+ *
+ * This just loads assets using XMLHttpRequest.
+ */
+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);
+            });
+    }
+}
+
+/**
+ * {@link Viewer} plugin that loads models from [.bim](https://dotbim.net/) format.
+ *
+ * [<img src="https://xeokit.github.io/xeokit-sdk/assets/images/DotBIMLoaderPlugin-house.png">](https://xeokit.github.io/xeokit-sdk/examples/buildings/#dotbim_House)
+ *
+ * [[Run this example](https://xeokit.github.io/xeokit-sdk/examples/buildings/#dotbim_House)]
+ *
+ * * Creates an {@link Entity} representing each .bim model it loads, which will have {@link Entity#isModel} set ````true````
+ * and will be registered by {@link Entity#id} in {@link Scene#models}.
+ * * Creates an {@link Entity} for each object within the .bim model. Those Entities will have {@link Entity#isObject}
+ * set ````true```` and will be registered by {@link Entity#id} in {@link Scene#objects}.
+ * * When loading, can set the World-space position, scale and rotation of each model within World space,
+ * along with initial properties for all the model's {@link Entity}s.
+ * * Allows to mask which IFC types we want to load.
+ * * Allows to configure initial viewer state for specified IFC types (color, visibility, selection, highlighted, X-rayed, pickable, etc).
+ *
+ * ## Usage
+ *
+ * In the example below we'll load a house model from a [.bim file](/assets/models/dotbim/House.bim).
+ *
+ * This will create a bunch of {@link Entity}s that represents the model and its objects, along with
+ * a {@link MetaModel} and {@link MetaObject}s that hold their metadata.
+ *
+ * ````javascript
+ * import {Viewer, DotBIMLoaderPlugin} from "xeokit-sdk.es.js";
+ *
+ * //------------------------------------------------------------------------------------------------------------------
+ * // 1. Create a Viewer,
+ * // 2. Arrange the camera,
+ * // 3. Tweak the selection material (tone it down a bit)
+ * //------------------------------------------------------------------------------------------------------------------
+ *
+ * // 1
+ * const viewer = new Viewer({
+ *      canvasId: "myCanvas",
+ *      transparent: true
+ * });
+ *
+ * // 2
+ * viewer.camera.orbitPitch(20);
+ * viewer.camera.orbitYaw(-45);
+ *
+ * // 3
+ * viewer.scene.selectedMaterial.fillAlpha = 0.1;
+ *
+ * //------------------------------------------------------------------------------------------------------------------
+ * // 1. Create a .bim loader plugin,
+ * // 2. Load a .bim building model, emphasizing the edges to make it look nicer
+ * //------------------------------------------------------------------------------------------------------------------
+ *
+ * // 1
+ * const dotBIMLoader = new DotBIMLoaderPlugin(viewer);
+ *
+ * // 2
+ * var model = dotBIMLoader.load({                                    // Returns an Entity that represents the model
+ *      id: "myModel",
+ *      src: "House.bim",
+ *      edges: true
+ * });
+ *
+ * // Find the model Entity by ID
+ * model = viewer.scene.models["myModel"];
+ *
+ * // Destroy the model
+ * model.destroy();
+ * ````
+ *
+ * ## Transforming
+ *
+ * We have the option to rotate, scale and translate each  *````.bim````* model as we load it.
+ *
+ * This lets us load multiple models, or even multiple copies of the same model, and position them apart from each other.
+ *
+ * In the example below, we'll rotate our model 90 degrees about its local X-axis, then
+ * translate it 100 units along its X axis.
+ *
+ * ````javascript
+ * const model = dotBIMLoader.load({
+ *      src: "House.bim",
+ *      rotation: [90,0,0],
+ *      position: [100, 0, 0]
+ * });
+ * ````
+ *
+ * ## Including and excluding IFC types
+ *
+ * We can also load only those objects that have the specified IFC types. In the example below, we'll load only the
+ * objects that represent walls.
+ *
+ * ````javascript
+ * const model = dotBIMLoader.load({
+ *     id: "myModel",
+ *      src: "House.bim",
+ *      includeTypes: ["IfcWallStandardCase"]
+ * });
+ * ````
+ *
+ * We can also load only those objects that **don't** have the specified IFC types. In the example below, we'll load only the
+ * objects that do not represent empty space.
+ *
+ * ````javascript
+ * const model = dotBIMLoader.load({
+ *     id: "myModel",
+ *      src: "House.bim",
+ *      excludeTypes: ["IfcSpace"]
+ * });
+ * ````
+ * 
+ * # Configuring initial IFC object appearances
+ *
+ * We can specify the custom initial appearance of loaded objects according to their IFC types.
+ *
+ * This is useful for things like:
+ *
+ * * setting the colors to our objects according to their IFC types,
+ * * automatically hiding ````IfcSpace```` objects, and
+ * * ensuring that ````IfcWindow```` objects are always transparent.
+ * <br>
+ * In the example below, we'll load a model, while configuring ````IfcSpace```` elements to be always initially invisible,
+ * and ````IfcWindow```` types to be always translucent blue.
+ *
+ * ````javascript
+ * const myObjectDefaults = {
+ * 
+ *      IfcSpace: {
+ *          visible: false
+ *      },
+ *      IfcWindow: {
+ *          colorize: [0.337255, 0.303922, 0.870588], // Blue
+ *          opacity: 0.3
+ *      },
+ * 
+ *      //...
+ * 
+ *      DEFAULT: {
+ *          colorize: [0.5, 0.5, 0.5]
+ *      }
+ * };
+ *
+ * const model4 = dotBIMLoader.load({
+ *      id: "myModel4",
+ *      src: "House.bim",
+ *      objectDefaults: myObjectDefaults // Use our custom initial default states for object Entities
+ * });
+ * ````
+ *
+ * When we don't customize the appearance of IFC types, as just above, then IfcSpace elements tend to obscure other
+ * elements, which can be confusing.
+ *
+ * It's often helpful to make IfcSpaces transparent and unpickable, like this:
+ *
+ * ````javascript
+ * const dotBIMLoader = new DotBIMLoaderPlugin(viewer, {
+ *    objectDefaults: {
+ *        IfcSpace: {
+ *            pickable: false,
+ *            opacity: 0.2
+ *        }
+ *    }
+ * });
+ * ````
+ *
+ * Alternatively, we could just make IfcSpaces invisible, which also makes them unpickable:
+ *
+ * ````javascript
+ * const dotBIMLoader = new DotBIMLoaderPlugin(viewer, {
+ *    objectDefaults: {
+ *        IfcSpace: {
+ *            visible: false
+ *        }
+ *    }
+ * });
+ * ````
+ *
+ * # Configuring a custom data source
+ *
+ * By default, DotBIMLoaderPlugin will load *````.bim````* files and metadata JSON over HTTP.
+ *
+ * In the example below, we'll customize the way DotBIMLoaderPlugin loads the files by configuring it with our own data source
+ * object. For simplicity, our custom data source example also uses HTTP, using a couple of xeokit utility functions.
+ *
+ * ````javascript
+ * import {utils} from "xeokit-sdk.es.js";
+ *
+ * class MyDataSource {
+ * 
+ *      constructor() {
+ *      }
+ * 
+ *      // Gets the contents of the given .bim file in a JSON object
+ *      getDotBIM(src, ok, error) {
+ *          utils.loadJSON(dotBIMSrc,
+ *             (json) => {
+ *                 ok(json);
+ *             },
+ *             function (errMsg) {
+ *                 error(errMsg);
+ *             });
+ *      }
+ * }
+ *
+ * const dotBIMLoader2 = new DotBIMLoaderPlugin(viewer, {
+ *       dataSource: new MyDataSource()
+ * });
+ *
+ * const model5 = dotBIMLoader2.load({
+ *      id: "myModel5",
+ *      src: "House.bim"
+ * });
+ * ````
+ * @class DotBIMLoaderPlugin
+ */
+class DotBIMLoaderPlugin extends Plugin {
+
+    /**
+     * @constructor
+     *
+     * @param {Viewer} viewer The Viewer.
+     * @param {Object} cfg  Plugin configuration.
+     * @param {String} [cfg.id="DotBIMLoader"] Optional ID for this plugin, so that we can find it within {@link Viewer#plugins}.
+     * @param {Object} [cfg.objectDefaults] Map of initial default states for each loaded {@link Entity} that represents an object.  Default value is {@link IFCObjectDefaults}.
+     * @param {Object} [cfg.dataSource] A custom data source through which the DotBIMLoaderPlugin can load metadata, glTF and binary attachments. Defaults to an instance of {@link DotBIMDefaultDataSource}, which loads over HTTP.
+     */
+    constructor(viewer, cfg = {}) {
+
+        super("DotBIMLoader", viewer, cfg);
+
+        this.dataSource = cfg.dataSource;
+        this.objectDefaults = cfg.objectDefaults;
+    }
+
+    /**
+     * Sets a custom data source through which the DotBIMLoaderPlugin can .BIM files.
+     *
+     * Default value is {@link DotBIMDefaultDataSource}, which loads via an XMLHttpRequest.
+     *
+     * @type {Object}
+     */
+    set dataSource(value) {
+        this._dataSource = value || new DotBIMDefaultDataSource();
+    }
+
+    /**
+     * Gets the custom data source through which the DotBIMLoaderPlugin can load .BIM files.
+     *
+     * Default value is {@link DotBIMDefaultDataSource}, which loads via an XMLHttpRequest.
+     *
+     * @type {Object}
+     */
+    get dataSource() {
+        return this._dataSource;
+    }
+
+    /**
+     * Sets map of initial default states for each loaded {@link Entity} that represents an object.
+     *
+     * Default value is {@link IFCObjectDefaults}.
+     *
+     * @type {{String: Object}}
+     */
+    set objectDefaults(value) {
+        this._objectDefaults = value || IFCObjectDefaults;
+    }
+
+    /**
+     * Gets map of initial default states for each loaded {@link Entity} that represents an object.
+     *
+     * Default value is {@link IFCObjectDefaults}.
+     *
+     * @type {{String: Object}}
+     */
+    get objectDefaults() {
+        return this._objectDefaults;
+    }
+
+    /**
+     * Loads a .BIM model from a file into this DotBIMLoaderPlugin's {@link Viewer}.
+     *
+     * @param {*} params Loading parameters.
+     * @param {String} [params.id] ID to assign to the root {@link Entity#id}, unique among all components in the Viewer's {@link Scene}, generated automatically by default.
+     * @param {String} [params.src] Path to a .BIM file, as an alternative to the ````bim```` parameter.
+     * @param {*} [params.bim] .BIM JSON, as an alternative to the ````src```` parameter.
+     * @param {{String:Object}} [params.objectDefaults] Map of initial default states for each loaded {@link Entity} that represents an object. Default value is {@link IFCObjectDefaults}.
+     * @param {String[]} [params.includeTypes] When loading metadata, only loads objects that have {@link MetaObject}s with {@link MetaObject#type} values in this list.
+     * @param {String[]} [params.excludeTypes] When loading metadata, never loads objects that have {@link MetaObject}s with {@link MetaObject#type} values in this list.
+     * @param {Number[]} [params.origin=[0,0,0]] The double-precision World-space origin of the model's coordinates.
+     * @param {Number[]} [params.position=[0,0,0]] The single-precision position, relative to ````origin````.
+     * @param {Number[]} [params.scale=[1,1,1]] The model's scale.
+     * @param {Number[]} [params.rotation=[0,0,0]] The model's orientation, as Euler angles given in degrees, for each of the X, Y and Z axis.
+     * @param {Boolean} [params.backfaces=true] When true, always show backfaces, even on objects for which the .BIM material is single-sided. When false, only show backfaces on geometries whenever the .BIM material is double-sided.
+     * @param {Boolean} [params.dtxEnabled=true] When ````true```` (default) use data textures (DTX), where appropriate, to
+     * represent the returned model. Set false to always use vertex buffer objects (VBOs). Note that DTX is only applicable
+     * to non-textured triangle meshes, and that VBOs are always used for meshes that have textures, line segments, or point
+     * primitives. Only works while {@link DTX#enabled} is also ````true````.
+     * @returns {Entity} Entity representing the model, which will have {@link Entity#isModel} set ````true```` and will be registered by {@link Entity#id} in {@link Scene#models}
+     */
+    load(params = {}) {
+
+        if (params.id && this.viewer.scene.components[params.id]) {
+            this.error("Component with this ID already exists in viewer: " + params.id + " - will autogenerate this ID");
+            delete params.id;
+        }
+
+        const sceneModel = new SceneModel(this.viewer.scene, utils.apply(params, {
+            isModel: true,
+            backfaces: params.backfaces,
+            dtxEnabled: params.dtxEnabled,
+            rotation: params.rotation,
+            origin: params.origin
+        }));
+
+        const modelId = sceneModel.id;  // In case ID was auto-generated
+
+        if (!params.src && !params.dotBIM) {
+            this.error("load() param expected: src or dotBIM");
+            return sceneModel; // Return new empty model
+        }
+
+        const objectDefaults = params.objectDefaults || this._objectDefaults || IFCObjectDefaults;
+
+        let includeTypes;
+        if (params.includeTypes) {
+            includeTypes = {};
+            for (let i = 0, len = params.includeTypes.length; i < len; i++) {
+                includeTypes[params.includeTypes[i]] = true;
+            }
+        }
+
+        let excludeTypes;
+        if (params.excludeTypes) {
+            excludeTypes = {};
+            if (!includeTypes) {
+                includeTypes = {};
+            }
+            for (let i = 0, len = params.excludeTypes.length; i < len; i++) {
+                includeTypes[params.excludeTypes[i]] = true;
+            }
+        }
+
+        const parseDotBIM = (ctx) => {
+
+            const fileData = ctx.fileData;
+            const sceneModel = ctx.sceneModel;
+
+            const dbMeshIndices = {};
+            const dbMeshLoaded = {};
+
+            const ifcProjectId = math.createUUID();
+            const ifcSiteId = math.createUUID();
+            const ifcBuildingId = math.createUUID();
+            const ifcBuildingStoryId = math.createUUID();
+
+            const metaModelData = {
+                metaObjects: [
+                    {
+                        id: ifcProjectId,
+                        name: "IfcProject",
+                        type: "IfcProject",
+                        parent: null
+                    },
+                    {
+                        id: ifcSiteId,
+                        name: "IfcSite",
+                        type: "IfcSite",
+                        parent: ifcProjectId
+                    },
+                    {
+                        id: ifcBuildingId,
+                        name: "IfcBuilding",
+                        type: "IfcBuilding",
+                        parent: ifcSiteId
+                    },
+                    {
+                        id: ifcBuildingStoryId,
+                        name: "IfcBuildingStorey",
+                        type: "IfcBuildingStorey",
+                        parent: ifcBuildingId
+                    }
+                ],
+                propertySets: []
+            };
+
+            for (let i = 0, len = fileData.meshes.length; i < len; i++) {
+                const dbMesh = fileData.meshes[i];
+                dbMeshIndices[dbMesh.mesh_id] = i;
+            }
+
+            const parseDBMesh = (dbMeshId) => {
+                if (dbMeshLoaded[dbMeshId]) {
+                    return;
+                }
+                const dbMeshIndex = dbMeshIndices[dbMeshId];
+                const dbMesh = fileData.meshes[dbMeshIndex];
+                sceneModel.createGeometry({
+                    id: dbMeshId,
+                    primitive: "triangles",
+                    positions: dbMesh.coordinates,
+                    indices: dbMesh.indices
+                });
+                dbMeshLoaded[dbMeshId] = true;
+            };
+
+            const dbElements = fileData.elements;
+            for (let i = 0, len = dbElements.length; i < len; i++) {
+                const element = dbElements[i];
+                const elementType = element.type;
+                if (excludeTypes && excludeTypes[elementType]) {
+                    continue;
+
+                }
+                if (includeTypes && (!includeTypes[elementType])) {
+                    continue;
+                }
+                const info = element.info;
+                const objectId =
+                    element.guid !== undefined
+                        ? `${element.guid}`
+                        : (info !== undefined && info.id !== undefined
+                            ? info.id
+                            : i);
+
+                const dbMeshId = element.mesh_id;
+
+                parseDBMesh(dbMeshId);
+
+                const meshId = `${objectId}-mesh`;
+                const vector = element.vector;
+                const rotation = element.rotation;
+                const props = objectDefaults ? objectDefaults[elementType] || objectDefaults["DEFAULT"] : null;
+
+                let visible = true;
+                let pickable = true;
+                let color = element.color ? [element.color.r / 255, element.color.g / 255, element.color.b / 255] : [1, 1, 1];
+                let opacity = element.color ? element.color.a / 255 : 1.0;
+
+                if (props) {
+                    if (props.visible === false) {
+                        visible = false;
+                    }
+                    if (props.pickable === false) {
+                        pickable = false;
+                    }
+                    if (props.colorize) {
+                        color = props.colorize;
+                    }
+                    if (props.opacity !== undefined && props.opacity !== null) {
+                        opacity = props.opacity;
+                    }
+                }
+
+                sceneModel.createMesh({
+                    id: meshId,
+                    geometryId: dbMeshId,
+                    color,
+                    opacity,
+                    quaternion: rotation && (rotation.qz !== 0 || rotation.qy !== 0 || rotation.qx !== 0 || rotation.qw !== 1.0) ? [rotation.qx, rotation.qy, rotation.qz, rotation.qw] : undefined,
+                    position: vector ? [vector.x, vector.y, vector.z] : undefined
+                });
+
+                sceneModel.createEntity({
+                    id: objectId,
+                    meshIds: [meshId],
+                    visible,
+                    pickable,
+                    isObject: true
+                });
+
+                metaModelData.metaObjects.push({
+                    id: objectId,
+                    name: info && info.Name && info.Name !== "None" ? info.Name : `${element.type} ${objectId}`,
+                    type: element.type,
+                    parent: ifcBuildingStoryId
+                });
+            }
+
+            sceneModel.finalize();
+
+            this.viewer.metaScene.createMetaModel(modelId, metaModelData);
+
+            sceneModel.scene.once("tick", () => {
+                if (sceneModel.destroyed) {
+                    return;
+                }
+                sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
+                sceneModel.fire("loaded", true, false); // Don't forget the event, for late subscribers
+            });
+        };
+
+        if (params.src) {
+            const src = params.src;
+            this.viewer.scene.canvas.spinner.processes++;
+            this._dataSource.getDotBIM(src, (fileData) => { // OK
+                    const ctx = {
+                        fileData,
+                        sceneModel,
+                        nextId: 0,
+                        error: function (errMsg) {
+                        }
+                    };
+                    parseDotBIM(ctx);
+                    this.viewer.scene.canvas.spinner.processes--;
+                },
+                (err) => {
+                    this.viewer.scene.canvas.spinner.processes--;
+                    this.error(err);
+                });
+        } else if (params.dotBIM) {
+            const ctx = {
+                fileData: params.dotBIM,
+                sceneModel,
+                nextId: 0,
+                error: function (errMsg) {
+                }
+            };
+            parseDotBIM(ctx);
+        }
+
+        sceneModel.once("destroyed", () => {
+            this.viewer.metaScene.destroyMetaModel(modelId);
+        });
+
+        return sceneModel;
+    }
+
+    /**
+     * Destroys this DotBIMLoaderPlugin.
+     */
+    destroy() {
+        super.destroy();
+    }
+}
+
 exports.AlphaFormat = AlphaFormat;
 exports.AmbientLight = AmbientLight;
 exports.AngleMeasurementsControl = AngleMeasurementsControl;
@@ -136660,6 +137688,8 @@ exports.DistanceMeasurementsControl = DistanceMeasurementsControl;
 exports.DistanceMeasurementsMouseControl = DistanceMeasurementsMouseControl;
 exports.DistanceMeasurementsPlugin = DistanceMeasurementsPlugin;
 exports.DistanceMeasurementsTouchControl = DistanceMeasurementsTouchControl;
+exports.DotBIMDefaultDataSource = DotBIMDefaultDataSource;
+exports.DotBIMLoaderPlugin = DotBIMLoaderPlugin;
 exports.EdgeMaterial = EdgeMaterial;
 exports.EmphasisMaterial = EmphasisMaterial;
 exports.FaceAlignedSectionPlanesPlugin = FaceAlignedSectionPlanesPlugin;