Recompute sector bounds when nodes are transformed

viewer/packages/cad-geometry-loaders/package.json

@@ -17,6 +17,7 @@
     "@reveal/model-base": "workspace:*",
     "@reveal/rendering": "workspace:*",
     "@reveal/sector-loader": "workspace:*",
+    "@reveal/sector-parser": "workspace:*",
     "@reveal/utilities": "workspace:*"
   }
 }

viewer/packages/cad-geometry-loaders/src/CadManager.ts

@@ -14,6 +14,7 @@ import { File3dFormat, ModelIdentifier } from '@reveal/data-providers';
 import { MetricsLogger } from '@reveal/metrics';
 import { CadModelBudget, defaultDesktopCadModelBudget } from './CadModelBudget';
 import { CadModelFactory, CadModelSectorLoadStatistics, CadNode, GeometryFilter } from '@reveal/cad-model';
+import { RevealGeometryCollectionType } from '@reveal/sector-parser';
 
 export class CadManager {
   private readonly _materialManager: CadMaterialManager;
@@ -102,6 +103,19 @@ export class CadManager {
       }
 
       this.markNeedsRedraw();
+
+      // Update mapping from tree indices to sector ids
+      if (!cadModel.treeIndexToSectorsMap.isCompleted(sector.metadata.id, RevealGeometryCollectionType.TriangleMesh)) {
+        if (sector.group?.children.length === 1) {
+          const treeIndices = sector.group.children[0].userData?.treeIndices as Map<number, number> | undefined;
+          if (treeIndices !== undefined) {
+            for (const treeIndex of treeIndices.keys()) {
+              cadModel.treeIndexToSectorsMap.set(treeIndex, sector.metadata.id);
+            }
+            cadModel.treeIndexToSectorsMap.markCompleted(sector.metadata.id, RevealGeometryCollectionType.TriangleMesh);
+          }
+        }
+      }
     };
 
     this._subscription.add(

viewer/packages/cad-model/src/batching/MultiBufferBatchingManager.test.ts

@@ -6,6 +6,7 @@ import * as THREE from 'three';
 import { Mock } from 'moq.ts';
 import { Materials, StyledTreeIndexSets } from '@reveal/rendering';
 import { MultiBufferBatchingManager } from './MultiBufferBatchingManager';
+import { TreeIndexToSectorsMap } from '../utilities/TreeIndexToSectorsMap';
 import sum from 'lodash/sum';
 import { IndexSet } from '@reveal/utilities';
 
@@ -22,7 +23,14 @@ describe(MultiBufferBatchingManager.name, () => {
       inFront: new IndexSet(),
       visible: new IndexSet()
     };
-    manager = new MultiBufferBatchingManager(geometryGroup, materials, styledIndexSets, 1024, numberOfInstanceBuffers);
+    manager = new MultiBufferBatchingManager(
+      geometryGroup,
+      materials,
+      styledIndexSets,
+      new TreeIndexToSectorsMap(),
+      1024,
+      numberOfInstanceBuffers
+    );
   });
 
   test('batchGeometries() first time adds new geometry to group', () => {

viewer/packages/cad-model/src/batching/MultiBufferBatchingManager.ts

@@ -14,6 +14,7 @@ import {
 } from '@reveal/utilities';
 import { GeometryBufferUtils } from '../utilities/GeometryBufferUtils';
 import { getShaderMaterial } from '../utilities/getShaderMaterial';
+import { TreeIndexToSectorsMap } from '../utilities/TreeIndexToSectorsMap';
 import { DrawCallBatchingManager } from './DrawCallBatchingManager';
 
 /**
@@ -68,6 +69,7 @@ export class MultiBufferBatchingManager implements DrawCallBatchingManager {
     batchGroup: Group,
     materials: Materials,
     styleTreeIndexSets: StyledTreeIndexSets,
+    private readonly treeIndexToSectorsMap: TreeIndexToSectorsMap,
     private readonly initialBufferSize = 1024,
     private readonly numberOfInstanceBatches = 2
   ) {
@@ -89,7 +91,7 @@ export class MultiBufferBatchingManager implements DrawCallBatchingManager {
       if (parsedGeometry.instanceId === undefined) {
         return;
       }
-      this.processGeometries(parsedGeometry as Required<ParsedGeometry>, sectorBatch);
+      this.processGeometries(parsedGeometry as Required<ParsedGeometry>, sectorBatch, sectorId);
     });
   }
 
@@ -160,9 +162,10 @@ export class MultiBufferBatchingManager implements DrawCallBatchingManager {
     }
   }
 
-  private processGeometries(parsedGeometry: Required<ParsedGeometry>, sectorBatch: SectorBatch) {
+  private processGeometries(parsedGeometry: Required<ParsedGeometry>, sectorBatch: SectorBatch, sectorId: number) {
     const instanceBatch = this.getOrCreateInstanceBatch(parsedGeometry);
     this.batchInstanceAttributes(parsedGeometry.geometryBuffer, parsedGeometry.instanceId, instanceBatch, sectorBatch);
+    this.updateTreeIndexToSectorsMap(parsedGeometry, sectorId);
   }
 
   private batchInstanceAttributes(
@@ -220,6 +223,23 @@ export class MultiBufferBatchingManager implements DrawCallBatchingManager {
     }
   }
 
+  private updateTreeIndexToSectorsMap(parsedGeometry: ParsedGeometry, sectorId: number) {
+    const sourceInstanceAttributes = GeometryBufferUtils.getAttributes(
+      parsedGeometry.geometryBuffer,
+      InterleavedBufferAttribute
+    );
+    const treeIndexInterleavedAttribute = this.getTreeIndexAttribute(sourceInstanceAttributes);
+
+    // Update mapping from tree indices to sector ids
+    if (!this.treeIndexToSectorsMap.isCompleted(sectorId, parsedGeometry.type)) {
+      for (let i = 0; i < treeIndexInterleavedAttribute.count; i++) {
+        const treeIndex = treeIndexInterleavedAttribute.getX(i);
+        this.treeIndexToSectorsMap.set(treeIndex, sectorId);
+      }
+      this.treeIndexToSectorsMap.markCompleted(sectorId, parsedGeometry.type);
+    }
+  }
+
   private reallocateBufferGeometry({ buffer, mesh }: BatchBuffer) {
     const defragmentedBufferGeometry = this.createDefragmentedBufferGeometry(mesh.geometry, buffer);
     mesh.geometry.dispose();