@cognite/reveal 4.2.0-dev.20230420 → 4.2.0-dev.20230421

package/dist/packages/360-images/index.d.ts

@@ -9,5 +9,5 @@ export { Image360CollectionFactory } from './src/collection/Image360CollectionFa
 export { Image360Entity } from './src/entity/Image360Entity';
 export { Image360RevisionEntity } from './src/entity/Image360RevisionEntity';
 export { Image360Visualization } from './src/entity/Image360Visualization';
-export { Image360EnteredDelegate, Image360ExitedDelegate } from './src/types';
+export { Image360EnteredDelegate, Image360ExitedDelegate, Image360AnnotationHoveredDelegate } from './src/types';
 export { DefaultImage360Collection } from './src/collection/DefaultImage360Collection';

package/dist/packages/360-images/src/annotation/ImageAnnotationObject.d.ts

@@ -0,0 +1,19 @@
+/*!
+ * Copyright 2022 Cognite AS
+ */
+import { AnnotationData, AnnotationModel, AnnotationsObjectDetection } from '@cognite/sdk';
+import { Image360FileDescriptor } from '../../../data-providers';
+import { Object3D } from 'three';
+export declare class ImageAnnotationObject {
+    private readonly _annotation;
+    private readonly _fileDescriptor;
+    private readonly _mesh;
+    get annotation(): AnnotationModel;
+    get face(): Image360FileDescriptor['face'];
+    constructor(annotation: AnnotationModel, fileDescriptor: Image360FileDescriptor);
+    private initializeMesh;
+    private getRotationFromFace;
+    private initializeTransform;
+    getObject(): Object3D;
+}
+export declare function isAnnotationsObject(annotation: AnnotationData): annotation is AnnotationsObjectDetection;

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

@@ -4,8 +4,9 @@
 import { EventTrigger } from '../../../utilities';
 import { Image360Collection } from './Image360Collection';
 import { Image360Entity } from '../entity/Image360Entity';
-import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
+import { Image360AnnotationHoveredDelegate, Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 import { IconCollection, IconCullingScheme } from '../icons/IconCollection';
+import { ImageAnnotationObject } from '../annotation/ImageAnnotationObject';
 /**
  * Default implementation of {@link Image360Collection}. Used for events when entering
  * and exiting 360 image mode
@@ -33,6 +34,7 @@ export declare class DefaultImage360Collection implements Image360Collection {
     get events(): {
         image360Entered: EventTrigger<Image360EnteredDelegate>;
         image360Exited: EventTrigger<Image360ExitedDelegate>;
+        annotationHovered: EventTrigger<Image360AnnotationHoveredDelegate>;
     };
     get isCollectionVisible(): boolean;
     constructor(collectionId: string, entities: Image360Entity[], icons: IconCollection);
@@ -45,6 +47,7 @@ export declare class DefaultImage360Collection implements Image360Collection {
      */
     on(event: 'image360Entered', callback: Image360EnteredDelegate): void;
     on(event: 'image360Exited', callback: Image360ExitedDelegate): void;
+    on(event: 'image360AnnotationHovered', callback: Image360AnnotationHoveredDelegate): void;
     /**
      * Specify parameters used to determine the number of icons that are visible when entering 360 Images.
      * @param radius Only icons within the given radius will be made visible.
@@ -63,6 +66,8 @@ export declare class DefaultImage360Collection implements Image360Collection {
      */
     off(event: 'image360Entered', callback: Image360EnteredDelegate): void;
     off(event: 'image360Exited', callback: Image360ExitedDelegate): void;
+    off(event: 'image360AnnotationHovered', callback: Image360AnnotationHoveredDelegate): void;
+    fireHoverEvent(annotationObject: ImageAnnotationObject): void;
     setSelectedVisibility(visible: boolean): void;
     setCullingScheme(scheme: IconCullingScheme): void;
     remove(entity: Image360Entity): void;

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

@@ -2,7 +2,7 @@
  * Copyright 2022 Cognite AS
  */
 import { Image360 } from './../entity/Image360';
-import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
+import { Image360AnnotationHoveredDelegate, Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 /**
  * A wrapper that represents a set of 360 images.
  */
@@ -31,11 +31,13 @@ export interface Image360Collection {
      * Subscribes to events on 360 Image datasets. There are several event types:
      * 'image360Entered' - Subscribes to a event for entering 360 image mode.
      * 'image360Exited' - Subscribes to events indicating 360 image mode has exited.
+     * 'image360AnnotationHovered - Subscribes to events indicating that the cursor hovered over a 2D image annotation.
      * @param event The event type.
      * @param callback Callback to be called when the event is fired.
      */
     on(event: 'image360Entered', callback: Image360EnteredDelegate): void;
     on(event: 'image360Exited', callback: Image360ExitedDelegate): void;
+    on(event: 'image360AnnotationHovered', callback: Image360AnnotationHoveredDelegate): void;
     /**
      * Unsubscribes from 360 image dataset event.
      * @param event The event type.
@@ -43,4 +45,5 @@ export interface Image360Collection {
      */
     off(event: 'image360Entered', callback: Image360EnteredDelegate): void;
     off(event: 'image360Exited', callback: Image360ExitedDelegate): void;
+    off(event: 'image360AnnotationHovered', callback: Image360AnnotationHoveredDelegate): void;
 }

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

@@ -2,12 +2,13 @@
  * Copyright 2022 Cognite AS
  */
 import { SceneHandler } from '../../../utilities';
-import { Image360FileProvider } from '../../../data-providers';
+import { Image360DataProvider } from '../../../data-providers';
 import { Image360Icon } from '../icons/Image360Icon';
 import { Image360, Image360Metadata } from './Image360';
 import { Historical360ImageSet } from '../../../data-providers/src/types';
 import { Image360RevisionEntity } from './Image360RevisionEntity';
 import { Image360VisualizationBox } from './Image360VisualizationBox';
+import { ImageAnnotationObject } from '../annotation/ImageAnnotationObject';
 export declare class Image360Entity implements Image360 {
     private readonly _revisions;
     private readonly _imageMetadata;
@@ -32,7 +33,7 @@ export declare class Image360Entity implements Image360 {
      * @returns Image360Visualization
      */
     get image360Visualization(): Image360VisualizationBox;
-    constructor(image360Metadata: Historical360ImageSet, sceneHandler: SceneHandler, imageProvider: Image360FileProvider, transform: THREE.Matrix4, icon: Image360Icon);
+    constructor(image360Metadata: Historical360ImageSet, sceneHandler: SceneHandler, imageProvider: Image360DataProvider, transform: THREE.Matrix4, icon: Image360Icon);
     /**
      * List all historical images for this entity.
      * @returns A list of available revisions.
@@ -50,6 +51,7 @@ export declare class Image360Entity implements Image360 {
      * If all revisions are undated the first available revison is returned.
      */
     getRevisionClosestToDate(date: Date): Image360RevisionEntity;
+    intersectAnnotations(raycaster: THREE.Raycaster): ImageAnnotationObject | undefined;
     /**
      * Drops the GPU resources for the 360 image
      */

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

@@ -1,21 +1,26 @@
 /*!
  * Copyright 2022 Cognite AS
  */
-import { Image360Descriptor, Image360FileProvider } from '../../../data-providers';
+import { Image360DataProvider, Image360Descriptor } from '../../../data-providers';
 import { Image360Revision } from './Image360Revision';
 import { Image360VisualizationBox } from './Image360VisualizationBox';
+import { ImageAnnotationObject } from '../annotation/ImageAnnotationObject';
 export declare class Image360RevisionEntity implements Image360Revision {
     private readonly _imageProvider;
     private readonly _image360Descriptor;
     private readonly _image360VisualzationBox;
     private _textures;
     private _getFullResolutionTextures;
-    constructor(imageProvider: Image360FileProvider, image360Descriptor: Image360Descriptor, image360VisualzationBox: Image360VisualizationBox);
+    private _annotations;
+    constructor(imageProvider: Image360DataProvider, image360Descriptor: Image360Descriptor, image360VisualzationBox: Image360VisualizationBox);
     /**
      * The date of this revision. Undefined if the revison is undated.
      * @returns Date | undefined
      */
     get date(): Date | undefined;
+    get annotations(): ImageAnnotationObject[];
+    intersectAnnotations(raycaster: THREE.Raycaster): ImageAnnotationObject | undefined;
+    private createQuadFromAnnotation;
     /**
      * Loads the textures needed for the 360 image (6 faces).
      *
@@ -31,6 +36,7 @@ export declare class Image360RevisionEntity implements Image360Revision {
         firstCompleted: Promise<void>;
         fullResolutionCompleted: Promise<void>;
     };
+    private loadAnnotations;
     /**
      * Clear the cached textures used by this revision.
      */

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

@@ -5,6 +5,7 @@ import * as THREE from 'three';
 import { SceneHandler } from '../../../utilities';
 import { Image360Face, Image360Texture } from '../../../data-providers';
 import { Image360Visualization } from './Image360Visualization';
+import { ImageAnnotationObject } from '../annotation/ImageAnnotationObject';
 export declare class Image360VisualizationBox implements Image360Visualization {
     private readonly _worldTransform;
     private _visualizationMesh;
@@ -13,12 +14,15 @@ export declare class Image360VisualizationBox implements Image360Visualization {
     private readonly _visualizationState;
     private readonly _textureLoader;
     private readonly _faceMaterialOrder;
+    private readonly _meshLoadPromise;
+    private readonly _annotationsLoadPromise;
     get opacity(): number;
     set opacity(alpha: number);
     get visible(): boolean;
     set visible(isVisible: boolean);
     set scale(newScale: THREE.Vector3);
     set renderOrder(newRenderOrder: number);
+    setAnnotations(annotations: ImageAnnotationObject[]): void;
     constructor(worldTransform: THREE.Matrix4, sceneHandler: SceneHandler);
     loadImages(textures: Image360Texture[]): void;
     loadFaceTextures(faces: Image360Face[]): Promise<Image360Texture[]>;

package/dist/packages/360-images/src/types.d.ts

@@ -1,6 +1,7 @@
 /*!
  * Copyright 2023 Cognite AS
  */
+import { AnnotationModel } from '@cognite/sdk';
 import { Image360 } from './entity/Image360';
 import { Image360Revision } from './entity/Image360Revision';
 /**
@@ -11,3 +12,7 @@ export type Image360EnteredDelegate = (image360: Image360, revision: Image360Rev
  * Delegate for 360 image mode exited events.
  */
 export type Image360ExitedDelegate = () => void;
+/**
+ * Delegate for 360 image annotation hover events
+ */
+export type Image360AnnotationHoveredDelegate = (annotation: AnnotationModel) => void;

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

@@ -10,6 +10,7 @@ export declare class Image360ApiHelper {
     private readonly _image360Facade;
     private readonly _domElement;
     private _transitionInProgress;
+    private readonly _raycaster;
     private readonly _interactionState;
     private readonly _eventHandlers;
     private readonly _debouncePreLoad;
@@ -19,6 +20,8 @@ export declare class Image360ApiHelper {
     private readonly _onBeforeSceneRenderedEvent;
     private _cachedCameraManager;
     constructor(cogniteClient: CogniteClient, sceneHandler: SceneHandler, domElement: HTMLElement, activeCameraManager: ProxyCameraManager, inputHandler: InputHandler, requestRedraw: () => void, onBeforeSceneRendered: EventTrigger<BeforeSceneRenderedDelegate>);
+    private getNormalizedOffset;
+    private handleAnnotationHover;
     add360ImageSet(eventFilter: Metadata, collectionTransform: THREE.Matrix4, preMultipliedRotation: boolean): Promise<Image360Collection>;
     remove360Images(entities: Image360[]): Promise<void>;
     enter360Image(image360Entity: Image360Entity, revision?: Image360RevisionEntity): Promise<void>;

package/dist/packages/data-providers/index.d.ts

@@ -17,5 +17,5 @@ export { PointCloudStylableObjectProvider } from './src/PointCloudStylableObject
 export { StylableObject, SerializableStylableObject } from './src/pointcloud-stylable-object-providers/StylableObject';
 export { CdfPointCloudStylableObjectProvider } from './src/pointcloud-stylable-object-providers/CdfPointCloudStylableObjectProvider';
 export { DummyPointCloudStylableObjectProvider } from './src/pointcloud-stylable-object-providers/DummyPointCloudStylableObjectProvider';
-export { Image360Provider } from './src/Image360Provider';
-export { BinaryFileProvider, JsonFileProvider, File3dFormat, BlobOutputMetadata, Image360Descriptor, Image360FileProvider, Image360Face, Image360Texture } from './src/types';
+export { Image360Provider, Image360DataProvider } from './src/Image360Provider';
+export { BinaryFileProvider, JsonFileProvider, File3dFormat, BlobOutputMetadata, Image360Descriptor, Image360FileProvider, Image360Face, Image360Texture, Image360FileDescriptor } from './src/types';

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

@@ -1,6 +1,8 @@
 /*!
  * Copyright 2022 Cognite AS
  */
-import { Image360DescriptorProvider, Image360FileProvider } from './types';
-export interface Image360Provider<T> extends Image360DescriptorProvider<T>, Image360FileProvider {
+import { Image360DescriptorProvider, Image360FileProvider, Image360AnnotationProvider } from './types';
+export interface Image360Provider<T> extends Image360DescriptorProvider<T>, Image360DataProvider {
+}
+export interface Image360DataProvider extends Image360FileProvider, Image360AnnotationProvider {
 }

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

@@ -1,13 +1,14 @@
 /*!
  * Copyright 2022 Cognite AS
  */
-import { CogniteClient, Metadata } from '@cognite/sdk';
+import { AnnotationModel, CogniteClient, Metadata } from '@cognite/sdk';
 import { Historical360ImageSet, Image360Face, Image360FileDescriptor } from '../types';
 import { Image360Provider } from '../Image360Provider';
 export declare class Cdf360ImageEventProvider implements Image360Provider<Metadata> {
     private readonly _client;
     constructor(client: CogniteClient);
     get360ImageDescriptors(metadataFilter: Metadata, preMultipliedRotation: boolean): Promise<Historical360ImageSet[]>;
+    get360ImageAnnotations(descriptors: Image360FileDescriptor[]): Promise<AnnotationModel[]>;
     get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     private getFileIds;

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

@@ -1,9 +1,11 @@
 import { Image360Provider } from '../Image360Provider';
 import { Historical360ImageSet, Image360Face, Image360FileDescriptor } from '../types';
+import { AnnotationModel } from '@cognite/sdk/dist/src';
 export declare class Local360ImageProvider implements Image360Provider<unknown> {
     private readonly _modelUrl;
     constructor(modelUrl: string);
     get360ImageDescriptors(): Promise<Historical360ImageSet[]>;
+    get360ImageAnnotations(_descriptors: Image360FileDescriptor[]): Promise<AnnotationModel[]>;
     get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
 }

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

@@ -1,6 +1,7 @@
 /*!
  * Copyright 2021 Cognite AS
  */
+import { AnnotationModel } from '@cognite/sdk';
 import * as THREE from 'three';
 export interface JsonFileProvider {
     getJsonFile(baseUrl: string, fileName: string): Promise<any>;
@@ -8,6 +9,9 @@ export interface JsonFileProvider {
 export interface BinaryFileProvider {
     getBinaryFile(baseUrl: string, fileName: string, abortSignal?: AbortSignal): Promise<ArrayBuffer>;
 }
+export interface Image360AnnotationProvider {
+    get360ImageAnnotations(descriptors: Image360FileDescriptor[]): Promise<AnnotationModel[]>;
+}
 export interface Image360DescriptorProvider<T> {
     get360ImageDescriptors(metadataFilter: T, preMultipliedRotation: boolean): Promise<Historical360ImageSet[]>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.2.0-dev.20230420",
+  "version": "4.2.0-dev.20230421",
   "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,13 +78,13 @@
     "three-stdlib": "2.21.8"
   },
   "devDependencies": {
-    "@azure/msal-browser": "2.35.0",
+    "@azure/msal-browser": "2.36.0",
     "@cognite/sdk": "8.0.0",
     "@microsoft/api-extractor": "^7.33.6",
     "@types/dat.gui": "0.7.9",
     "@types/gl": "^6.0.2",
     "@types/glob": "8.1.0",
-    "@types/jest": "29.5.0",
+    "@types/jest": "29.5.1",
     "@types/jest-environment-puppeteer": "5.0.3",
     "@types/jest-image-snapshot": "6.1.0",
     "@types/jsdom": "21.1.1",
@@ -96,15 +96,15 @@
     "@types/stats": "0.16.30",
     "@types/three": "0.150.0",
     "@types/tween.js": "18.5.1",
-    "@typescript-eslint/eslint-plugin": "5.58.0",
-    "@typescript-eslint/parser": "5.58.0",
+    "@typescript-eslint/eslint-plugin": "5.59.0",
+    "@typescript-eslint/parser": "5.59.0",
     "concurrently": "8.0.1",
     "cross-env": "7.0.3",
     "dat.gui": "0.7.9",
     "eslint": "8.38.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-jsdoc": "40.1.1",
+    "eslint-plugin-jsdoc": "43.0.6",
     "eslint-plugin-lodash": "7.4.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-unused-imports": "2.0.0",
@@ -112,7 +112,7 @@
     "gl": "6.0.2",
     "glob": "10.2.1",
     "glslify-loader": "2.0.0",
-    "html-webpack-plugin": "5.5.0",
+    "html-webpack-plugin": "5.5.1",
     "jest": "29.5.0",
     "jest-canvas-mock": "2.5.0",
     "jest-environment-jsdom": "29.5.0",
@@ -139,7 +139,7 @@
     "wasm-pack": "0.10.3",
     "webpack": "5.78.0",
     "webpack-cli": "5.0.1",
-    "webpack-dev-server": "4.13.2",
+    "webpack-dev-server": "4.13.3",
     "webpack-node-externals": "3.0.0",
     "whatwg-fetch": "3.6.2",
     "workerize-loader": "2.0.2"