@xeokit/xeokit-sdk 2.6.49 → 2.6.50

package/package.json

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

@@ -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/scene/model/SceneModel.js

@@ -1602,6 +1602,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;