Merge branch 'master' into hflatval/load-error-handling

documentation/package.json

@@ -24,7 +24,7 @@
     "ws:replace": "replace"
   },
   "dependencies": {
-    "@azure/msal-browser": "2.38.1",
+    "@azure/msal-browser": "2.38.2",
     "@codemirror/lang-javascript": "6.1.9",
     "@docusaurus/core": "2.4.1",
     "@docusaurus/preset-classic": "2.4.1",

examples/package.json

@@ -40,7 +40,7 @@
     "@types/react-dom": "18.2.4",
     "@types/stats.js": "^0.17.0",
     "@types/styled-components": "^5.1.26",
-    "@types/three": "0.155.0",
+    "@types/three": "0.155.1",
     "css-loader": "^6.7.1",
     "dotenv-webpack": "^7.1.0",
     "html-webpack-plugin": "^5.5.0",

react-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal-react-components",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -18,7 +18,7 @@
   },
   "peerDependencies": {
     "@cognite/cogs.js": ">=9",
-    "@cognite/reveal": "4.4.0",
+    "@cognite/reveal": "4.4.1",
     "react": ">=18",
     "react-dom": ">=18",
     "styled-components": ">=5"
@@ -28,7 +28,7 @@
     "@babel/preset-react": "7.22.5",
     "@babel/preset-typescript": "7.22.5",
     "@cognite/cogs.js": "^9.17.0",
-    "@cognite/reveal": "4.4.0",
+    "@cognite/reveal": "4.4.1",
     "@cognite/sdk": "^8.2.0",
     "@storybook/addon-essentials": "7.3.2",
     "@storybook/addon-interactions": "7.3.2",
@@ -42,7 +42,7 @@
     "@types/react": "18.2.7",
     "@types/react-dom": "^18.2.7",
     "@types/styled-components": "5.1.26",
-    "@types/three": "0.155.0",
+    "@types/three": "0.155.1",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^9.0.0",

react-components/src/hooks/useCalculateModelsStyling.tsx

@@ -42,7 +42,6 @@ export const useCalculateCadStyling = (
     defaultResourceStyling?.cad?.mapped
   );
   const modelInstanceStyleGroups = useCalculateInstanceStyling(models, instanceGroups);
-  console.log('Model instance style groups = ', modelInstanceStyleGroups);
   const joinedStyleGroups = useJoinStylingGroups(
     models,
     modelsMappedStyleGroups,

viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "WebGL based 3D viewer for CAD and point clouds processed in Cognite Data Fusion.",
   "homepage": "https://github.com/cognitedata/reveal/tree/master/viewer",
   "repository": {
@@ -78,27 +78,27 @@
     "sparse-octree": "7.1.8"
   },
   "devDependencies": {
-    "@azure/msal-browser": "2.38.1",
+    "@azure/msal-browser": "2.38.2",
     "@cognite/sdk": "8.2.0",
     "@microsoft/api-extractor": "^7.33.6",
     "@types/dat.gui": "0.7.10",
     "@types/gl": "^6.0.2",
     "@types/glob": "8.1.0",
-    "@types/jest": "29.5.3",
+    "@types/jest": "29.5.4",
     "@types/jest-environment-puppeteer": "5.0.3",
     "@types/jest-image-snapshot": "6.2.0",
-    "@types/jsdom": "21.1.1",
+    "@types/jsdom": "21.1.2",
     "@types/lodash": "4.14.197",
     "@types/mixpanel-browser": "2.47.1",
-    "@types/node": "18.17.6",
+    "@types/node": "18.17.9",
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.4",
     "@types/stats": "0.16.30",
-    "@types/three": "0.155.0",
+    "@types/three": "0.155.1",
     "@types/tween.js": "18.5.1",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
-    "concurrently": "8.2.0",
+    "concurrently": "8.2.1",
     "cross-env": "7.0.3",
     "dat.gui": "0.7.9",
     "eslint": "8.47.0",
@@ -113,9 +113,9 @@
     "glob": "10.3.3",
     "glslify-loader": "2.0.0",
     "html-webpack-plugin": "5.5.3",
-    "jest": "29.6.3",
+    "jest": "29.6.4",
     "jest-canvas-mock": "2.5.2",
-    "jest-environment-jsdom": "29.6.3",
+    "jest-environment-jsdom": "29.6.4",
     "jest-extended": "4.0.1",
     "jest-image-snapshot": "6.2.0",
     "jest-puppeteer": "9.0.0",

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

@@ -233,7 +233,7 @@ function createDetermineSectorsInput([settings, _, camera, clipping, models]: [
   ClippingInput,
   CadNode[]
 ]): DetermineSectorsPayload {
-  const prioritizedAreas = models.flatMap(model => model.prioritizedAreas);
+  const prioritizedAreas = models.filter(model => !model.isDisposed).flatMap(model => model.prioritizedAreas);
   return {
     ...camera,
     ...settings,

viewer/packages/cad-geometry-loaders/src/sector/SectorLoader.ts

@@ -62,7 +62,7 @@ export class SectorLoader {
     }
 
     const cadModels = input.models;
-    const visibleCadModels = cadModels.filter(x => x.visible);
+    const visibleCadModels = cadModels.filter(x => x.visible && !x.isDisposed);
 
     const sectorCullerInput: DetermineSectorsInput = {
       ...input,

viewer/packages/cad-model/src/wrappers/CadNode.ts

@@ -37,6 +37,8 @@ export class CadNode extends Object3D {
   private readonly _batchedGeometryMeshGroup: Group;
   private readonly _styledTreeIndexSets: StyledTreeIndexSets;
 
+  private _isDisposed: boolean = false;
+
   private _needsRedraw: boolean = false;
 
   public readonly treeIndexToSectorsMap = new TreeIndexToSectorsMap();
@@ -153,6 +155,10 @@ export class CadNode extends Object3D {
     return this._materialManager.getRenderMode();
   }
 
+  get isDisposed(): boolean {
+    return this._isDisposed;
+  }
+
   public loadSector(sector: WantedSector, abortSignal?: AbortSignal): Promise<ConsumedSector> {
     return this._sectorRepository.loadSector(sector, abortSignal);
   }
@@ -203,13 +209,15 @@ export class CadNode extends Object3D {
   }
 
   public dispose(): void {
+    this.nodeAppearanceProvider.dispose();
     this.nodeAppearanceProvider.off('changed', this._setModelRenderLayers);
     this._sectorRepository.clearCache();
     this._materialManager.removeModelMaterials(this._cadModelMetadata.modelIdentifier);
     this._geometryBatchingManager?.dispose();
     this._rootSector?.dereferenceAllNodes();
     this._rootSector?.clear();
     this.clear();
+    this._isDisposed = true;
 
     delete this._geometryBatchingManager;
     // @ts-ignore

viewer/packages/cad-styling/src/NodeAppearanceProvider.ts

@@ -156,6 +156,13 @@ export class NodeAppearanceProvider {
     return this._styledCollections.some(x => x.nodeCollection.isLoading);
   }
 
+  dispose(): void {
+    this.scheduleNotifyChanged.cancel();
+    this._events.changed.unsubscribeAll();
+    this._events.loadingStateChanged.unsubscribeAll();
+    this._events.prioritizedAreasChanged.unsubscribeAll();
+  }
+
   private notifyChanged() {
     this._cachedPrioritizedAreas = undefined;
     this._events.changed.fire();

viewer/packages/cad-styling/visual-tests/Highlighted.VisualTest.ts

@@ -22,7 +22,7 @@ export default class HighlightedVisualTest extends StreamingVisualTestFixture {
       .getModelNodeAppearanceProvider(modelIdentifier)
       .assignStyledNodeCollection(nodes, DefaultNodeAppearance.Highlighted);
 
-    // Styles are not applied immidiatly, so wait a little for styling to take effect
+    // Styles are not applied immediately, so wait a little for styling to take effect
     await new Promise(resolve => setTimeout(resolve, 100));
 
     model.geometryNode.position.set(25, 0, -15);

viewer/packages/rendering/src/CadMaterialManager.ts

@@ -267,6 +267,7 @@ export class CadMaterialManager {
     for (const [_, wrapper] of this.materialsMap) {
       wrapper.nodeAppearanceTextureBuilder.dispose();
       wrapper.nodeTransformTextureBuilder.dispose();
+      wrapper.nodeAppearanceProvider.dispose();
     }
   }