@xeokit/xeokit-sdk 2.6.51 → 2.6.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.51",
+  "version": "2.6.53",
   "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/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

@@ -1205,7 +1205,7 @@ export class TreeViewPlugin extends Plugin {
             return;
         }
         const firstChild = children[0];
-        if (this._hierarchy === "storeys" && firstChild.type === "IfcBuildingStorey") {
+        if ((this._hierarchy === "storeys" || this._hierarchy === "containment") &&  firstChild.type === "IfcBuildingStorey") {
             children.sort(this._getSpatialSortFunc());
         } else {
             children.sort(this._alphaSortFunc);
@@ -1216,21 +1216,11 @@ export class TreeViewPlugin extends Plugin {
         }
     }
 
-    _getSpatialSortFunc() { // Creates cached sort func with Viewer in scope
+    _getSpatialSortFunc() {
         const viewer = this.viewer;
         const scene = viewer.scene;
         const camera = scene.camera;
-        const metaScene = viewer.metaScene;
-        return this._spatialSortFunc || (this._spatialSortFunc = (node1, node2) => {
-            if (!node1.aabb || !node2.aabb) {
-                // Sorting on lowest point of the AABB is likely more more robust when objects could overlap storeys
-                if (!node1.aabb) {
-                    node1.aabb = scene.getAABB(metaScene.getObjectIDsInSubtree(node1.objectId));
-                }
-                if (!node2.aabb) {
-                    node2.aabb = scene.getAABB(metaScene.getObjectIDsInSubtree(node2.objectId));
-                }
-            }
+        return this._spatialSortFunc || (this._spatialSortFunc = (storey1, storey2) => {
             let idx = 0;
             if (camera.xUp) {
                 idx = 0;
@@ -1239,13 +1229,24 @@ export class TreeViewPlugin extends Plugin {
             } else {
                 idx = 2;
             }
-            if (node1.aabb[idx] > node2.aabb[idx]) {
-                return -1;
-            }
-            if (node1.aabb[idx] < node2.aabb[idx]) {
-                return 1;
+            const metaScene = this.viewer.metaScene;
+            const storey1MetaObject = metaScene.metaObjects[storey1.objectId];
+            const storey2MetaObject = metaScene.metaObjects[storey2.objectId];
+
+            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 {
+                return 0;
             }
-            return 0;
         });
     }