Culling tweaks

xeokit · Oct 17, 2023 · 70eaba4 · 70eaba4
1 parent 00b797f
commit 70eaba4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/examples/performance/lodCulling_HolterTower.html b/examples/performance/lodCulling_HolterTower.html
@@ -82,9 +82,20 @@ <h3>Resources</h3>
     //------------------------------------------------------------------------------
     // Configure level-of-detail culling
     //------------------------------------------------------------------------------
-
+    
     viewer.scene.lod.enabled = true;
     viewer.scene.lod.targetFPS = 50; // Set an excessive FPS target to force LoD
+    viewer.scene.lod.neverCullTypes = [
+        "IfcWall",
+        "IfcSlab",
+        "IfcFloor",
+        "IfcRoof",
+        "IfcSpace",
+        "IfcBeam",
+        "IfcStair",
+        "IfcPlate",
+        "IfcSite"
+    ];
 
     new NavCubePlugin(viewer, {
         canvasId: "myNavCubeCanvas",
@@ -115,7 +126,7 @@ <h3>Resources</h3>
         }
     });
 
-    sceneModel.on("loaded", ()=>{
+    sceneModel.on("loaded", () => {
         viewer.cameraFlight.jumpTo(sceneModel);
     });
 

diff --git a/src/viewer/scene/lod/LOD.js b/src/viewer/scene/lod/LOD.js
@@ -13,6 +13,8 @@ export class LOD extends Component {
 
         this._scene = scene;
         this._lodLevels = [2000, 600, 150, 80, 20];
+        this._neverCullTypes = [];
+        this._neverCullTypesMap = {};
         this._lodManagers = {};
         this._lodManagerList = [];
 
@@ -143,6 +145,10 @@ export class LOD extends Component {
             value = [];
         }
         this._neverCullTypes = value;
+        this._neverCullTypesMap = {};
+        for (let i = 0, len = this._neverCullTypes.length; i < len; i++) {
+            this._neverCullTypesMap[this._neverCullTypes[i]] = true;
+        }
       //  this.glRedraw();
     }
 
@@ -156,6 +162,14 @@ export class LOD extends Component {
     get neverCullTypes() {
         return this._neverCullTypes;
     }
+
+    /**
+     * @private
+     * @returns {*|{}}
+     */
+    get neverCullTypesMap() {
+        return this._neverCullTypesMap;
+    }
 
     /**
      * Called within SceneModel constructors

diff --git a/src/viewer/scene/lod/LODCullingManager.js b/src/viewer/scene/lod/LODCullingManager.js
@@ -58,12 +58,12 @@ export class LODCullingManager {
         let lodState = this.lodState;
         let retVal = false;
         if (currentFPS < lodState.targetFps) {
-            if (++lodState.consecutiveFramesWithoutTargetFps > 5) {
+            if (++lodState.consecutiveFramesWithoutTargetFps > 2) {
                 lodState.consecutiveFramesWithoutTargetFps = 0;
                 retVal = this._increaseLODLevelIndex();
             }
         } else if (currentFPS > (lodState.targetFps + 4)) {
-            if (++lodState.consecutiveFramesWithTargetFps > 5) {
+            if (++lodState.consecutiveFramesWithTargetFps > 2) {
                 lodState.consecutiveFramesWithTargetFps = 0;
                 retVal = this._decreaseLODLevelIndex();
             }

diff --git a/src/viewer/scene/lod/LODState.js b/src/viewer/scene/lod/LODState.js
@@ -8,18 +8,6 @@ import {math} from "../math/math.js";
  * @private
  */
 
-
-const neverCullTypes = {
-    "IfcWall": true,
-    "IfcSlab": true,
-    "IfcFloor": true,
-    "IfcRoof": true,
-    "IfcSpace": true,
-    "IfcBeam": true,
-    "IfcStair": true,
-    "IfcPlate":true
-}
-
 export class LODState {
 
     /**
@@ -101,6 +89,7 @@ export class LODState {
         if (entityList.length === 0) {
             return;
         }
+        const neverCullTypesMap = sceneModel.scene.lod.neverCullTypesMap;
         const metaScene = sceneModel.scene.viewer.metaScene;
         const entitiesInLOD = {};
         const primCountInLOD = {};
@@ -110,15 +99,15 @@ export class LODState {
         for (let i = 0, len = entityList.length; i < len; i++) {
             const entity = entityList[i];
             const metaObject = metaScene.metaObjects[entity.id];
-            if (metaObject && neverCullTypes[metaObject.type]) {
+            if (metaObject && neverCullTypesMap[metaObject.type]) {
                 continue;
             }
             const entityComplexity = entity.numPrimitives;
             const entitySize = math.getAABB3Diag(entity.aabb);
-            const isCullable = ((minComplexity <= entityComplexity) && (entitySize <= maxSize));
-            if (!isCullable) {
-                continue;
-            }
+            // const isCullable = ((minComplexity <= entityComplexity) && (entitySize <= maxSize));
+            // if (!isCullable) {
+            //     continue;
+            // }
             let lodLevel = 0, len;
             for (lodLevel = 0, len = this.primLODLevels.length; lodLevel < len; lodLevel++) {
                 if (entity.numPrimitives >= this.primLODLevels [lodLevel]) {