Merge pull request #1728 from xeokit/feature/storeys-with-model-id

Add support for model ids when there are multiple models on the scene
xeokit · Nov 6, 2024 · af25f78 · af25f78
2 parents 459f5a6 + 7b87bd0
commit af25f78
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/src/plugins/StoreyViewsPlugin/StoreyViewsPlugin.js b/src/plugins/StoreyViewsPlugin/StoreyViewsPlugin.js
@@ -680,9 +680,10 @@ class StoreyViewsPlugin extends Plugin {
      * @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.
      */
-    getStoreyContainingWorldPos(worldPos) {
-        for (var storeyId in this.storeys) {
-            const storey = this.storeys[storeyId];
+    getStoreyContainingWorldPos(worldPos, modelId = null) {
+        const storeys = modelId ? this._filterStoreys(modelId) : this.storeys;
+        for (let storeyId in storeys) {
+            const storey = storeys[storeyId];
             if (math.point3AABB3AbsoluteIntersect(storey.storeyAABB, worldPos)) {
                 return storeyId;
             }
@@ -696,9 +697,10 @@ class StoreyViewsPlugin extends Plugin {
      * @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.
      */
-    getStoreyInVerticalRange(worldPos) {
-        for (let storeyId in this.storeys) {
-            const storey = this.storeys[storeyId];
+    getStoreyInVerticalRange(worldPos, modelId = null) {
+        const storeys = modelId ? this._filterStoreys(modelId) : this.storeys;
+        for (let storeyId in storeys) {
+            const storey = storeys[storeyId];
             const aabb = [0, 0, 0, 0, 0, 0], pos = [0, 0, 0];
             aabb[1] = storey.storeyAABB[1];
             aabb[4] = storey.storeyAABB[4];
@@ -716,12 +718,14 @@ class StoreyViewsPlugin extends Plugin {
      * @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);
+    isPositionAboveOrBelowBuilding(worldPos, modelId = null) {
+        const storeys = modelId ? this._filterStoreys(modelId) : this.storeys;
+        const keys = Object.keys(storeys);
+        if(keys.length <= 0) return null;
         const ids = [keys[0], keys[keys.length - 1]];
-        if (worldPos[1] < this.storeys[ids[0]].storeyAABB[1])
+        if (worldPos[1] < storeys[ids[0]].storeyAABB[1])
             return ids[0];
-        else if (worldPos[1] > this.storeys[ids[1]].storeyAABB[4])
+        else if (worldPos[1] > storeys[ids[1]].storeyAABB[4])
             return ids[1];
         return null;
     }
@@ -865,6 +869,12 @@ class StoreyViewsPlugin extends Plugin {
             }
         });
     }
+
+    _filterStoreys(modelId) {
+        return Object.fromEntries(
+            Object.entries(this.storeys).filter(([_, value]) => value.modelId === modelId)
+        );
+    }
 }
 
 export {StoreyViewsPlugin}
diff --git a/types/plugins/StoreyViewsPlugin/StoreyViewsPlugin.d.ts b/types/plugins/StoreyViewsPlugin/StoreyViewsPlugin.d.ts
@@ -116,15 +116,15 @@ export declare class StoreyViewsPlugin extends Plugin {
     * @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.
     */
-  getStoreyContainingWorldPos(worldPos: number[]): string;
+  getStoreyContainingWorldPos(worldPos: number[], modelId: null | string): string;
 
   /**
    * 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.
    */
-  getStoreyInVerticalRange(worldPos: number[]): string;
+  getStoreyInVerticalRange(worldPos: number[], modelId: null | string): string;
 
 
   /**
@@ -133,7 +133,7 @@ export declare class StoreyViewsPlugin extends Plugin {
    * @param {Number[]} worldPos 3D World-space position.
    * @returns {String} ID of the lowest/highest story or null.
    */
-  isPositionAboveOrBelowBuilding(worldPos: number[]): string;
+  isPositionAboveOrBelowBuilding(worldPos: number[], modelId: null | string): string;
 
   /**
    * Converts a 3D World-space position to a 2D position within a StoreyMap image.