@cognite/reveal 4.0.0-dev.20221117 → 4.0.0-dev.20221121

package/dist/packages/api/index.d.ts

@@ -5,7 +5,5 @@ export { Cognite3DViewer } from './src/public/migration/Cognite3DViewer';
 export { CogniteCadModel } from '../cad-model';
 export { ViewerState, ModelState } from './src/utilities/ViewStateHelper';
 export * from './src/public/types';
-import * as THREE from 'three';
-export { THREE };
 declare const REVEAL_VERSION: string;
 export { REVEAL_VERSION };

package/dist/packages/cad-model/src/types.d.ts

@@ -15,7 +15,7 @@ export declare type GeometryFilter = {
      */
     boundingBox?: THREE.Box3;
     /**
-     * When set, the geometry filter {@link boundingBox} will be considered to be in "Reveal/ThreeJS space".
+     * When set, the geometry filter `boundingBox` will be considered to be in "Reveal/ThreeJS space".
      * Rather than CDF space which is the default. When using Reveal space, the model transformation
      * which can be specified using {@link https://docs.cognite.com/api/v1/#operation/update3DRevisions |the CDF API},
      * or set in {@link https://fusion.cognite.com/ |Cognite Fusion}.

package/dist/packages/pointclouds/index.d.ts

@@ -9,8 +9,7 @@ export { createPointCloudManager } from './src/createPointCloudManager';
 export { PointCloudBudget } from './src/PointCloudBudget';
 export { PointCloudIntersection } from './src/PointCloudIntersection';
 export { CognitePointCloudModel } from './src/CognitePointCloudModel';
-export { PotreeNodeWrapper } from './src/PotreeNodeWrapper';
-export { PotreeGroupWrapper } from './src/PotreeGroupWrapper';
+export { PointCloudLoadingStateHandler } from './src/PointCloudLoadingStateHandler';
 export { PointCloudFactory } from './src/PointCloudFactory';
 export { IPointClassificationsProvider } from './src/classificationsProviders/IPointClassificationsProvider';
 export { LocalPointClassificationsProvider } from './src/classificationsProviders/LocalPointClassificationsProvider';

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

@@ -0,0 +1,26 @@
+/*!
+ * Copyright 2022 Cognite AS
+ */
+import { ClassificationInfo } from './potree-three-loader/loading/ClassificationInfo';
+import { WellKnownAsprsPointClassCodes } from './types';
+import { PointCloudMaterial, PointClassification } from '../../rendering';
+export declare class ClassificationHandler {
+    private readonly _classification;
+    private readonly _material;
+    private readonly _classNameToCodeMap;
+    constructor(material: PointCloudMaterial, classificationInfo: ClassificationInfo);
+    private createClassNameToCodeMap;
+    private createDefaultClassNameToCodeMap;
+    private getDefaultClassColor;
+    private getClassNameFromCode;
+    private createClassificationFromClassificationMap;
+    get classification(): PointClassification;
+    get classes(): Array<{
+        name: string;
+        code: number;
+    }>;
+    createPointClassKey(pointClass: number | WellKnownAsprsPointClassCodes): number;
+    setClassificationAndRecompute(pointClass: number | WellKnownAsprsPointClassCodes, visible: boolean): void;
+    hasClass(pointClass: number | WellKnownAsprsPointClassCodes): boolean;
+    isClassVisible(pointClass: number | WellKnownAsprsPointClassCodes): boolean;
+}

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

@@ -1,7 +1,7 @@
 /*!
  * Copyright 2021 Cognite AS
  */
-import { PotreeNodeWrapper } from './PotreeNodeWrapper';
+import { PointCloudNode } from './PointCloudNode';
 import { PointCloudMetadata } from './PointCloudMetadata';
 import { PointCloudStylableObjectProvider } from '../../data-providers';
 import { IPointClassificationsProvider } from './classificationsProviders/IPointClassificationsProvider';
@@ -14,5 +14,5 @@ export declare class PointCloudFactory {
     private readonly _pointCloudMaterialManager;
     constructor(modelLoader: ModelDataProvider, pointCloudObjectProvider: PointCloudStylableObjectProvider, classificationsProvider: IPointClassificationsProvider, pointCloudMaterialManager: PointCloudMaterialManager);
     dispose(): void;
-    createModel(modelMetadata: PointCloudMetadata): Promise<PotreeNodeWrapper>;
+    createModel(modelMetadata: PointCloudMetadata): Promise<PointCloudNode>;
 }

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

@@ -0,0 +1,33 @@
+/*!
+ * Copyright 2021 Cognite AS
+ */
+import { LoadingState } from '../../model-base';
+import { Observable } from 'rxjs';
+import { PointCloudNode } from './PointCloudNode';
+/**
+ * Wrapper around Potree.Group with type information and
+ * basic functionality.
+ */
+export declare class PointCloudLoadingStateHandler {
+    private _lastDrawPointBuffersHash;
+    private readonly _forceLoadingSubject;
+    private readonly _loadingObservable;
+    private _numNodesLoadingAfterLastRedraw;
+    private _numModels;
+    /**
+     * @param pollLoadingStatusInterval Controls how often the wrapper checks for loading status. Used for testing.
+     */
+    constructor(pollLoadingStatusInterval?: number);
+    needsRedraw(pointCloudNodes: PointCloudNode[]): boolean;
+    getLoadingStateObserver(): Observable<LoadingState>;
+    onModelAdded(): void;
+    onModelRemoved(): void;
+    resetFrameStats(): void;
+    private createLoadingStateObservable;
+    updatePointBuffersHash(pointCloudNodes: PointCloudNode[]): void;
+    /**
+     * Generates a hash for the current loaded points to allow determining if we have
+     * loaded data since last redraw.
+     */
+    private getPointBuffersHash;
+}

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

@@ -6,22 +6,24 @@ import { LoadingState } from '../../model-base';
 import { PointCloudFactory } from './PointCloudFactory';
 import { PointCloudNode } from './PointCloudNode';
 import { PointCloudMetadataRepository } from './PointCloudMetadataRepository';
-import { PotreeGroupWrapper } from './PotreeGroupWrapper';
 import { Potree } from './potree-three-loader';
 import { Observable } from 'rxjs';
 import { ModelIdentifier } from '../../data-providers';
 import { PointCloudMaterialManager } from '../../rendering';
+import { Mesh } from 'three';
 export declare class PointCloudManager {
     private readonly _pointCloudMetadataRepository;
     private readonly _pointCloudFactory;
     private readonly _materialManager;
-    private readonly _pointCloudGroupWrapper;
+    private readonly _loadingStateHandler;
+    private readonly _potreeInstance;
+    private readonly _pointCloudNodes;
     private readonly _cameraSubject;
     private readonly _modelSubject;
     private readonly _budgetSubject;
     private readonly _renderer;
+    private _needsRedraw;
     constructor(metadataRepository: PointCloudMetadataRepository, materialManager: PointCloudMaterialManager, modelFactory: PointCloudFactory, potreeInstance: Potree, scene: THREE.Scene, renderer: THREE.WebGLRenderer);
-    get pointCloudGroupWrapper(): PotreeGroupWrapper;
     requestRedraw(): void;
     resetRedraw(): void;
     get pointBudget(): number;
@@ -35,4 +37,5 @@ export declare class PointCloudManager {
     removeModel(node: PointCloudNode): void;
     dispose(): void;
     private loadedModelsObservable;
+    createDrawResetTrigger(): Mesh;
 }

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

@@ -3,32 +3,35 @@
  */
 import * as THREE from 'three';
 import { CameraConfiguration } from '../../utilities';
-import { PotreeGroupWrapper } from './PotreeGroupWrapper';
-import { PotreeNodeWrapper } from './PotreeNodeWrapper';
+import { ClassificationInfo, PointCloudOctree, PickPoint } from './potree-three-loader';
 import { WellKnownAsprsPointClassCodes } from './types';
-import { PickPoint } from './potree-three-loader';
 import { PointColorType, PointShape, PointSizeType } from '../../rendering';
+import { PointCloudObjectMetadata, PointCloudObject } from '../../data-providers';
 import { CompletePointCloudAppearance, StyledPointCloudObjectCollection } from '../../pointcloud-styling';
 export declare class PointCloudNode extends THREE.Group {
-    private readonly _potreeGroup;
-    private readonly _potreeNode;
     private readonly _cameraConfiguration?;
-    constructor(potreeGroup: PotreeGroupWrapper, potreeNode: PotreeNodeWrapper, cameraConfiguration?: CameraConfiguration);
-    get potreeGroup(): PotreeGroupWrapper;
-    get potreeNode(): PotreeNodeWrapper;
+    private readonly _octree;
+    private readonly _annotations;
+    private readonly _classificationHandler;
+    private _needsRedraw;
+    private static readonly pickingWindowSize;
+    private readonly _modelIdentifier;
+    constructor(modelIdentifier: symbol, octree: PointCloudOctree, annotations: PointCloudObject[], classificationInfo: ClassificationInfo, cameraConfiguration?: CameraConfiguration);
+    get modelIdentifier(): symbol;
+    get octree(): PointCloudOctree;
+    get needsRedraw(): boolean;
+    resetRedraw(): void;
     get hasCameraConfiguration(): boolean;
     get cameraConfiguration(): CameraConfiguration | undefined;
-    get needsRedraw(): boolean;
-    requestRedraw(): void;
     get pointSize(): number;
     set pointSize(size: number);
     get pointSizeType(): PointSizeType;
     set pointSizeType(pointSizeType: PointSizeType);
-    get visiblePointCount(): number;
     get pointColorType(): PointColorType;
     set pointColorType(type: PointColorType);
     get pointShape(): PointShape;
     set pointShape(value: PointShape);
+    get visiblePointCount(): number;
     /**
      * GPU-based picking allowing to get point data based on ray directing from the camera.
      * @param renderer Renderer object used for Reveal rendereing.
@@ -71,6 +74,8 @@ export declare class PointCloudNode extends THREE.Group {
     getBoundingBox(outBbox?: THREE.Box3): THREE.Box3;
     setModelTransformation(matrix: THREE.Matrix4): void;
     getModelTransformation(out?: THREE.Matrix4): THREE.Matrix4;
+    get stylableObjectAnnotationMetadata(): Iterable<PointCloudObjectMetadata>;
+    get stylableObjects(): PointCloudObject[];
     get defaultAppearance(): CompletePointCloudAppearance;
     set defaultAppearance(appearance: CompletePointCloudAppearance);
     assignStyledPointCloudObjectCollection(styledCollection: StyledPointCloudObjectCollection): void;

package/dist/packages/pointclouds/src/potree-three-loader/index.d.ts

@@ -6,4 +6,5 @@ export * from './tree/PointCloudTree';
 export * from './Potree';
 export * from './types/types';
 export * from './version';
+export * from './loading/ClassificationInfo';
 export { globalNumNodesLoading as numPointCloudNodesLoading } from './loading/globalLoadingCounter';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.0.0-dev.20221117",
+  "version": "4.0.0-dev.20221121",
   "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": {
@@ -80,7 +80,6 @@
     "proj4": "2.8.0",
     "rxjs": "7.5.7",
     "skmeans": "0.11.3",
-    "three": "0.146.0",
     "three-stdlib": "2.17.3"
   },
   "devDependencies": {
@@ -120,9 +119,9 @@
     "glob": "8.0.3",
     "glslify-loader": "2.0.0",
     "html-webpack-plugin": "5.5.0",
-    "jest": "29.2.2",
+    "jest": "29.3.1",
     "jest-canvas-mock": "2.4.0",
-    "jest-environment-jsdom": "29.2.2",
+    "jest-environment-jsdom": "29.3.1",
     "jest-extended": "3.1.0",
     "jest-image-snapshot": "5.2.0",
     "jest-puppeteer": "6.1.1",
@@ -138,12 +137,13 @@
     "resize-observer-polyfill": "1.5.1",
     "shx": "0.3.4",
     "stats.js": "0.17.0",
+    "three": "0.146.0",
     "ts-jest": "29.0.3",
     "ts-loader": "9.4.1",
     "tsc-alias": "1.7.1",
     "typescript": "4.8.4",
     "wasm-pack": "0.10.3",
-    "webpack": "5.74.0",
+    "webpack": "5.75.0",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.11.1",
     "webpack-node-externals": "3.0.0",
@@ -152,7 +152,8 @@
   },
   "peerDependencies": {
     "@cognite/sdk": "7.11.0",
-    "@cognite/sdk-core": "^4.1.0"
+    "@cognite/sdk-core": "^4.1.0",
+    "three": "0.146.0"
   },
   "glslify": {
     "transform": [

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

@@ -1,46 +0,0 @@
-/*!
- * Copyright 2021 Cognite AS
- */
-import { LoadingState } from '../../model-base';
-import { Observable } from 'rxjs';
-import * as THREE from 'three';
-import { PotreeNodeWrapper } from './PotreeNodeWrapper';
-import { Potree, PointCloudOctree } from './potree-three-loader';
-/**
- * Wrapper around Potree.Group with type information and
- * basic functionality.
- */
-export declare class PotreeGroupWrapper extends THREE.Object3D {
-    private _needsRedraw;
-    private _lastDrawPointBuffersHash;
-    private readonly _forceLoadingSubject;
-    private readonly _loadingObservable;
-    private readonly _pointClouds;
-    get needsRedraw(): boolean;
-    private readonly nodes;
-    private readonly potreeGroup;
-    private readonly _potreeInstance;
-    private numNodesLoadingAfterLastRedraw;
-    private numChildrenAfterLastRedraw;
-    /**
-     * @param potreeInstance Main instance of the Potree library in this Reveal instance
-     * @param pollLoadingStatusInterval Controls how often the wrapper checks for loading status. Used for testing.
-     */
-    constructor(potreeInstance: Potree, pollLoadingStatusInterval?: number);
-    get pointBudget(): number;
-    set pointBudget(points: number);
-    get pointClouds(): PointCloudOctree[];
-    get potreeInstance(): Potree;
-    getLoadingStateObserver(): Observable<LoadingState>;
-    addPointCloud(node: PotreeNodeWrapper): void;
-    removePointCloud(node: PotreeNodeWrapper): void;
-    traversePointClouds(callback: (pointCloud: PointCloudOctree) => void): void;
-    requestRedraw(): void;
-    resetRedraw(): void;
-    private createLoadingStateObservable;
-    /**
-     * Generates a hash for the current loaded points to allow determining if we have
-     * loaded data since last redraw.
-     */
-    private get pointBuffersHash();
-}

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

@@ -1,52 +0,0 @@
-/*!
- * Copyright 2021 Cognite AS
- */
-import * as THREE from 'three';
-import { StyledPointCloudObjectCollection, CompletePointCloudAppearance } from '../../pointcloud-styling';
-import { PointCloudOctree, PickPoint } from './potree-three-loader';
-import { PointColorType, PointShape, PointClassification } from '../../rendering';
-import { WellKnownAsprsPointClassCodes } from './types';
-import { PointCloudObjectMetadata, PointCloudObject } from '../../data-providers';
-import { ClassificationInfo } from './potree-three-loader/loading/ClassificationInfo';
-/**
- * Wrapper around `Potree.PointCloudOctree` with some convenience functions.
- */
-export declare class PotreeNodeWrapper {
-    readonly octree: PointCloudOctree;
-    private _needsRedraw;
-    private readonly _classification;
-    private readonly _modelIdentifier;
-    private static readonly pickingWindowSize;
-    private readonly _classNameToCodeMap;
-    private readonly _annotations;
-    get needsRedraw(): boolean;
-    constructor(modelIdentifier: symbol, octree: PointCloudOctree, annotations: PointCloudObject[], classificationInfo: ClassificationInfo);
-    private createClassNameToCodeMap;
-    private getDefaultClassColor;
-    private createDefaultClassNameToCodeMap;
-    private updateMaterialClassMap;
-    get modelIdentifier(): symbol;
-    get pointSize(): number;
-    set pointSize(size: number);
-    get visiblePointCount(): number;
-    get boundingBox(): THREE.Box3;
-    get pointColorType(): PointColorType;
-    set pointColorType(type: PointColorType);
-    get pointShape(): PointShape;
-    set pointShape(shape: PointShape);
-    get classification(): PointClassification;
-    private getClassNameFromCode;
-    get classes(): Array<{
-        name: string;
-        code: number;
-    }>;
-    get stylableObjectAnnotationMetadata(): Iterable<PointCloudObjectMetadata>;
-    get stylableObjects(): PointCloudObject[];
-    get defaultAppearance(): CompletePointCloudAppearance;
-    set defaultAppearance(appearance: CompletePointCloudAppearance);
-    pick(renderer: THREE.WebGLRenderer, camera: THREE.Camera, ray: THREE.Ray): PickPoint | null;
-    assignObjectStyle(styledCollection: StyledPointCloudObjectCollection): void;
-    createPointClassKey(pointClass: number | WellKnownAsprsPointClassCodes): number;
-    setClassificationAndRecompute(pointClass: number | WellKnownAsprsPointClassCodes, visible: boolean): void;
-    resetRedraw(): void;
-}