@xeokit/xeokit-sdk 2.6.49 → 2.6.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.49",
+  "version": "2.6.51",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.js

@@ -1,4 +1,5 @@
 import {math} from "../../viewer/scene/math/math.js";
+import {transformToNode} from "../lib/ui/index.js";
 import {AngleMeasurementsControl} from "./AngleMeasurementsControl.js";
 
 const MOUSE_FINDING_ORIGIN = 0;
@@ -172,9 +173,6 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         const mouseHoverCanvasPos = math.vec2();
         this._currentAngleMeasurement = null;
 
-        const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
-        const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
-
         const pagePos = math.vec2();
 
         const hoverOn = event => {
@@ -209,8 +207,10 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                             this.markerDiv.style.left = `${pagePos[0] - 5}px`;
                             this.markerDiv.style.top = `${pagePos[1] - 5}px`;
                         } else {
-                            this.markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
-                            this.markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
+                            const markerPos = math.vec2(canvasPos);
+                            transformToNode(canvas, this.markerDiv.parentNode, markerPos);
+                            this.markerDiv.style.left = `${markerPos[0] - 5}px`;
+                            this.markerDiv.style.top = `${markerPos[1] - 5}px`;
                         }
                         break;
                     case MOUSE_FINDING_CORNER:

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -1,4 +1,5 @@
 import {math} from "../../viewer/scene/math/math.js";
+import {transformToNode} from "../lib/ui/index.js";
 import {DistanceMeasurementsControl} from "./DistanceMeasurementsControl.js";
 
 const MOUSE_FIRST_CLICK_EXPECTED = 0;
@@ -181,9 +182,6 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
 
         this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
 
-        const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
-        const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
-
         const pagePos = math.vec2();
 
         const hoverOn = event => {
@@ -198,8 +196,10 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                         this._markerDiv.style.left = `${pagePos[0] - 5}px`;
                         this._markerDiv.style.top = `${pagePos[1] - 5}px`;
                     } else {
-                        this._markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
-                        this._markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
+                        const markerPos = math.vec2(canvasPos);
+                        transformToNode(canvas, this._markerDiv.parentNode, markerPos);
+                        this._markerDiv.style.left = `${markerPos[0] - 5}px`;
+                        this._markerDiv.style.top = `${markerPos[1] - 5}px`;
                     }
 
                     this._markerDiv.style.background = "pink";

package/src/plugins/StoreyViewsPlugin/Storey.js

@@ -41,7 +41,7 @@ class Storey {
         /**
          * Axis-aligned World-space boundary of the {@link Entity}s that represent the IfcBuildingStorey.
          *
-         * The boundary is a six-element Float32Array containing the min/max extents of the
+         * The boundary is a six-element Float64Array containing the min/max extents of the
          * axis-aligned boundary, ie. ````[xmin, ymin, zmin, xmax, ymax, zmax]````
          *
          * @property storeyAABB
@@ -52,7 +52,7 @@ class Storey {
         /**
          * Axis-aligned World-space boundary of the {@link Entity}s that represent the IfcBuildingStorey.
          *
-         * The boundary is a six-element Float32Array containing the min/max extents of the
+         * The boundary is a six-element Float64Array containing the min/max extents of the
          * axis-aligned boundary, ie. ````[xmin, ymin, zmin, xmax, ymax, zmax]````
          *
          * @deprecated
@@ -64,7 +64,7 @@ class Storey {
         /**
          * Axis-aligned World-space boundary of the {@link Entity}s that represent the model.
          *
-         * The boundary is a six-element Float32Array containing the min/max extents of the
+         * The boundary is a six-element Float64Array containing the min/max extents of the
          * axis-aligned boundary, ie. ````[xmin, ymin, zmin, xmax, ymax, zmax]````
          *
          * @property modelAABB

package/src/plugins/StoreyViewsPlugin/StoreyViewsPlugin.js

@@ -258,6 +258,8 @@ class StoreyViewsPlugin extends Plugin {
          */
         this.storeys = {};
 
+        this._storeysList = null;
+
         /**
          * A set of {@link Storey}s for each {@link MetaModel}.
          *
@@ -299,6 +301,7 @@ class StoreyViewsPlugin extends Plugin {
                     this.fire("storeys", this.storeys);
                 });
                 this.storeys[storeyId] = storey;
+                this._storeysList= null;
                 if (!this.modelStoreys[modelId]) {
                     this.modelStoreys[modelId] = {};
                 }
@@ -319,6 +322,7 @@ class StoreyViewsPlugin extends Plugin {
                         model.off(storey._onModelDestroyed);
                     }
                     delete this.storeys[storyObjectId];
+                    this._storeysList= null;
                 }
             }
             delete this.modelStoreys[modelId];
@@ -423,7 +427,7 @@ class StoreyViewsPlugin extends Plugin {
      * @param {String} storeyId ID of the ````IfcBuildingStorey```` object.
      * @param {*} [options] Options for showing the Entitys within the storey.
      * @param {Boolean} [options.hideOthers=false] When ````true````, hide all other {@link Entity}s.
-    */
+     */
     showStoreyObjects(storeyId, options = {}) {
 
         const storey = this.storeys[storeyId];
@@ -448,7 +452,7 @@ class StoreyViewsPlugin extends Plugin {
 
         this.withStoreyObjects(storeyId, (entity, metaObject) => {
             if (entity) {
-                    entity.visible = true;
+                entity.visible = true;
             }
         });
     }
@@ -684,7 +688,7 @@ class StoreyViewsPlugin extends Plugin {
 
     /**
      * Gets the ID of the storey which's bounding box contains the y point of the world position
-     * 
+     *
      * @param {Number[]} worldPos 3D World-space position.
      * @returns {String} ID of the storey containing the position, or null if the position falls outside all the storeys.
      */
@@ -804,6 +808,42 @@ class StoreyViewsPlugin extends Plugin {
         this.viewer.scene.off(this._onModelLoaded);
         super.destroy();
     }
+
+    /**
+     * Gets Storeys in a list, spatially sorted on the vertical World axis, the lowest Storey first.
+     *
+     * @returns {null}
+     */
+    get storeysList() {
+        if (!this._storeysList) {
+            this._storeysList = Object.values(this.storeys);
+            this._storeysList.sort(this._getSpatialSortFunc());
+        }
+        return this._storeysList;
+    }
+
+    _getSpatialSortFunc() {
+        const viewer = this.viewer;
+        const scene = viewer.scene;
+        const camera = scene.camera;
+        return this._spatialSortFunc || (this._spatialSortFunc = (storey1, storey2) => {
+            let idx = 0;
+            if (camera.xUp) {
+                idx = 0;
+            } else if (camera.yUp) {
+                idx = 1;
+            } else {
+                idx = 2;
+            }
+            if (storey1.aabb[idx] > storey2.aabb[idx]) {
+                return -1;
+            }
+            if (storey1.aabb[idx] < storey2.aabb[idx]) {
+                return 1;
+            }
+            return 0;
+        });
+    }
 }
 
 export {StoreyViewsPlugin}

package/src/plugins/TreeViewPlugin/TreeViewPlugin.js

@@ -984,7 +984,7 @@ export class TreeViewPlugin extends Plugin {
             buildingNode = {
                 nodeId: `${this._id}-${objectId}`,
                 objectId: objectId,
-                title: (metaObject.metaModels.length === 0) ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
+                title: (metaObject.metaModels.length === 0) ? metaObjectName : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
                 type: metaObjectType,
                 parent: null,
                 numEntities: 0,
@@ -1087,7 +1087,7 @@ export class TreeViewPlugin extends Plugin {
             rootNode = {
                 nodeId: `${this._id}-${objectId}`,
                 objectId: objectId,
-                title: metaObject.metaModels.length === 0 ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
+                title: metaObject.metaModels.length === 0 ? metaObjectName : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
                 type: metaObjectType,
                 parent: null,
                 numEntities: 0,
@@ -1168,7 +1168,7 @@ export class TreeViewPlugin extends Plugin {
         const node = {
             nodeId: `${this._id}-${objectId}`,
             objectId: objectId,
-            title: (!parent) ? metaObject.metaModels.length === 0 ? "na" : (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
+            title: (!parent) ? metaObject.metaModels.length === 0 ? metaObjectName : (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
             type: metaObjectType,
             parent: parent,
             numEntities: 0,
@@ -1204,8 +1204,8 @@ export class TreeViewPlugin extends Plugin {
         if (!children || children.length === 0) {
             return;
         }
-        if (this._hierarchy === "storeys" && node.type === "IfcBuilding") {
-            // Assumes that children of an IfcBuilding will always be IfcBuildingStoreys
+        const firstChild = children[0];
+        if (this._hierarchy === "storeys" && firstChild.type === "IfcBuildingStorey") {
             children.sort(this._getSpatialSortFunc());
         } else {
             children.sort(this._alphaSortFunc);

package/src/viewer/metadata/MetaModel.js

@@ -304,8 +304,8 @@ class MetaModel {
 
         for (let modelId in metaScene.metaModels) {
             const metaModel = metaScene.metaModels[modelId];
-            for (let i = 0, len = metaModel.metaObjects.length; i < len; i++) {
-                const metaObject = metaModel.metaObjects[i];
+            for (let objectId in metaModel.metaObjects) {
+                const metaObject = metaModel.metaObjects[objectId];
                 metaObject.metaModels.push(metaModel);
             }
         }

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

@@ -1562,13 +1562,7 @@ export class SceneModel extends Component {
      */
     set matrix(value) {
         this._matrix.set(value || DEFAULT_MATRIX);
-
-        math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrix);
-        math.conjugateQuaternion(this._quaternion, this._conjugateQuaternion);
-        math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrixConjugate);
-        this._matrix.set(this._worldRotationMatrix);
-        math.translateMat4v(this._position, this._matrix);
-
+        math.decomposeMat4(this._matrix, this._position, this._quaternion, this._scale);
         this._matrixDirty = false;
         this._setWorldMatrixDirty();
         this._sceneModelDirty();
@@ -1602,6 +1596,8 @@ export class SceneModel extends Component {
             math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrix);
             math.conjugateQuaternion(this._quaternion, this._conjugateQuaternion);
             math.quaternionToRotationMat4(this._conjugateQuaternion, this._worldRotationMatrixConjugate);
+            math.scaleMat4v(this._scale, this._worldRotationMatrix);
+            math.scaleMat4v(this._scale, this._worldRotationMatrixConjugate);
             this._matrix.set(this._worldRotationMatrix);
             math.translateMat4v(this._position, this._matrix);
             this._matrixDirty = false;

package/types/plugins/TreeViewPlugin/renderService.d.ts

@@ -107,7 +107,7 @@ export declare interface ITreeViewRenderService {
    * @param nodeId {String} The node id.
    * @param checked {Boolean} Whether the node is checked.
    */
-  setCheckbox(nodeId: string, checked: boolean): void;
+  setCheckbox(nodeId: string, checked: boolean, indeterminate?: boolean): void;
 
   /**
    * Sets the node's xrayed state.