@cognite/reveal 4.3.4 → 4.4.0-dev.20230803

package/dist/packages/cad-geometry-loaders/src/CadManager.d.ts

@@ -44,4 +44,5 @@ export declare class CadManager {
     getLoadingStateObserver(): Observable<LoadingState>;
     private markNeedsRedraw;
     private handleMaterialsChanged;
+    private updateTreeIndexToSectorsMap;
 }

package/dist/packages/cad-model/src/batching/MultiBufferBatchingManager.d.ts

@@ -1,6 +1,7 @@
 import { Group } from 'three';
 import { Materials, StyledTreeIndexSets } from '../../../rendering';
 import { ParsedGeometry } from '../../../sector-parser';
+import { TreeIndexToSectorsMap } from '../utilities/TreeIndexToSectorsMap';
 import { DrawCallBatchingManager } from './DrawCallBatchingManager';
 /**
  * The objective of this class is to batch together instances
@@ -10,6 +11,7 @@ import { DrawCallBatchingManager } from './DrawCallBatchingManager';
  * and continually filling / ejecting data from those buffers when new sectors are added / removed.
  */
 export declare class MultiBufferBatchingManager implements DrawCallBatchingManager {
+    private readonly treeIndexToSectorsMap;
     private readonly initialBufferSize;
     private readonly numberOfInstanceBatches;
     private readonly _sectorBatches;
@@ -17,7 +19,7 @@ export declare class MultiBufferBatchingManager implements DrawCallBatchingManag
     private readonly _materials;
     private readonly _batchGroup;
     private readonly _styledTreeIndexSets;
-    constructor(batchGroup: Group, materials: Materials, styleTreeIndexSets: StyledTreeIndexSets, initialBufferSize?: number, numberOfInstanceBatches?: number);
+    constructor(batchGroup: Group, materials: Materials, styleTreeIndexSets: StyledTreeIndexSets, treeIndexToSectorsMap: TreeIndexToSectorsMap, initialBufferSize?: number, numberOfInstanceBatches?: number);
     batchGeometries(geometryBatchingQueue: ParsedGeometry[], sectorId: number): void;
     removeSectorBatches(sectorId: number): void;
     dispose(): void;
@@ -25,6 +27,7 @@ export declare class MultiBufferBatchingManager implements DrawCallBatchingManag
     private processGeometries;
     private batchInstanceAttributes;
     private addTreeIndicesToMeshUserData;
+    private updateTreeIndexToSectorsMap;
     private reallocateBufferGeometry;
     private updateInstanceAttributes;
     private extendUpdateRange;

package/dist/packages/cad-model/src/utilities/CustomSectorBounds.d.ts

@@ -0,0 +1,68 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import * as THREE from 'three';
+import { CadNode } from '../wrappers/CadNode';
+/**
+ * An instance of this class is used to dynamically alter the sector bounding boxes to adapt to custom node transforms.
+ * The bounding box of a sector is kept equal to its original value, unless:
+ * - A node with geometry in the sector is transformed such that the original bounds would not fully contain the node geometry
+ * - Descendants of the sector have grown, and are no longer contained within the original bounds.
+ * The set of sectors a tree index has geometry in does not need to be known upfront. This set of sectors, and the node transform,
+ * are set independently of each other.
+ */
+export declare class CustomSectorBounds {
+    private readonly cadNode;
+    private readonly _treeIndexToTransformedNodeMap;
+    private readonly _sectorIdToTransformedNodesMap;
+    private readonly _originalSectorBounds;
+    private readonly _sectorsWithInvalidBounds;
+    private readonly _allSectorsSortedByDepth;
+    constructor(cadNode: CadNode);
+    /**
+     * Returns whether or not the given node is registered
+     * @param treeIndex Tree index of the node to check
+     * @returns True if node is registered, false otherwise
+     */
+    isRegistered(treeIndex: number): boolean;
+    /**
+     * Registers a node as transformed, meaning it'll be taken into account when sector bounds are recomputed
+     * @param treeIndex Tree index of the transformed node
+     * @param originalBoundingBox The original bounding box of this node
+     */
+    registerTransformedNode(treeIndex: number, originalBoundingBox?: THREE.Box3): void;
+    /**
+     * Updates the transform for a registered node. Sector bounds will not be changed until recomputeSectorBounds() is called
+     * @param treeIndex Tree index of the transformed node
+     * @param newTransform The transform
+     */
+    updateNodeTransform(treeIndex: number, newTransform: THREE.Matrix4): void;
+    /**
+     * Updates the set of sectors a node is known to have geometry in. Addition of new sectors is the only possible operation.
+     * Sector bounds will not be changed until recomputeSectorBounds() is called
+     * @param treeIndex Tree index of the transformed node
+     * @param newSectors The new sector(s) that this node is discovered to have geometry in
+     */
+    updateNodeSectors(treeIndex: number, newSectors: number[]): void;
+    /**
+     * Unregisters a node, meaning it will no longer be taken into account when sector bounds are recomputed
+     * @param treeIndex Tree index of the node to be unregistered
+     */
+    unregisterTransformedNode(treeIndex: number): void;
+    /**
+     * Recomputes the sector bounds making all registered nodes fully contained in their respective sectors. This
+     * is the only time the sector bounds are actually altered.
+     */
+    recomputeSectorBounds(): void;
+    /**
+     * Sets the bounding box of a given sector by expanding the original bounds to include the given custom bounding boxes
+     * @param sectorId The sector id
+     * @param customBoundingBoxes An array of bounding boxes this sector should contain
+     * @returns True if the new sector bounds are different from the original values. False otherwise
+     */
+    private updateSector;
+    private getOriginalSectorBounds;
+    private setCustomSectorBounds;
+    private clearCustomSectorBounds;
+    private sectorMetadata;
+}

package/dist/packages/cad-model/src/utilities/TreeIndexToSectorsMap.d.ts

@@ -0,0 +1,40 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import { RevealGeometryCollectionType } from '../../../sector-parser';
+/**
+ * Map between a tree index and the set of sectors it has geometry in. Also contains helper functions to keep track of whether or not
+ * a given sector has had all its tree indices added to the map. This means iterating over all tree indices in a sector will only be
+ * done on first load.
+ */
+export declare class TreeIndexToSectorsMap {
+    onChange?: (treeIndex: number, newSectorId: number) => void;
+    private readonly _treeIndexToSectorIds;
+    private readonly _parsedSectors;
+    /**
+     * Store the fact that a tree index is found to have geometry in a certain sector
+     * @param treeIndex Tree index
+     * @param sectorId The sector id where the tree index was found
+     */
+    set(treeIndex: number, sectorId: number): void;
+    /**
+     * Get the set of sectors a tree index is known to have geometry in
+     * @param treeIndex Tree index
+     * @returns The set of sectors
+     */
+    getSectorIdsForTreeIndex(treeIndex: number): Set<number>;
+    /**
+     * Mark a sector as completed for a given geometry type. This will make subsequent calls to isCompleted
+     * for this geometry type return true
+     * @param sectorId The sector id
+     * @param type The geometry type
+     */
+    markCompleted(sectorId: number, type: RevealGeometryCollectionType): void;
+    /**
+     * Check whether or not a sector is completely processed, for a given geometry type
+     * @param sectorId The sector id
+     * @param type The geometry type
+     * @returns True if completed, false otherwise
+     */
+    isCompleted(sectorId: number, type: RevealGeometryCollectionType): boolean;
+}

package/dist/packages/cad-model/src/wrappers/CadNode.d.ts

@@ -7,6 +7,7 @@ import { SectorRepository } from '../../../sector-loader';
 import { ParsedGeometry } from '../../../sector-parser';
 import { CadMaterialManager, NodeTransformProvider, RenderMode } from '../../../rendering';
 import { Object3D, Plane, Matrix4 } from 'three';
+import { TreeIndexToSectorsMap } from '../utilities/TreeIndexToSectorsMap';
 export declare class CadNode extends Object3D {
     private readonly _cadModelMetadata;
     private readonly _materialManager;
@@ -20,6 +21,7 @@ export declare class CadNode extends Object3D {
     private readonly _batchedGeometryMeshGroup;
     private readonly _styledTreeIndexSets;
     private _needsRedraw;
+    readonly treeIndexToSectorsMap: TreeIndexToSectorsMap;
     readonly type = "CadNode";
     constructor(model: CadModelMetadata, materialManager: CadMaterialManager, sectorRepository: SectorRepository);
     get needsRedraw(): boolean;

package/dist/packages/cad-model/src/wrappers/CogniteCadModel.d.ts

@@ -49,6 +49,7 @@ export declare class CogniteCadModel implements CdfModelNodeCollectionDataProvid
     private readonly nodesApiClient;
     private readonly nodeIdAndTreeIndexMaps;
     private readonly _styledNodeCollections;
+    private readonly customSectorBounds;
     /**
      * Sets the default appearance for nodes that are not styled using
      * {@link CogniteCadModel.assignStyledNodeCollection}. Updating the default style can be an
@@ -117,8 +118,9 @@ export declare class CogniteCadModel implements CdfModelNodeCollectionDataProvid
      * node isn't supported and might lead to undefined results.
      * @param treeIndices       Tree indices of nodes to apply the transformation to.
      * @param transformMatrix   Transformation to apply.
+     * @param boundingBox       Optional bounding box for the nodes before any transformation is applied. If given, it is assumed that all the nodes' geometry fit inside.
      */
-    setNodeTransform(treeIndices: NumericRange, transformMatrix: THREE.Matrix4): void;
+    setNodeTransform(treeIndices: NumericRange, transformMatrix: THREE.Matrix4, boundingBox?: THREE.Box3): void;
     /**
      * Set override transform of the node by tree index.
      * @param treeIndex

package/dist/packages/camera-manager/src/CameraManagerHelper.d.ts

@@ -16,9 +16,10 @@ export declare class CameraManagerHelper {
      * @param camera Used camera instance.
      * @param rotation New camera rotation in quaternion form.
      * @param currentTarget Current camera target.
+     * @param position New camera position.
      * @returns
      */
-    static calculateNewTargetFromRotation(camera: THREE.PerspectiveCamera, rotation: THREE.Quaternion, currentTarget: THREE.Vector3): THREE.Vector3;
+    static calculateNewTargetFromRotation(camera: THREE.PerspectiveCamera, rotation: THREE.Quaternion, currentTarget: THREE.Vector3, position: THREE.Vector3): THREE.Vector3;
     /**
      * Calculates camera rotation from target
      * @param camera Used Camera instance

package/dist/packages/pointclouds/src/PointCloudManager.d.ts

@@ -18,6 +18,7 @@ export declare class PointCloudManager {
     private readonly _loadingStateHandler;
     private readonly _potreeInstance;
     private readonly _pointCloudNodes;
+    private _globalClippingPlanes;
     private readonly _cameraSubject;
     private readonly _modelSubject;
     private readonly _budgetSubject;

package/dist/packages/rendering/src/PointCloudMaterialManager.d.ts

@@ -4,12 +4,13 @@
 import { PointCloudObjectIdMaps } from './pointcloud-rendering/PointCloudObjectIdMaps';
 import { PointCloudMaterial } from './pointcloud-rendering';
 import { PointCloudMaterialParameters } from './render-passes/types';
+import { Plane } from 'three';
 export declare class PointCloudMaterialManager {
     private readonly _modelsMaterialsMap;
     addModelMaterial(modelIdentifier: symbol, objectIdMaps: PointCloudObjectIdMaps): void;
     removeModelMaterial(modelIdentifier: symbol): void;
     getModelMaterial(modelIdentifier: symbol): PointCloudMaterial;
-    initializeClippingPlanesForPointCloud(modelIdentifier: symbol): void;
+    initializeClippingPlanesForPointCloud(modelIdentifier: symbol, clippingPlanes: Plane[]): void;
     setModelsMaterialParameters(materialParameters: PointCloudMaterialParameters | undefined): void;
     setMaterialParameters(material: PointCloudMaterial, parameters: PointCloudMaterialParameters): void;
     dispose(): void;

package/dist/packages/utilities/src/three/VariableWidthLine.d.ts

@@ -1,14 +1,13 @@
 /*!
  * Copyright 2023 Cognite AS
  */
-import { Color, Vector3 } from 'three';
-import { Line2 } from 'three/examples/jsm/lines/Line2';
+import { Color, Object3D, Vector3 } from 'three';
 export declare class VariableWidthLine {
     private readonly _geometry;
     private readonly _lineMaterial;
     private readonly _mesh;
     constructor(lineWidth: number, lineColor: Color, points: Vector3[]);
-    get mesh(): Line2;
+    get mesh(): Object3D;
     setLineColor(color: Color): void;
     setVisibility(visibility: boolean): void;
     dispose(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.3.4",
+  "version": "4.4.0-dev.20230803",
   "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,75 +78,75 @@
     "sparse-octree": "7.1.8"
   },
   "devDependencies": {
-    "@azure/msal-browser": "2.37.1",
-    "@cognite/sdk": "8.1.1",
+    "@azure/msal-browser": "2.38.0",
+    "@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.2",
+    "@types/jest": "29.5.3",
     "@types/jest-environment-puppeteer": "5.0.3",
     "@types/jest-image-snapshot": "6.1.0",
     "@types/jsdom": "21.1.1",
-    "@types/lodash": "4.14.195",
-    "@types/mixpanel-browser": "2.38.2",
-    "@types/node": "18.16.18",
+    "@types/lodash": "4.14.196",
+    "@types/mixpanel-browser": "2.47.1",
+    "@types/node": "18.17.1",
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.4",
     "@types/stats": "0.16.30",
-    "@types/three": "0.152.1",
+    "@types/three": "0.154.0",
     "@types/tween.js": "18.5.1",
-    "@typescript-eslint/eslint-plugin": "5.59.11",
-    "@typescript-eslint/parser": "5.59.11",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
     "concurrently": "8.2.0",
     "cross-env": "7.0.3",
     "dat.gui": "0.7.9",
-    "eslint": "8.43.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint": "8.46.0",
+    "eslint-config-prettier": "8.9.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-jsdoc": "46.2.6",
+    "eslint-plugin-jsdoc": "46.4.5",
     "eslint-plugin-lodash": "7.4.0",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-unused-imports": "2.0.0",
+    "eslint-plugin-prettier": "5.0.0",
+    "eslint-plugin-unused-imports": "3.0.0",
     "file-loader": "6.2.0",
     "gl": "6.0.2",
-    "glob": "10.2.7",
+    "glob": "10.3.3",
     "glslify-loader": "2.0.0",
     "html-webpack-plugin": "5.5.3",
-    "jest": "29.5.0",
-    "jest-canvas-mock": "2.5.1",
-    "jest-environment-jsdom": "29.5.0",
+    "jest": "29.6.2",
+    "jest-canvas-mock": "2.5.2",
+    "jest-environment-jsdom": "29.6.2",
     "jest-extended": "4.0.0",
-    "jest-image-snapshot": "6.1.0",
+    "jest-image-snapshot": "6.2.0",
     "jest-puppeteer": "9.0.0",
     "jsdom": "22.1.0",
     "moq.ts": "10.0.6",
-    "nock": "13.3.1",
-    "prettier": "2.8.8",
+    "nock": "13.3.2",
+    "prettier": "3.0.0",
     "process": "0.11.10",
-    "puppeteer": "20.7.2",
+    "puppeteer": "20.9.0",
     "random-seed": "0.3.0",
     "raw-loader": "4.0.2",
     "remove-files-webpack-plugin": "1.5.0",
     "resize-observer-polyfill": "1.5.1",
     "shx": "0.3.4",
     "stats.js": "0.17.0",
-    "three": "0.152.2",
-    "ts-jest": "29.1.0",
+    "three": "0.154.0",
+    "ts-jest": "29.1.1",
     "ts-loader": "9.4.3",
-    "tsc-alias": "1.8.6",
-    "typescript": "5.1.3",
-    "wasm-pack": "0.12.0",
-    "webpack": "5.87.0",
+    "tsc-alias": "1.8.7",
+    "typescript": "5.1.6",
+    "wasm-pack": "0.12.1",
+    "webpack": "5.88.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack-node-externals": "3.0.0",
-    "whatwg-fetch": "3.6.2",
+    "whatwg-fetch": "3.6.17",
     "workerize-loader": "2.0.2"
   },
   "peerDependencies": {
     "@cognite/sdk": "^7.16.0 || ^8.0.0",
-    "three": "0.152.2"
+    "three": "0.154.0"
   },
   "glslify": {
     "transform": [
@@ -156,5 +156,5 @@
   "files": [
     "./dist/*"
   ],
-  "packageManager": "yarn@3.6.0"
+  "packageManager": "yarn@3.6.1"
 }