@cognite/reveal 4.0.0-dev.20230118 → 4.0.0-dev.20230120

package/dist/packages/api/src/api-helpers/Image360ApiHelper.d.ts

@@ -25,6 +25,7 @@ export declare class Image360ApiHelper {
     enter360Image(image360Entity: Image360Entity): Promise<void>;
     private transition;
     private tweenVisualizationAlpha;
+    private tweenVisualizationZoom;
     private set360CameraManager;
     exit360Image(): void;
     dispose(): void;

package/dist/packages/api/src/public/RevealManager.d.ts

@@ -8,7 +8,7 @@ import { PointCloudManager, PointCloudNode } from '../../../pointclouds';
 import { LoadingState } from '../../../model-base';
 import { CadManager, CadModelBudget } from '../../../cad-geometry-loaders';
 import { NodeAppearanceProvider } from '../../../cad-styling';
-import { RenderMode, RenderPipelineExecutor, CadMaterialManager, RenderPipelineProvider, ResizeHandler } from '../../../rendering';
+import { RenderMode, RenderPipelineExecutor, CadMaterialManager, RenderPipelineProvider, ResizeHandler, SettableRenderTarget } from '../../../rendering';
 import { CameraManager } from '../../../camera-manager';
 import { ModelIdentifier } from '../../../data-providers';
 export type AddCadModelOptions = {
@@ -33,10 +33,11 @@ export declare class RevealManager {
     private readonly _cameraManager;
     private readonly _onCameraChange;
     private readonly _onCameraStop;
-    constructor(cadManager: CadManager, pointCloudManager: PointCloudManager, pipelineExecutor: RenderPipelineExecutor, renderPipeline: RenderPipelineProvider, resizeHandler: ResizeHandler, cameraManager: CameraManager);
+    constructor(cadManager: CadManager, pointCloudManager: PointCloudManager, pipelineExecutor: RenderPipelineExecutor, renderPipeline: RenderPipelineProvider & SettableRenderTarget, resizeHandler: ResizeHandler, cameraManager: CameraManager);
     dispose(): void;
     requestRedraw(): void;
     resetRedraw(): void;
+    setOutputRenderTarget(target: THREE.WebGLRenderTarget | null, autoSizeRenderTarget?: boolean): void;
     get materialManager(): CadMaterialManager;
     get needsRedraw(): boolean;
     update(camera: THREE.PerspectiveCamera): void;

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

@@ -0,0 +1,9 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import { ParsedGeometry } from '../../../sector-parser';
+export interface DrawCallBatchingManager {
+    batchGeometries(geometryBatchingQueue: ParsedGeometry[], sectorId: number): void;
+    removeSectorBatches(sectorId: number): void;
+    dispose(): void;
+}

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

@@ -0,0 +1,37 @@
+import { Group } from 'three';
+import { Materials } from '../../../rendering';
+import { ParsedGeometry } from '../../../sector-parser';
+import { DrawCallBatchingManager } from './DrawCallBatchingManager';
+/**
+ * The objective of this class is to batch together instances
+ * of the same type from different sectors.
+ * This is done to reduce the number of draw calls that have to be issued during rendering.
+ * Essentially this works by allocating n (numberOfInstanceBatches) buffers for each unique instanced type
+ * and continually filling / ejecting data from those buffers when new sectors are added / removed.
+ */
+export declare class MultiBufferBatchingManager implements DrawCallBatchingManager {
+    private readonly initialBufferSize;
+    private readonly numberOfInstanceBatches;
+    private readonly _sectorBatches;
+    private readonly _instanceBatches;
+    private readonly _materials;
+    private readonly _batchGroup;
+    constructor(batchGroup: Group, materials: Materials, initialBufferSize?: number, numberOfInstanceBatches?: number);
+    batchGeometries(geometryBatchingQueue: ParsedGeometry[], sectorId: number): void;
+    removeSectorBatches(sectorId: number): void;
+    dispose(): void;
+    private removeTreeIndicesFromMeshUserData;
+    private processGeometries;
+    private batchInstanceAttributes;
+    private addTreeIndicesToMeshUserData;
+    private reallocateBufferGeometry;
+    private updateInstanceAttributes;
+    private extendUpdateRange;
+    private getBatchBufferToFill;
+    private getOrCreateInstanceBatch;
+    private createBatchBuffer;
+    private createInstanceMesh;
+    private createDefragmentedBufferGeometry;
+    private getTreeIndexAttribute;
+    private createSectorBatch;
+}

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

@@ -0,0 +1,18 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import { TypedArray } from '../../../utilities';
+import { BufferAttribute, InterleavedBufferAttribute, BufferGeometry } from 'three';
+export declare class GeometryBufferUtils {
+    private static readonly TypedArrayViews;
+    static getAttributes<T extends BufferAttribute | InterleavedBufferAttribute>(geometry: BufferGeometry, filterType: new (...args: any[]) => T): {
+        name: string;
+        attribute: T;
+    }[];
+    static copyGeometryWithBufferAttributes(geometry: BufferGeometry): THREE.BufferGeometry;
+    static setInstanceAttributeDescriptors(instanceAttributes: {
+        name: string;
+        attribute: InterleavedBufferAttribute;
+    }[], bufferGeometry: BufferGeometry, backingBuffer: ArrayBufferLike): void;
+    static getInstanceAttributesSharedView(geometry: BufferGeometry): TypedArray;
+}

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

@@ -0,0 +1,7 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import { Materials } from '../../../rendering';
+import { RevealGeometryCollectionType } from '../../../sector-parser';
+import { RawShaderMaterial } from 'three';
+export declare function getShaderMaterial(type: RevealGeometryCollectionType, materials: Materials): RawShaderMaterial;

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

@@ -9,10 +9,12 @@ export declare class StationaryCameraManager implements CameraManager {
     private readonly _cameraChangedListeners;
     private readonly _domElement;
     private _defaultFOV;
+    private readonly _minFOV;
     private readonly _stopEventTrigger;
     private _isDragging;
     constructor(domElement: HTMLElement, camera: THREE.PerspectiveCamera);
     getCamera(): THREE.PerspectiveCamera;
+    get defaultFOV(): number;
     setCameraState(state: CameraState): void;
     getCameraState(): Required<CameraState>;
     activate(cameraManager: CameraManager): void;
@@ -21,6 +23,7 @@ export declare class StationaryCameraManager implements CameraManager {
     off(eventType: CameraManagerEventType, callback: CameraChangeDelegate): void;
     fitCameraToBoundingBox(boundingBox: THREE.Box3, _?: number, radiusFactor?: number): void;
     moveTo(targetPosition: THREE.Vector3, duration?: number): Promise<void>;
+    setFOV(fov: number): void;
     update(_: number, boundingBox: THREE.Box3): void;
     dispose(): void;
     private readonly enableDragging;
@@ -28,4 +31,5 @@ export declare class StationaryCameraManager implements CameraManager {
     private readonly rotateCamera;
     private readonly zoomCamera;
     private getCursorRay;
+    private getTarget;
 }

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

@@ -21,3 +21,4 @@ export { BasicPipelineExecutor } from './src/pipeline-executors/BasicPipelineExe
 export { RenderPipelineExecutor } from './src/RenderPipelineExecutor';
 export { RenderPipelineProvider } from './src/RenderPipelineProvider';
 export { ResizeHandler } from './src/ResizeHandler';
+export { SettableRenderTarget } from './src/rendering/SettableRenderTarget';

package/dist/packages/rendering/src/render-pipeline-providers/CadGeometryRenderModePipelineProvider.d.ts

@@ -7,7 +7,8 @@ import { RenderPass } from '../RenderPass';
 import { RenderPipelineProvider } from '../RenderPipelineProvider';
 import { RenderMode } from '../rendering/RenderMode';
 import { SceneHandler } from '../../../utilities';
-export declare class CadGeometryRenderModePipelineProvider implements RenderPipelineProvider {
+import { SettableRenderTarget } from '../rendering/SettableRenderTarget';
+export declare class CadGeometryRenderModePipelineProvider implements RenderPipelineProvider, SettableRenderTarget {
     private readonly _materialManager;
     private readonly _cadModels;
     private readonly _renderTargetData;

package/dist/packages/rendering/src/render-pipeline-providers/DefaultRenderPipelineProvider.d.ts

@@ -8,14 +8,15 @@ import { RenderPipelineProvider } from '../RenderPipelineProvider';
 import { RenderOptions } from '../rendering/types';
 import { SceneHandler } from '../../../utilities';
 import { PointCloudMaterialManager } from '../PointCloudMaterialManager';
-export declare class DefaultRenderPipelineProvider implements RenderPipelineProvider {
+import { SettableRenderTarget } from '../rendering/SettableRenderTarget';
+export declare class DefaultRenderPipelineProvider implements RenderPipelineProvider, SettableRenderTarget {
     private readonly _viewerScene;
     private readonly _renderTargetData;
     private readonly _cadModels;
     private readonly _pointCloudModels;
     private readonly _customObjects;
-    private readonly _autoResizeOutputTarget;
-    private readonly _outputRenderTarget;
+    private _autoResizeOutputTarget;
+    private _outputRenderTarget;
     private readonly _cadGeometryRenderPipeline;
     private readonly _pointCloudRenderPipeline;
     private readonly _postProcessingPass;
@@ -29,6 +30,7 @@ export declare class DefaultRenderPipelineProvider implements RenderPipelineProv
         target: THREE.WebGLRenderTarget;
         autoSize?: boolean;
     });
+    setOutputRenderTarget(target: THREE.WebGLRenderTarget | null, autoSizeRenderTarget?: boolean): void;
     pipeline(renderer: THREE.WebGLRenderer): Generator<RenderPass>;
     dispose(): void;
     private pipelineSetup;

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

@@ -0,0 +1,9 @@
+/*!
+ * Copyright 2022 Cognite AS
+ */
+/**
+ * Interface for allowing render targets in renderPipelines to be changed dynamicaly in RevealManager.
+ */
+export interface SettableRenderTarget {
+    setOutputRenderTarget(target: THREE.WebGLRenderTarget | null, autoSizeRenderTarget?: boolean): void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.0.0-dev.20230118",
+  "version": "4.0.0-dev.20230120",
   "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": {
@@ -69,8 +69,6 @@
   },
   "dependencies": {
     "@tweenjs/tween.js": "18.6.4",
-    "@types/draco3dgltf": "1.4.0",
-    "@types/three": "0.148.0",
     "assert": "2.0.0",
     "async-mutex": "0.4.0",
     "comlink": "4.3.1",
@@ -103,6 +101,7 @@
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.3",
     "@types/stats": "0.16.30",
+    "@types/three": "0.148.0",
     "@types/tween.js": "18.5.1",
     "@typescript-eslint/eslint-plugin": "5.48.1",
     "@typescript-eslint/parser": "5.48.1",
@@ -119,7 +118,7 @@
     "eslint-plugin-unused-imports": "2.0.0",
     "file-loader": "6.2.0",
     "gl": "6.0.2",
-    "glob": "8.0.3",
+    "glob": "8.1.0",
     "glslify-loader": "2.0.0",
     "html-webpack-plugin": "5.5.0",
     "jest": "29.3.1",
@@ -128,7 +127,7 @@
     "jest-extended": "3.2.3",
     "jest-image-snapshot": "6.1.0",
     "jest-puppeteer": "6.2.0",
-    "jsdom": "20.0.3",
+    "jsdom": "21.0.0",
     "moq.ts": "10.0.2",
     "nock": "13.3.0",
     "prettier": "2.8.2",

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

@@ -1,31 +0,0 @@
-/*!
- * Copyright 2021 Cognite AS
- */
-import * as THREE from 'three';
-import { ParsedGeometry } from '../../../sector-parser';
-import { Materials } from '../../../rendering';
-export declare class GeometryBatchingManager {
-    private readonly _batchedGeometriesGroup;
-    private readonly _materials;
-    private readonly _instancedTypeMap;
-    private readonly _sectorMap;
-    private static readonly TypedArrayViews;
-    constructor(group: THREE.Group, materials: Materials);
-    dispose(): void;
-    batchGeometries(geometryBatchingQueue: ParsedGeometry[], sectorId: number): void;
-    removeSectorBatches(sectorId: number): void;
-    private processGeometries;
-    private updateInstanceAttributes;
-    private extendUpdateRange;
-    private reallocateBufferGeometry;
-    private createSectorBatch;
-    private createInstanceMeshGeometry;
-    private getInstanceAttributesSharedView;
-    private getTreeIndexAttribute;
-    private removeTreeIndicesFromMeshUserData;
-    private createDefragmentedBufferGeometry;
-    private createInstanceMesh;
-    private getAttributes;
-    private copyGeometryWithBufferAttributes;
-    private getShaderMaterial;
-}