@xeokit/xeokit-sdk 2.6.50 → 2.6.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.50",
+  "version": "2.6.52",
   "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/StoreyViewsPlugin.js

@@ -301,7 +301,7 @@ class StoreyViewsPlugin extends Plugin {
                     this.fire("storeys", this.storeys);
                 });
                 this.storeys[storeyId] = storey;
-                this._storeysList= null;
+                this._storeysList = null;
                 if (!this.modelStoreys[modelId]) {
                     this.modelStoreys[modelId] = {};
                 }
@@ -322,7 +322,7 @@ class StoreyViewsPlugin extends Plugin {
                         model.off(storey._onModelDestroyed);
                     }
                     delete this.storeys[storyObjectId];
-                    this._storeysList= null;
+                    this._storeysList = null;
                 }
             }
             delete this.modelStoreys[modelId];
@@ -541,7 +541,11 @@ class StoreyViewsPlugin extends Plugin {
             height = Math.round(width * aspect);
         }
 
-        this._objectsMemento.saveObjects(scene);
+        const mask = {
+            visible: true,
+        }
+
+        this._objectsMemento.saveObjects(scene, mask);
         this._cameraMemento.saveCamera(scene);
 
         this.showStoreyObjects(storeyId, utils.apply(options, {
@@ -556,7 +560,7 @@ class StoreyViewsPlugin extends Plugin {
             format: format,
         });
 
-        this._objectsMemento.restoreObjects(scene);
+        this._objectsMemento.restoreObjects(scene, mask);
         this._cameraMemento.restoreCamera(scene);
 
         return new StoreyMap(storeyId, src, format, width, height, padding);
@@ -693,9 +697,9 @@ class StoreyViewsPlugin extends Plugin {
      * @returns {String} ID of the storey containing the position, or null if the position falls outside all the storeys.
      */
     getStoreyInVerticalRange(worldPos) {
-        for(let storeyId in this.storeys) {
+        for (let storeyId in this.storeys) {
             const storey = this.storeys[storeyId];
-            const aabb = [0,0,0,0,0,0], pos = [0,0,0];
+            const aabb = [0, 0, 0, 0, 0, 0], pos = [0, 0, 0];
             aabb[1] = storey.storeyAABB[1];
             aabb[4] = storey.storeyAABB[4];
             pos[1] = worldPos[1];
@@ -708,14 +712,14 @@ class StoreyViewsPlugin extends Plugin {
 
     /**
      * Returns whether a position is above or below a building
-     * 
+     *
      * @param {Number[]} worldPos 3D World-space position.
      * @returns {String} ID of the lowest/highest story or null.
      */
     isPositionAboveOrBelowBuilding(worldPos) {
         const keys = Object.keys(this.storeys);
-        const ids = [keys[0], keys[keys.length-1]];
-        if(worldPos[1] < this.storeys[ids[0]].storeyAABB[1])
+        const ids = [keys[0], keys[keys.length - 1]];
+        if (worldPos[1] < this.storeys[ids[0]].storeyAABB[1])
             return ids[0];
         else if (worldPos[1] > this.storeys[ids[1]].storeyAABB[4])
             return ids[1];
@@ -835,13 +839,30 @@ class StoreyViewsPlugin extends Plugin {
             } else {
                 idx = 2;
             }
-            if (storey1.aabb[idx] > storey2.aabb[idx]) {
-                return -1;
-            }
-            if (storey1.aabb[idx] < storey2.aabb[idx]) {
-                return 1;
+            const metaScene = this.viewer.metaScene;
+            const storey1MetaObject = metaScene.metaObjects[storey1.storeyId];
+            const storey2MetaObject = metaScene.metaObjects[storey2.storeyId];
+
+            if (storey1MetaObject && (storey1MetaObject.attributes && storey1MetaObject.attributes.elevation !== undefined) &&
+                storey2MetaObject && (storey2MetaObject.attributes && storey2MetaObject.attributes.elevation !== undefined)) {
+                const elevation1 = storey1MetaObject.attributes.elevation;
+                const elevation2 = storey2MetaObject.attributes.elevation;
+                if (elevation1 > elevation2) {
+                    return -1;
+                }
+                if (elevation1 < elevation2) {
+                    return 1;
+                }
+                return 0;
+            } else {
+                if (storey1.aabb[idx] > storey2.aabb[idx]) {
+                    return -1;
+                }
+                if (storey1.aabb[idx] < storey2.aabb[idx]) {
+                    return 1;
+                }
+                return 0;
             }
-            return 0;
         });
     }
 }

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,

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();

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.