@cognite/reveal 4.3.1 → 4.3.2-dev.20230613

package/dist/packages/360-images/src/collection/DefaultImage360Collection.d.ts

@@ -9,6 +9,7 @@ import { IconCollection, IconCullingScheme } from '../icons/IconCollection';
 import { Image360AnnotationAppearance } from '../annotation/types';
 import { IdEither } from '@cognite/sdk';
 import { Image360DataProvider } from '../../../data-providers';
+import { Image360AnnotationFilter } from '../annotation/Image360AnnotationFilter';
 /**
  * Default implementation of {@link Image360Collection}. Used for events when entering
  * and exiting 360 image mode
@@ -26,6 +27,7 @@ export declare class DefaultImage360Collection implements Image360Collection {
     private _needsRedraw;
     private _defaultStyle;
     private readonly _image360DataProvider;
+    private readonly _annotationFilter;
     private readonly _events;
     private readonly _icons;
     private _isCollectionVisible;
@@ -43,7 +45,7 @@ export declare class DefaultImage360Collection implements Image360Collection {
         image360Exited: EventTrigger<Image360ExitedDelegate>;
     };
     get isCollectionVisible(): boolean;
-    constructor(collectionId: string, collectionLabel: string | undefined, entities: Image360Entity[], icons: IconCollection, image360DataProvider: Image360DataProvider);
+    constructor(collectionId: string, collectionLabel: string | undefined, entities: Image360Entity[], icons: IconCollection, annotationFilter: Image360AnnotationFilter, image360DataProvider: Image360DataProvider);
     /**
      * Subscribes to events on 360 Image datasets. There are several event types:
      * 'image360Entered' - Subscribes to a event for entering 360 image mode.

package/dist/packages/360-images/src/entity/Image360RevisionEntity.d.ts

@@ -16,6 +16,7 @@ export declare class Image360RevisionEntity implements Image360Revision {
     private _onFullResolutionCompleted;
     private _defaultAppearance;
     private _annotations;
+    private _annotationsPromise;
     private readonly _annotationFilterer;
     constructor(imageProvider: Image360DataProvider, image360Descriptor: Image360Descriptor, image360VisualizationBox: Image360VisualizationBox, annotationFilterer: Image360AnnotationFilter);
     /**

package/dist/packages/data-providers/src/image-360-data-providers/Cdf360ImageEventProvider.d.ts

@@ -2,7 +2,7 @@
  * Copyright 2022 Cognite AS
  */
 import { AnnotationModel, CogniteClient, IdEither, Metadata, CogniteInternalId } from '@cognite/sdk';
-import { Historical360ImageSet, Image360Face, Image360FileDescriptor } from '../types';
+import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360Face, Image360FileDescriptor } from '../types';
 import { Image360Provider } from '../Image360Provider';
 export declare class Cdf360ImageEventProvider implements Image360Provider<Metadata> {
     private readonly _client;
@@ -24,5 +24,6 @@ export declare class Cdf360ImageEventProvider implements Image360Provider<Metada
     }[], abortSignal?: AbortSignal): Promise<ArrayBuffer[]>;
     private getDownloadUrls;
     private parseEventMetadata;
-    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[]): Promise<IdEither[]>;
+    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[], annotationFilter: Image360AnnotationFilterDelegate): Promise<IdEither[]>;
+    private listFileAnnotations;
 }

package/dist/packages/data-providers/src/image-360-data-providers/Local360ImageProvider.d.ts

@@ -1,6 +1,6 @@
 import { Image360Provider } from '../Image360Provider';
-import { Historical360ImageSet, Image360Face, Image360FileDescriptor } from '../types';
-import { AnnotationModel, CogniteInternalId, IdEither } from '@cognite/sdk/dist/src';
+import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360Face, Image360FileDescriptor } from '../types';
+import { AnnotationModel, CogniteInternalId, IdEither } from '@cognite/sdk';
 export declare class Local360ImageProvider implements Image360Provider<unknown> {
     private readonly _modelUrl;
     constructor(modelUrl: string);
@@ -9,5 +9,5 @@ export declare class Local360ImageProvider implements Image360Provider<unknown>
     get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getFilesByAssetRef(_assetId: IdEither): Promise<CogniteInternalId[]>;
-    get360ImageAssets(_image360FileDescriptors: Image360FileDescriptor[]): Promise<IdEither[]>;
+    get360ImageAssets(_image360FileDescriptors: Image360FileDescriptor[], _annotationFilter: Image360AnnotationFilterDelegate): Promise<IdEither[]>;
 }

package/dist/packages/data-providers/src/types.d.ts

@@ -3,6 +3,7 @@
  */
 import { AnnotationModel, CogniteInternalId, IdEither } from '@cognite/sdk';
 import * as THREE from 'three';
+export type Image360AnnotationFilterDelegate = (annotation: AnnotationModel) => boolean;
 export interface JsonFileProvider {
     getJsonFile(baseUrl: string, fileName: string): Promise<any>;
 }
@@ -21,7 +22,7 @@ export interface Image360FileProvider {
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
 }
 export interface Image360AssetProvider {
-    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[]): Promise<IdEither[]>;
+    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[], annotationFilter: Image360AnnotationFilterDelegate): Promise<IdEither[]>;
 }
 export type Historical360ImageSet = Image360EventDescriptor & {
     imageRevisions: Image360Descriptor[];

package/dist/packages/rendering/src/pointcloud-rendering/PointCloudMaterial.d.ts

@@ -1,8 +1,10 @@
 /*!
  * Adapted from pnext/three-loader (https://github.com/pnext/three-loader)
  */
-import { Texture } from 'three';
-import { IUniform } from './types';
+import { Camera, RawShaderMaterial, Texture, WebGLRenderer } from 'three';
+import { PointColorType, PointShape, PointSizeType } from './enums';
+import { PointClassification, IUniform, OctreeMaterialParams } from './types';
+import { PointCloudObjectAppearanceTexture } from './PointCloudObjectAppearanceTexture';
 import { PointCloudObjectIdMaps } from './PointCloudObjectIdMaps';
 export interface IPointCloudMaterialParameters {
     size: number;
@@ -34,3 +36,84 @@ export interface IPointCloudMaterialUniforms {
     visibleNodes: IUniform<Texture>;
     vnStart: IUniform<number>;
 }
+export declare class PointCloudMaterial extends RawShaderMaterial {
+    private static readonly helperVec3;
+    /**
+     * Use the drawing buffer size instead of the dom client width and height when passing the screen height and screen width uniforms to the
+     * shader. This is useful if you have offscreen canvases (which in some browsers return 0 as client width and client height).
+     */
+    useDrawingBufferSize: boolean;
+    lights: boolean;
+    fog: boolean;
+    visibleNodesTexture: Texture | undefined;
+    visibleNodeTextureOffsets: Map<string, number>;
+    private readonly _gradient;
+    private gradientTexture;
+    private _objectAppearanceTexture;
+    private _classification;
+    private classificationTexture;
+    uniforms: IPointCloudMaterialUniforms & Record<string, IUniform<any>>;
+    accessor fov: number;
+    accessor heightMax: number;
+    accessor heightMin: number;
+    accessor intensityBrightness: number;
+    accessor intensityContrast: number;
+    accessor intensityGamma: number;
+    accessor intensityRange: [number, number];
+    accessor maxSize: number;
+    accessor minSize: number;
+    accessor octreeSize: number;
+    accessor screenHeight: number;
+    accessor screenWidth: number;
+    accessor size: number;
+    accessor spacing: number;
+    accessor weighted: boolean;
+    accessor hqDepthPass: boolean;
+    accessor pointColorType: PointColorType;
+    accessor pointSizeType: PointSizeType;
+    accessor useEDL: boolean;
+    accessor shape: PointShape;
+    attributes: {
+        position: {
+            type: string;
+            value: never[];
+        };
+        color: {
+            type: string;
+            value: never[];
+        };
+        intensity: {
+            type: string;
+            value: never[];
+        };
+        classification: {
+            type: string;
+            value: never[];
+        };
+        objectId: {
+            type: string;
+            value: never[];
+        };
+        indices: {
+            type: string;
+            value: never[];
+        };
+    };
+    constructor(parameters?: Partial<IPointCloudMaterialParameters>);
+    dispose(): void;
+    clearVisibleNodeTextureOffsets(): void;
+    updateShaderSource(): void;
+    applyDefines(shaderSrc: string): string;
+    get objectAppearanceTexture(): PointCloudObjectAppearanceTexture;
+    set objectAppearanceTexture(texture: PointCloudObjectAppearanceTexture);
+    get classification(): PointClassification;
+    set classification(value: PointClassification);
+    private recomputeClassification;
+    get elevationRange(): [number, number];
+    set elevationRange(value: [number, number]);
+    getUniform<K extends keyof IPointCloudMaterialUniforms>(name: K): IPointCloudMaterialUniforms[K]['value'];
+    setUniform<K extends keyof IPointCloudMaterialUniforms>(name: K, value: IPointCloudMaterialUniforms[K]['value']): void;
+    onBeforeRender(renderer: WebGLRenderer): void;
+    updateMaterial(octreeParams: OctreeMaterialParams, visibilityTextureData: Uint8Array, camera: Camera): void;
+    private updateVisibilityTextureData;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.3.1",
+  "version": "4.3.2-dev.20230613",
   "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": {
@@ -75,8 +75,8 @@
     "random-seed": "0.3.0",
     "rxjs": "7.8.1",
     "skmeans": "0.11.3",
-    "sparse-octree": "7.1.6",
-    "three-stdlib": "2.23.4"
+    "sparse-octree": "7.1.8",
+    "three-stdlib": "2.23.7"
   },
   "devDependencies": {
     "@azure/msal-browser": "2.37.0",
@@ -85,7 +85,7 @@
     "@types/dat.gui": "0.7.10",
     "@types/gl": "^6.0.2",
     "@types/glob": "8.1.0",
-    "@types/jest": "29.5.1",
+    "@types/jest": "29.5.2",
     "@types/jest-environment-puppeteer": "5.0.3",
     "@types/jest-image-snapshot": "6.1.0",
     "@types/jsdom": "21.1.1",
@@ -97,12 +97,12 @@
     "@types/stats": "0.16.30",
     "@types/three": "0.152.1",
     "@types/tween.js": "18.5.1",
-    "@typescript-eslint/eslint-plugin": "5.59.7",
-    "@typescript-eslint/parser": "5.59.7",
-    "concurrently": "8.0.1",
+    "@typescript-eslint/eslint-plugin": "5.59.8",
+    "@typescript-eslint/parser": "5.59.8",
+    "concurrently": "8.1.0",
     "cross-env": "7.0.3",
     "dat.gui": "0.7.9",
-    "eslint": "8.41.0",
+    "eslint": "8.42.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "44.2.7",
@@ -119,13 +119,13 @@
     "jest-environment-jsdom": "29.5.0",
     "jest-extended": "3.2.4",
     "jest-image-snapshot": "6.1.0",
-    "jest-puppeteer": "8.0.6",
+    "jest-puppeteer": "9.0.0",
     "jsdom": "22.1.0",
     "moq.ts": "10.0.6",
     "nock": "13.3.1",
     "prettier": "2.8.8",
     "process": "0.11.10",
-    "puppeteer": "20.4.0",
+    "puppeteer": "20.5.0",
     "random-seed": "0.3.0",
     "raw-loader": "4.0.2",
     "remove-files-webpack-plugin": "1.5.0",
@@ -136,10 +136,10 @@
     "ts-jest": "29.1.0",
     "ts-loader": "9.4.3",
     "tsc-alias": "1.8.6",
-    "typescript": "5.0.4",
+    "typescript": "5.1.3",
     "wasm-pack": "0.11.1",
-    "webpack": "5.84.1",
-    "webpack-cli": "5.1.1",
+    "webpack": "5.85.0",
+    "webpack-cli": "5.1.3",
     "webpack-dev-server": "4.15.0",
     "webpack-node-externals": "3.0.0",
     "whatwg-fetch": "3.6.2",
@@ -157,5 +157,5 @@
   "files": [
     "./dist/*"
   ],
-  "packageManager": "yarn@3.5.1"
+  "packageManager": "yarn@3.6.0"
 }