@cognite/reveal 2.1.2 → 2.3.0

package/core/cad.d.ts

@@ -1,5 +1,4 @@
 /*!
  * Copyright 2021 Cognite AS
  */
-export { LevelOfDetail } from '../packages/cad-parsers';
-export { SectorNode } from '../packages/cad-geometry-loaders';
+export { LevelOfDetail, SectorNode } from '../packages/cad-parsers';

package/core/src/datamodels/cad/CadManager.d.ts

@@ -2,13 +2,15 @@
  * Copyright 2021 Cognite AS
  */
 import * as THREE from 'three';
-import { CadModelMetadataRepository, RenderMode } from '../../../../packages/cad-parsers';
-import { CadNode, CadModelUpdateHandler, CadMaterialManager, CadModelSectorBudget, LoadingState } from '../../../../packages/cad-geometry-loaders';
+import { Observable } from 'rxjs';
 import { CadModelFactory } from './CadModelFactory';
 import { CadModelSectorLoadStatistics } from './CadModelSectorLoadStatistics';
-import { Observable } from 'rxjs';
 import { GeometryFilter } from '../..';
-export declare class CadManager<TModelIdentifier> {
+import { CadModelMetadataRepository } from '../../../../packages/cad-parsers';
+import { CadModelUpdateHandler, CadModelSectorBudget, LoadingState } from '../../../../packages/cad-geometry-loaders';
+import { CadNode, CadMaterialManager, RenderMode } from '../../../../packages/rendering';
+import { ModelIdentifier } from '../../../../packages/modeldata-api';
+export declare class CadManager {
     private readonly _materialManager;
     private readonly _cadModelMetadataRepository;
     private readonly _cadModelFactory;
@@ -25,7 +27,7 @@ export declare class CadManager<TModelIdentifier> {
      * Returns statistics about how data loaded (or data about to be loaded).
      */
     get loadedStatistics(): CadModelSectorLoadStatistics;
-    constructor(materialManger: CadMaterialManager, cadModelMetadataRepository: CadModelMetadataRepository<TModelIdentifier>, cadModelFactory: CadModelFactory, cadModelUpdateHandler: CadModelUpdateHandler);
+    constructor(materialManger: CadMaterialManager, cadModelMetadataRepository: CadModelMetadataRepository, cadModelFactory: CadModelFactory, cadModelUpdateHandler: CadModelUpdateHandler);
     dispose(): void;
     requestRedraw(): void;
     resetRedraw(): void;
@@ -35,7 +37,7 @@ export declare class CadManager<TModelIdentifier> {
     set clippingPlanes(clippingPlanes: THREE.Plane[]);
     get renderMode(): RenderMode;
     set renderMode(renderMode: RenderMode);
-    addModel(modelIdentifier: TModelIdentifier, geometryFilter?: GeometryFilter): Promise<CadNode>;
+    addModel(modelIdentifier: ModelIdentifier, geometryFilter?: GeometryFilter): Promise<CadNode>;
     removeModel(model: CadNode): void;
     getLoadingStateObserver(): Observable<LoadingState>;
     private markNeedsRedraw;

package/core/src/datamodels/cad/CadModelFactory.d.ts

@@ -1,4 +1,4 @@
-import { CadMaterialManager, CadNode } from '../../../../packages/cad-geometry-loaders';
+import { CadMaterialManager, CadNode } from '../../../../packages/rendering';
 import { CadModelMetadata } from '../../../../packages/cad-parsers';
 export declare class CadModelFactory {
     private readonly _materialManager;

package/core/src/datamodels/cad/createCadManager.d.ts

@@ -2,9 +2,8 @@
  * Copyright 2021 Cognite AS
  */
 import { CadManager } from './CadManager';
-import { CadMaterialManager, OccludingGeometryProvider } from '../../../../packages/cad-geometry-loaders';
+import { OccludingGeometryProvider } from '../../../../packages/cad-geometry-loaders';
+import { CadMaterialManager } from '../../../../packages/rendering';
 import { RevealOptions } from '../../public/types';
-import { LocalModelDataClient, LocalModelMetadataProvider, CdfModelDataClient, CdfModelMetadataProvider, LocalModelIdentifier, CdfModelIdentifier, ModelDataClient, ModelMetadataProvider } from '../../../../packages/modeldata-api';
-export declare function createLocalCadManager(modelMetadataProvider: LocalModelMetadataProvider, modelDataClient: LocalModelDataClient, renderer: THREE.WebGLRenderer, materialManager: CadMaterialManager, alreadyLoadedGeometryProvider: OccludingGeometryProvider, options?: RevealOptions): CadManager<LocalModelIdentifier>;
-export declare function createCdfCadManager(modelMetadataProvider: CdfModelMetadataProvider, modelDataClient: CdfModelDataClient, renderer: THREE.WebGLRenderer, materialManager: CadMaterialManager, alreadyLoadedGeometryProvider: OccludingGeometryProvider, options?: RevealOptions): CadManager<CdfModelIdentifier>;
-export declare function createCadManager<T>(modelMetadataProvider: ModelMetadataProvider<T>, modelDataClient: ModelDataClient, renderer: THREE.WebGLRenderer, materialManager: CadMaterialManager, occludingGeometryProvider: OccludingGeometryProvider, options: RevealOptions): CadManager<T>;
+import { ModelDataProvider, ModelMetadataProvider } from '../../../../packages/modeldata-api';
+export declare function createCadManager(modelMetadataProvider: ModelMetadataProvider, modelDataProvider: ModelDataProvider, renderer: THREE.WebGLRenderer, materialManager: CadMaterialManager, occludingGeometryProvider: OccludingGeometryProvider, options: RevealOptions): CadManager;

package/core/src/datamodels/cad/picking.d.ts

@@ -2,7 +2,7 @@
  * Copyright 2021 Cognite AS
  */
 import * as THREE from 'three';
-import { CadNode } from '../../../../packages/cad-geometry-loaders';
+import { CadNode } from '../../../../packages/rendering';
 import { IntersectInput } from '../base/types';
 export interface PickingInput {
     normalizedCoords: {

package/core/src/datamodels/cad/rendering/RenderAlreadyLoadedGeometryProvider.d.ts

@@ -1,7 +1,8 @@
 /*!
  * Copyright 2021 Cognite AS
  */
-import { OccludingGeometryProvider, EffectRenderManager } from '../../../../../packages/cad-geometry-loaders';
+import { OccludingGeometryProvider } from '../../../../../packages/cad-geometry-loaders';
+import { EffectRenderManager } from '../../../../../packages/rendering';
 export declare class RenderAlreadyLoadedGeometryProvider implements OccludingGeometryProvider {
     private readonly _renderManager;
     constructor(renderManager: EffectRenderManager);

package/core/src/datamodels/cad/styling/AssetNodeCollection.d.ts

@@ -32,7 +32,6 @@ export declare class AssetNodeCollection extends NodeCollectionBase {
         assetId?: number;
         boundingBox?: THREE.Box3;
     }): Promise<void>;
-    getFilter(): any;
     clear(): void;
     getIndexSet(): IndexSet;
     serialize(): SerializedNodeCollection;

package/core/src/datamodels/cad/styling/InvertedNodeCollection.d.ts

@@ -20,5 +20,5 @@ export declare class InvertedNodeCollection extends NodeCollectionBase {
      * Not supported.
      * @throws Always throws an error.
      */
-    clear(): void;
+    clear(): never;
 }

package/core/src/datamodels/cad/styling/PropertyFilterNodeCollection.d.ts

@@ -3,7 +3,7 @@
  */
 import { CogniteClient } from '@cognite/sdk';
 import { Cognite3DModel } from '../../../public/migration/Cognite3DModel';
-import { NodeCollectionBase } from '../../../../../packages/cad-styling';
+import { NodeCollectionBase, SerializedNodeCollection } from '../../../../../packages/cad-styling';
 import { IndexSet } from '../../../../../packages/utilities';
 /**
  * Options for {@link PropertyFilterNodeCollection}.
@@ -45,17 +45,10 @@ export declare class PropertyFilterNodeCollection extends NodeCollectionBase {
             [key: string]: string;
         };
     }): Promise<void>;
-    getFilter(): {};
     /**
      * Clears the node collection and interrupts any ongoing operations.
      */
     clear(): void;
     getIndexSet(): IndexSet;
-    serialize(): {
-        token: string;
-        state: {};
-        options: {
-            requestPartitions: number;
-        };
-    };
+    serialize(): SerializedNodeCollection;
 }

package/core/src/datamodels/cad/styling/SinglePropertyFilterNodeCollection.d.ts

@@ -4,7 +4,7 @@
 import { Cognite3DModel } from '../../../public/migration/Cognite3DModel';
 import { PropertyFilterNodeCollectionOptions } from './PropertyFilterNodeCollection';
 import { IndexSet } from '../../../../../packages/utilities';
-import { NodeCollectionBase } from '../../../../../packages/cad-styling';
+import { NodeCollectionBase, SerializedNodeCollection } from '../../../../../packages/cad-styling';
 import { CogniteClient } from '@cognite/sdk';
 /**
  * Node collection that filters nodes based on a node property from a list of values, similarly to how
@@ -46,15 +46,5 @@ export declare class SinglePropertyFilterNodeCollection extends NodeCollectionBa
     clear(): void;
     getIndexSet(): IndexSet;
     private buildUrl;
-    serialize(): {
-        token: string;
-        state: {
-            propertyCategory: string;
-            propertyKey: string;
-            propertyValues: string[];
-        };
-        options: {
-            requestPartitions: number;
-        };
-    };
+    serialize(): SerializedNodeCollection;
 }

package/core/src/datamodels/pointcloud/PointCloudManager.d.ts

@@ -4,14 +4,15 @@
 import * as THREE from 'three';
 import { LoadingState } from '../../../../packages/cad-geometry-loaders';
 import { PointCloudFactory } from './PointCloudFactory';
+import { PointCloudNode } from './PointCloudNode';
 import { PointCloudMetadataRepository } from './PointCloudMetadataRepository';
 import { Observable } from 'rxjs';
-import { PointCloudNode } from './PointCloudNode';
-export declare class PointCloudManager<TModelIdentifier> {
+import { ModelIdentifier } from '../../../../packages/modeldata-api';
+export declare class PointCloudManager {
     private readonly _pointCloudMetadataRepository;
     private readonly _pointCloudFactory;
     private readonly _pointCloudGroupWrapper;
-    constructor(metadataRepository: PointCloudMetadataRepository<TModelIdentifier>, modelFactory: PointCloudFactory);
+    constructor(metadataRepository: PointCloudMetadataRepository, modelFactory: PointCloudFactory);
     requestRedraw(): void;
     resetRedraw(): void;
     get pointBudget(): number;
@@ -20,6 +21,6 @@ export declare class PointCloudManager<TModelIdentifier> {
     set clippingPlanes(planes: THREE.Plane[]);
     getLoadingStateObserver(): Observable<LoadingState>;
     updateCamera(_camera: THREE.PerspectiveCamera): void;
-    addModel(modelIdentifier: TModelIdentifier): Promise<PointCloudNode>;
+    addModel(modelIdentifier: ModelIdentifier): Promise<PointCloudNode>;
     removeModel(node: PointCloudNode): void;
 }

package/core/src/datamodels/pointcloud/PointCloudMetadataRepository.d.ts

@@ -3,11 +3,11 @@
  */
 import { PointCloudMetadata } from './PointCloudMetadata';
 import { MetadataRepository } from '../base';
-import { ModelDataClient, ModelMetadataProvider } from '../../../../packages/modeldata-api';
-export declare class PointCloudMetadataRepository<TModelIdentifier> implements MetadataRepository<TModelIdentifier, Promise<PointCloudMetadata>> {
+import { ModelDataProvider, ModelMetadataProvider, ModelIdentifier } from '../../../../packages/modeldata-api';
+export declare class PointCloudMetadataRepository implements MetadataRepository<Promise<PointCloudMetadata>> {
     private readonly _modelMetadataProvider;
-    private readonly _modelDataClient;
+    private readonly _modelDataProvider;
     private readonly _blobFileName;
-    constructor(modelMetadataProvider: ModelMetadataProvider<TModelIdentifier>, modelDataClient: ModelDataClient, blobFileName?: string);
-    loadData(modelIdentifier: TModelIdentifier): Promise<PointCloudMetadata>;
+    constructor(modelMetadataProvider: ModelMetadataProvider, modelDataProvider: ModelDataProvider, blobFileName?: string);
+    loadData(modelIdentifier: ModelIdentifier): Promise<PointCloudMetadata>;
 }

package/core/src/datamodels/pointcloud/createPointCloudManager.d.ts

@@ -2,7 +2,5 @@
  * Copyright 2021 Cognite AS
  */
 import { PointCloudManager } from './PointCloudManager';
-import { CdfModelDataClient, LocalModelDataClient, CdfModelIdentifier, LocalModelIdentifier, ModelDataClient, LocalModelMetadataProvider, ModelMetadataProvider, CdfModelMetadataProvider } from '../../../../packages/modeldata-api';
-export declare function createLocalPointCloudManager(modelMetadataProvider: LocalModelMetadataProvider, modelDataClient: LocalModelDataClient): PointCloudManager<LocalModelIdentifier>;
-export declare function createCdfPointCloudManager(modelMetadataProvider: CdfModelMetadataProvider, modelDataClient: CdfModelDataClient): PointCloudManager<CdfModelIdentifier>;
-export declare function createPointCloudManager<T>(modelMetadataProvider: ModelMetadataProvider<T>, modelDataClient: ModelDataClient): PointCloudManager<T>;
+import { ModelDataProvider, ModelMetadataProvider } from '../../../../packages/modeldata-api';
+export declare function createPointCloudManager(modelMetadataProvider: ModelMetadataProvider, modelDataProvider: ModelDataProvider): PointCloudManager;

package/core/src/datamodels/pointcloud/index.d.ts

@@ -0,0 +1,5 @@
+/*!
+ * Copyright 2021 Cognite AS
+ */
+import { PointCloudMetadata } from './PointCloudMetadata';
+export { PointCloudMetadata };

package/core/src/index.d.ts

@@ -4,7 +4,7 @@
 /**
  * @module @cognite/reveal
  */
-export { NodeAppearanceProvider, NodeAppearance, NodeOutlineColor } from '../../packages/cad-styling';
+export { NodeAppearanceProvider, NodeAppearance, NodeOutlineColor, DefaultNodeAppearance } from '../../packages/cad-styling';
 export { NodeCollectionBase, TreeIndexNodeCollection, IntersectionNodeCollection, UnionNodeCollection, SerializedNodeCollection } from '../../packages/cad-styling';
 export { revealEnv, IndexSet, NumericRange } from '../../packages/utilities';
 export * from './public/migration/Cognite3DViewer';

package/core/src/internals.d.ts

@@ -0,0 +1,15 @@
+/*!
+ * Copyright 2021 Cognite AS
+ */
+export { CdfModelIdentifier, LocalModelIdentifier, ModelIdentifier, File3dFormat } from '../../packages/modeldata-api';
+export { RevealManager } from './public/RevealManager';
+export { createLocalRevealManager, createCdfRevealManager } from './public/createRevealManager';
+export { intersectCadNodes } from './datamodels/cad/picking';
+export { CadModelSectorLoadStatistics } from './datamodels/cad/CadModelSectorLoadStatistics';
+export { PointCloudMetadata } from './datamodels/pointcloud';
+export * from './datamodels/pointcloud/types';
+export { PotreeNodeWrapper } from './datamodels/pointcloud/PotreeNodeWrapper';
+export { PotreeGroupWrapper } from './datamodels/pointcloud/PotreeGroupWrapper';
+export { PointCloudNode } from './datamodels/pointcloud/PointCloudNode';
+import * as utilities from './utilities';
+export { utilities };

package/core/src/public/RevealManager.d.ts

@@ -8,14 +8,15 @@ import { LoadingStateChangeListener, PointCloudBudget } from './types';
 import { PointCloudNode } from '../datamodels/pointcloud/PointCloudNode';
 import { CadModelSectorLoadStatistics } from '../datamodels/cad/CadModelSectorLoadStatistics';
 import { GeometryFilter } from '..';
-import { RenderMode } from '../../../packages/cad-parsers';
-import { RenderOptions, CadModelSectorBudget, EffectRenderManager, CadNode } from '../../../packages/cad-geometry-loaders';
+import { CadModelSectorBudget } from '../../../packages/cad-geometry-loaders';
 import { NodeAppearanceProvider } from '../../../packages/cad-styling';
+import { RenderOptions, EffectRenderManager, CadNode, RenderMode } from '../../../packages/rendering';
+import { ModelIdentifier } from '../../../packages/modeldata-api';
 export declare type AddCadModelOptions = {
     nodeAppearanceProvider?: NodeAppearanceProvider;
     geometryFilter?: GeometryFilter;
 };
-export declare class RevealManager<TModelIdentifier> {
+export declare class RevealManager {
     private readonly _cadManager;
     private readonly _pointCloudManager;
     private readonly _effectRenderManager;
@@ -24,10 +25,12 @@ export declare class RevealManager<TModelIdentifier> {
     private readonly _subscriptions;
     private readonly _events;
     private readonly _updateSubject;
-    constructor(cadManager: CadManager<TModelIdentifier>, renderManager: EffectRenderManager, pointCloudManager: PointCloudManager<TModelIdentifier>);
+    constructor(cadManager: CadManager, renderManager: EffectRenderManager, pointCloudManager: PointCloudManager);
     dispose(): void;
     requestRedraw(): void;
     resetRedraw(): void;
+    get debugRenderTiming(): boolean;
+    set debugRenderTiming(enable: boolean);
     get renderOptions(): RenderOptions;
     set renderOptions(options: RenderOptions);
     get needsRedraw(): boolean;
@@ -50,8 +53,8 @@ export declare class RevealManager<TModelIdentifier> {
      * @param autoSetTargetSize Auto size target to fit canvas.
      */
     setRenderTarget(target: THREE.WebGLRenderTarget | null, autoSetTargetSize?: boolean): void;
-    addModel(type: 'cad', modelIdentifier: TModelIdentifier, options?: AddCadModelOptions): Promise<CadNode>;
-    addModel(type: 'pointcloud', modelIdentifier: TModelIdentifier): Promise<PointCloudNode>;
+    addModel(type: 'cad', modelIdentifier: ModelIdentifier, options?: AddCadModelOptions): Promise<CadNode>;
+    addModel(type: 'pointcloud', modelIdentifier: ModelIdentifier): Promise<PointCloudNode>;
     removeModel(type: 'cad', model: CadNode): void;
     removeModel(type: 'pointcloud', model: PointCloudNode): void;
     addUiObject(object: THREE.Object3D, screenPos: THREE.Vector2, size: THREE.Vector2): void;

package/core/src/public/createRevealManager.d.ts

@@ -4,7 +4,6 @@
 import * as THREE from 'three';
 import { RevealManager } from './RevealManager';
 import { RevealOptions } from './types';
-import { LocalModelIdentifier, CdfModelIdentifier } from '../../../packages/modeldata-api';
 import { CogniteClient } from '@cognite/sdk';
 /**
  * Used to create an instance of reveal manager that works with localhost.
@@ -13,7 +12,7 @@ import { CogniteClient } from '@cognite/sdk';
  * @param revealOptions
  * @returns RevealManager instance.
  */
-export declare function createLocalRevealManager(renderer: THREE.WebGLRenderer, scene: THREE.Scene, revealOptions?: RevealOptions): RevealManager<LocalModelIdentifier>;
+export declare function createLocalRevealManager(renderer: THREE.WebGLRenderer, scene: THREE.Scene, revealOptions?: RevealOptions): RevealManager;
 /**
  * Used to create an instance of reveal manager that works with the CDF.
  * @param client
@@ -21,4 +20,4 @@ export declare function createLocalRevealManager(renderer: THREE.WebGLRenderer,
  * @param scene
  * @param revealOptions
  */
-export declare function createCdfRevealManager(client: CogniteClient, renderer: THREE.WebGLRenderer, scene: THREE.Scene, revealOptions?: RevealOptions): RevealManager<CdfModelIdentifier>;
+export declare function createCdfRevealManager(client: CogniteClient, renderer: THREE.WebGLRenderer, scene: THREE.Scene, revealOptions?: RevealOptions): RevealManager;

package/core/src/public/migration/Cognite3DModel.d.ts

@@ -54,6 +54,13 @@ export declare class Cognite3DModel extends THREE.Object3D implements CogniteMod
      * {@link assignStyledNodeCollection}.
      */
     getDefaultNodeAppearance(): NodeAppearance;
+    /**
+     * Returns all currently registered node collections and associated appearance.
+     */
+    get styledNodeCollections(): {
+        nodeCollection: NodeCollectionBase;
+        appearance: NodeAppearance;
+    }[];
     /**
      * Customizes rendering style for a set of nodes, e.g. to highlight, hide
      * or color code a set of 3D objects. This allows for custom look and feel
@@ -80,12 +87,21 @@ export declare class Cognite3DModel extends THREE.Object3D implements CogniteMod
      * const visibleNodes = new TreeIndexNodeCollection(someTreeIndices);
      * model.assignStyledNodeCollection(visibleSet, { rendererGhosted: false });
      * ```
+     * @throws Error if node collection already has been assigned to the model.
      */
     assignStyledNodeCollection(nodeCollection: NodeCollectionBase, appearance: NodeAppearance): void;
+    /**
+     * Updates styled node collections with a new appearance.
+     * @param nodeCollection    A node collection previously assigned using {@link assignStyledNodeCollection}.
+     * @param newAppearance     New appearance for the nodes in the collection.
+     * @throws Error if node collection hasn't previously been assigned using {@link assignStyledNodeCollection}.
+     */
+    updateStyledNodeCollection(nodeCollection: NodeCollectionBase, newAppearance: NodeAppearance): void;
     /**
      * Removes styling for previously added styled collection, resetting the style to the default (or
      * the style imposed by other styled collections).
      * @param nodeCollection   Node collection previously added using {@link assignStyledNodeCollection}.
+     * @throws Error if node collection isn't assigned to the model.
      */
     unassignStyledNodeCollection(nodeCollection: NodeCollectionBase): void;
     /**

package/core/src/public/migration/Cognite3DViewer.d.ts

@@ -10,7 +10,7 @@ import { DisposedDelegate, SceneRenderedDelegate } from '../types';
 import { SupportedModelTypes } from '../../datamodels/base';
 import { IntersectionFromPixelOptions } from '../..';
 import { ViewerState } from '../../utilities/ViewStateHelper';
-import ComboControls from '../../../../packages/camera-manager';
+import { CameraControlsOptions, ComboControls } from '../../../../packages/camera-manager';
 /**
  * @example
  * ```js
@@ -22,7 +22,6 @@ import ComboControls from '../../../../packages/camera-manager';
  * @module @cognite/reveal
  */
 export declare class Cognite3DViewer {
-    private readonly _viewStateHelper;
     private get canvas();
     /**
      * For now it just always returns true.
@@ -40,16 +39,18 @@ export declare class Cognite3DViewer {
      * Returns the renderer used to produce images from 3D geometry.
      */
     get renderer(): THREE.WebGLRenderer;
+    private readonly _cdfSdkClient;
+    private readonly _dataSource;
     private readonly camera;
     private readonly scene;
-    private readonly controls;
-    private readonly sdkClient;
+    private readonly _cameraManager;
     private readonly _subscription;
     private readonly _revealManagerHelper;
     private readonly _domElement;
     private readonly _renderer;
     private readonly _boundAnimate;
     private readonly _events;
+    private readonly _mouseHandler;
     private readonly _models;
     private readonly _extraObjects;
     private readonly _automaticNearFarPlane;
@@ -94,6 +95,12 @@ export declare class Cognite3DViewer {
      * Returns reveal version installed.
      */
     getVersion(): string;
+    /**
+     * Sets the log level. Used for debugging.
+     * Defaults to 'none' (which is identical to 'silent').
+     * @param level
+     */
+    setLogLevel(level: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'silent' | 'none'): void;
     /**
      * Dispose of WebGL resources. Can be used to free up memory when the viewer is no longer in use.
      * @see {@link https://threejs.org/docs/#manual/en/introduction/How-to-dispose-of-objects}
@@ -141,6 +148,15 @@ export declare class Cognite3DViewer {
     off(event: 'cameraChange', callback: CameraChangeDelegate): void;
     off(event: 'sceneRendered', callback: SceneRenderedDelegate): void;
     off(event: 'disposed', callback: DisposedDelegate): void;
+    /**
+     * Sets camera control options. See {@link CameraControlsOptions}.
+     * @param controlsOptions JSON object with camera controls options.
+     */
+    setCameraControlsOptions(controlsOptions: CameraControlsOptions): void;
+    /**
+     * Gets camera controls mode.
+     */
+    getCameraControlsOptions(): CameraControlsOptions;
     /**
      * Gets the current viewer state which includes the camera pose as well as applied styling.
      * @returns JSON object containing viewer state.
@@ -206,7 +222,7 @@ export declare class Cognite3DViewer {
      * .
      * @param model
      */
-    removeModel(model: Cognite3DModel | CognitePointCloudModel): void;
+    removeModel(model: CogniteModelBase): void;
     /**
      * Use to determine of which type the model is.
      *
@@ -352,6 +368,7 @@ export declare class Cognite3DViewer {
      * Set camera's target.
      * @public
      * @param target Target in world space.
+     * @param animated Whether change of target should be animated or not (default is false).
      * @example
      * ```js
      * // store position, target
@@ -362,7 +379,7 @@ export declare class Cognite3DViewer {
      * viewer.setCameraTarget(target);
      * ```
      */
-    setCameraTarget(target: THREE.Vector3): void;
+    setCameraTarget(target: THREE.Vector3, animated?: boolean): void;
     /**
      * Gets the camera controller. See https://www.npmjs.com/package/@cognite/three-combo-controls
      * for documentation. Note that by default the `minDistance` setting of the controls will
@@ -435,11 +452,11 @@ export declare class Cognite3DViewer {
      */
     requestRedraw(): void;
     /**
-     * Allows to move camera with WASM or arrows keys.
+     * Allows to move camera with WASD or arrows keys.
      */
     enableKeyboardNavigation(): void;
     /**
-     * Disables camera movement by pressing WASM or arrows keys.
+     * Disables camera movement by pressing WASD or arrows keys.
      */
     disableKeyboardNavigation(): void;
     /**
@@ -533,13 +550,17 @@ export declare class Cognite3DViewer {
      */
     getIntersectionFromPixel(offsetX: number, offsetY: number, options?: IntersectionFromPixelOptions): Promise<null | Intersection>;
     private getModels;
-    /** @private */
-    private moveCameraTo;
+    /**
+     * Creates a helper for managing viewer state.
+     */
+    private createViewStateHelper;
     /** @private */
     private animate;
     /** @private */
+    private modelIntersectionCallback;
+    /** @private */
     private updateCameraNearAndFar;
     /** @private */
     private resizeIfNecessary;
-    private startPointerEventListeners;
+    private readonly startPointerEventListeners;
 }

package/core/src/public/migration/types.d.ts

@@ -43,6 +43,20 @@ export interface Cognite3DViewerOptions {
         target: THREE.WebGLRenderTarget;
         autoSetSize?: boolean;
     };
+    /**
+     * Style the loading indicator.
+     */
+    loadingIndicatorStyle?: {
+        /**
+         * What corner the spinner should be placed in. Defaults top topLeft.
+         */
+        placement: 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight';
+        /**
+         * Opacity of the spinner in fractions. Valid values are between
+         * 0.2 and 1.0. Defaults to 1.0.
+         */
+        opacity: number;
+    };
     /**
      * When false, camera near and far planes will not be updated automatically (defaults to true).
      * This can be useful when you have custom content in the 3D view and need to better
@@ -96,8 +110,20 @@ export interface Cognite3DViewerOptions {
     enableEdges?: boolean;
     /** Callback to download stream progress. */
     onLoading?: OnLoadingCallback;
+    /**
+     * Allows providing a custom data source that Reveal will
+     * use to load model data. Note that some features might not
+     * work when implementing a custom data source. Please refer
+     * to the Reveal documentation for details.
+     *
+     * Note that the data source must support {@link CdfModelIdentifier}.
+     *
+     * This cannot be used together with {@link _localModels}.
+     */
+    customDataSource?: DataSource;
 }
 import { GeometryFilter } from '../../public/types';
+import { DataSource } from '../../../../packages/data-source';
 export { GeometryFilter };
 /**
  * @module @cognite/reveal
@@ -108,6 +134,30 @@ export interface AddModelOptions {
     localPath?: string;
     geometryFilter?: GeometryFilter;
 }
+export declare type CameraControlsOptions = {
+    /**
+     * Sets mouse wheel initiated action.
+     *
+     * Modes:
+     *
+     * 'zoomToTarget' - zooms just to the current target (center of the screen) of the camera.
+     *
+     * 'zoomPastCursor' - zooms in the direction of the ray coming from camera through cursor screen position, allows going through objects.
+     *
+     * 'zoomToCursor' - mouse wheel scroll zooms towards the point on the model where cursor is hovering over, doesn't allow going through objects.
+     *
+     * Default is 'zoomPastCursor'.
+     *
+     */
+    mouseWheelAction?: 'zoomToTarget' | 'zoomPastCursor' | 'zoomToCursor';
+    /**
+     * Enables or disables change of camera target on mouse click. New target is then set to the point of the model under current cursor position.
+     *
+     * Default is false.
+     *
+     */
+    onClickTargetChange?: boolean;
+};
 export declare type CadIntersection = {
     /**
      * The intersection type.

package/core/src/public/types.d.ts

@@ -1,7 +1,8 @@
 /*!
  * Copyright 2021 Cognite AS
  */
-import { SectorQuads, RenderOptions, LoadingState, SectorCuller } from '../../../packages/cad-geometry-loaders';
+import { LoadingState, SectorCuller } from '../../../packages/cad-geometry-loaders';
+import { SectorQuads, RenderOptions } from '../../../packages/rendering';
 import { SectorGeometry } from '../../../packages/cad-parsers';
 /**
  * @property logMetrics Might be used to disable usage statistics.

package/core/src/{public/migration → storage}/RevealManagerHelper.d.ts

@@ -2,12 +2,11 @@
  * Copyright 2021 Cognite AS
  */
 import * as THREE from 'three';
-import { AddModelOptions } from './types';
-import { RevealManager } from '../RevealManager';
-import { RevealOptions } from '../..';
-import { PointCloudNode } from '../../datamodels/pointcloud/PointCloudNode';
-import { CdfModelIdentifier, LocalModelIdentifier } from '../../../../packages/modeldata-api';
-import { CadNode } from '../../../../packages/cad-geometry-loaders';
+import { AddModelOptions } from '../public/migration/types';
+import { RevealOptions } from '../public/types';
+import { PointCloudNode, RevealManager } from '../internals';
+import { DataSource } from '../../../packages/data-source';
+import { CadNode } from '../../../packages/rendering';
 import { CogniteClient } from '@cognite/sdk';
 /**
  * Helper for {@link RevealManager} for creating a uniform interface for
@@ -36,7 +35,8 @@ export declare class RevealManagerHelper {
      * @param sdkClient
      */
     static createCdfHelper(renderer: THREE.WebGLRenderer, scene: THREE.Scene, revealOptions: RevealOptions, sdkClient: CogniteClient): RevealManagerHelper;
-    get revealManager(): RevealManager<LocalModelIdentifier> | RevealManager<CdfModelIdentifier>;
+    static createCustomDataSourceHelper(renderer: THREE.WebGLRenderer, scene: THREE.Scene, revealOptions: RevealOptions, dataSource: DataSource): RevealManagerHelper;
+    get revealManager(): RevealManager;
     /**
      * Adds a local CAD model.
      * @param model

package/core/src/utilities/Spinner.d.ts

@@ -2,18 +2,17 @@
  * Copyright 2021 Cognite AS
  */
 import * as THREE from 'three';
+export declare type Corner = 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight';
 export declare class Spinner {
     private static readonly stylesId;
-    static classnames: {
-        base: string;
-        loading: string;
-        dark: string;
-    };
+    private static readonly classnames;
     private static readonly titles;
     private _loading;
     private static loadStyles;
     private readonly el;
     constructor(parent: HTMLElement);
+    set placement(placement: Corner);
+    set opacity(fractionOpacity: number);
     get loading(): boolean;
     set loading(loadingState: boolean);
     /**