@cognite/reveal 4.2.0-dev.20230509 → 4.2.0-dev.20230511

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

@@ -9,7 +9,8 @@ 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, Image360AnnotationHoveredDelegate, Image360AnnotationClickedDelegate } from './src/types';
+export { Image360EnteredDelegate, Image360ExitedDelegate } from './src/types';
 export { Image360AnnotationAppearance } from './src/annotation/types';
+export { Image360AnnotationIntersection } from './src/annotation/Image360AnnotationIntersection';
 export { Image360Annotation } from './src/annotation/Image360Annotation';
 export { DefaultImage360Collection } from './src/collection/DefaultImage360Collection';

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

@@ -3,11 +3,11 @@
  */
 import { ImageAnnotationObjectData } from './ImageAnnotationData';
 import { BufferGeometry, Matrix4, PlaneGeometry } from 'three';
-import { AnnotationsBoundingBox, AnnotationsObjectDetection } from '@cognite/sdk';
+import { AnnotationsBoundingBox } from '@cognite/sdk';
 export declare class BoxAnnotationData implements ImageAnnotationObjectData {
     private readonly _geometry;
     private readonly _initialTranslation;
-    constructor(annotation: AnnotationsObjectDetection);
+    constructor(annotationsBox: AnnotationsBoundingBox);
     createGeometry(annotationsBox: AnnotationsBoundingBox): PlaneGeometry;
     getGeometry(): BufferGeometry;
     getNormalizationMatrix(): Matrix4;

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

@@ -0,0 +1,22 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import { Image360Annotation } from './Image360Annotation';
+import { Vector3 } from 'three';
+/**
+ * Describes an intersection with a 360 image annotation
+ */
+export type Image360AnnotationIntersection = {
+    /**
+     * The intersection type.
+     */
+    type: 'image360Annotation';
+    /**
+     * The intersected annotation
+     */
+    annotation: Image360Annotation;
+    /**
+     * The world direction from the camera to the intersection point
+     */
+    direction: Vector3;
+};

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

@@ -15,6 +15,7 @@ export declare class ImageAnnotationObject implements Image360Annotation {
     private readonly _appearance;
     get annotation(): AnnotationModel;
     static createAnnotationObject(annotation: AnnotationModel, face: FaceType): ImageAnnotationObject | undefined;
+    private static createObjectData;
     private constructor();
     private getRotationFromFace;
     private initializeTransform;

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

@@ -1,14 +1,12 @@
 /*!
  * Copyright 2023 Cognite AS
  */
-import { EventTrigger, PointerEventData } from '../../../utilities';
+import { EventTrigger } from '../../../utilities';
 import { Image360Collection } from './Image360Collection';
 import { Image360Entity } from '../entity/Image360Entity';
-import { Image360AnnotationClickedDelegate, Image360AnnotationHoveredDelegate, Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
+import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 import { IconCollection, IconCullingScheme } from '../icons/IconCollection';
-import { ImageAnnotationObject } from '../annotation/ImageAnnotationObject';
 import { Image360AnnotationAppearance } from '../annotation/types';
-import { Vector3 } from 'three';
 /**
  * Default implementation of {@link Image360Collection}. Used for events when entering
  * and exiting 360 image mode
@@ -38,8 +36,6 @@ export declare class DefaultImage360Collection implements Image360Collection {
     get events(): {
         image360Entered: EventTrigger<Image360EnteredDelegate>;
         image360Exited: EventTrigger<Image360ExitedDelegate>;
-        annotationHovered: EventTrigger<Image360AnnotationHoveredDelegate>;
-        annotationClicked: EventTrigger<Image360AnnotationClickedDelegate>;
     };
     get isCollectionVisible(): boolean;
     constructor(collectionId: string, entities: Image360Entity[], icons: IconCollection);
@@ -52,8 +48,6 @@ export declare class DefaultImage360Collection implements Image360Collection {
      */
     on(event: 'image360Entered', callback: Image360EnteredDelegate): void;
     on(event: 'image360Exited', callback: Image360ExitedDelegate): void;
-    on(event: 'image360AnnotationHovered', callback: Image360AnnotationHoveredDelegate): void;
-    on(event: 'image360AnnotationClicked', callback: Image360AnnotationClickedDelegate): 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.
@@ -72,10 +66,6 @@ export declare class DefaultImage360Collection implements Image360Collection {
      */
     off(event: 'image360Entered', callback: Image360EnteredDelegate): void;
     off(event: 'image360Exited', callback: Image360ExitedDelegate): void;
-    off(event: 'image360AnnotationHovered', callback: Image360AnnotationHoveredDelegate): void;
-    off(event: 'image360AnnotationClicked', callback: Image360AnnotationClickedDelegate): void;
-    fireHoverEvent(annotationObject: ImageAnnotationObject, pointerEvent: PointerEventData, direction: Vector3): void;
-    fireClickEvent(annotationObject: ImageAnnotationObject, pointerEvent: PointerEventData, direction: Vector3): 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 { Image360AnnotationClickedDelegate, Image360AnnotationHoveredDelegate, Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
+import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 import { Image360AnnotationAppearance } from '../annotation/types';
 /**
  * A wrapper that represents a set of 360 images.
@@ -32,15 +32,11 @@ 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 an image annotation.
-     * 'image360AnnotationClicked - Subscribes to events indicating a click on an 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;
-    on(event: 'image360AnnotationClicked', callback: Image360AnnotationClickedDelegate): void;
     /**
      * Unsubscribes from 360 image dataset event.
      * @param event The event type.
@@ -48,8 +44,6 @@ export interface Image360Collection {
      */
     off(event: 'image360Entered', callback: Image360EnteredDelegate): void;
     off(event: 'image360Exited', callback: Image360ExitedDelegate): void;
-    off(event: 'image360AnnotationHovered', callback: Image360AnnotationHoveredDelegate): void;
-    off(event: 'image360AnnotationClicked', callback: Image360AnnotationClickedDelegate): void;
     /**
      * Assign a default style which affects all annotations
      */

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

@@ -3,9 +3,6 @@
  */
 import { Image360 } from './entity/Image360';
 import { Image360Revision } from './entity/Image360Revision';
-import { Image360Annotation } from './annotation/Image360Annotation';
-import { PointerEventData } from '../../utilities';
-import { Vector3 } from 'three';
 /**
  * Delegate for 360 image mode entered events.
  */
@@ -14,11 +11,3 @@ 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: Image360Annotation, pointerEvent: PointerEventData, direction: Vector3) => void;
-/**
- * Delegate for 360 image annotation click events
- */
-export type Image360AnnotationClickedDelegate = (annotation: Image360Annotation, pointerEvent: PointerEventData, direction: Vector3) => void;

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

@@ -3,7 +3,7 @@
  */
 import * as THREE from 'three';
 import { CogniteClient, Metadata } from '@cognite/sdk';
-import { Image360Collection, Image360Entity, Image360, Image360RevisionEntity } from '../../../360-images';
+import { Image360Collection, Image360Entity, Image360, Image360RevisionEntity, Image360AnnotationIntersection } from '../../../360-images';
 import { BeforeSceneRenderedDelegate, EventTrigger, InputHandler, SceneHandler } from '../../../utilities';
 import { ProxyCameraManager } from '../../../camera-manager';
 export declare class Image360ApiHelper {
@@ -23,7 +23,6 @@ export declare class Image360ApiHelper {
     get needsRedraw(): boolean;
     resetRedraw(): void;
     private getNormalizedOffset;
-    private handleAnnotationCursorEvent;
     add360ImageSet(eventFilter: Metadata, collectionTransform: THREE.Matrix4, preMultipliedRotation: boolean): Promise<Image360Collection>;
     remove360Images(entities: Image360[]): Promise<void>;
     enter360Image(image360Entity: Image360Entity, revision?: Image360RevisionEntity): Promise<void>;
@@ -37,6 +36,7 @@ export declare class Image360ApiHelper {
     private findRevisionIdToEnter;
     private enter360ImageOnIntersect;
     intersect360ImageIcons(offsetX: number, offsetY: number): Image360Entity | undefined;
+    intersect360ImageAnnotations(offsetX: number, offsetY: number): Image360AnnotationIntersection | undefined;
     private setHoverIconOnIntersect;
     private exit360ImageOnEscape;
 }

package/dist/packages/api/src/public/migration/Cognite3DViewer.d.ts

@@ -10,7 +10,7 @@ import { CogniteModel } from '../types';
 import { ViewerState } from '../../utilities/ViewStateHelper';
 import { CameraManager, CameraChangeDelegate, CameraStopDelegate } from '../../../../camera-manager';
 import { SupportedModelTypes } from '../../../../model-base';
-import { Image360Collection, Image360, Image360Revision } from '../../../../360-images';
+import { Image360Collection, Image360, Image360Revision, Image360AnnotationIntersection } from '../../../../360-images';
 /**
  * @example
  * ```js
@@ -559,6 +559,14 @@ export declare class Cognite3DViewer {
      * ```
      */
     getIntersectionFromPixel(offsetX: number, offsetY: number): Promise<null | Intersection>;
+    /**
+     * Check for intersections with 360 annotations through the given pixel.
+     * Similar to {getIntersectionFromPixel}, but checks 360 image annotations
+     * instead of models.
+     * @param offsetX
+     * @param offsetY
+     */
+    get360AnnotationIntersectionFromPixel(offsetX: number, offsetY: number): Promise<null | Image360AnnotationIntersection>;
     /** @private */
     private getModels;
     /**

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

@@ -13,7 +13,7 @@ export type PointCloudIntersection = {
      */
     model: CognitePointCloudModel;
     /**
-     * Tree index of the intersected 3D node.
+     * Coordinate of the intersection.
      */
     point: THREE.Vector3;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.2.0-dev.20230509",
+  "version": "4.2.0-dev.20230511",
   "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": {
@@ -79,10 +79,10 @@
     "three-stdlib": "2.21.11"
   },
   "devDependencies": {
-    "@azure/msal-browser": "2.36.0",
+    "@azure/msal-browser": "2.37.0",
     "@cognite/sdk": "8.1.1",
     "@microsoft/api-extractor": "^7.33.6",
-    "@types/dat.gui": "0.7.9",
+    "@types/dat.gui": "0.7.10",
     "@types/gl": "^6.0.2",
     "@types/glob": "8.1.0",
     "@types/jest": "29.5.1",
@@ -91,7 +91,7 @@
     "@types/jsdom": "21.1.1",
     "@types/lodash": "4.14.194",
     "@types/mixpanel-browser": "2.38.1",
-    "@types/node": "18.16.3",
+    "@types/node": "18.16.5",
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.4",
     "@types/stats": "0.16.30",
@@ -102,7 +102,7 @@
     "concurrently": "8.0.1",
     "cross-env": "7.0.3",
     "dat.gui": "0.7.9",
-    "eslint": "8.39.0",
+    "eslint": "8.40.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "43.1.1",
@@ -138,7 +138,7 @@
     "tsc-alias": "1.8.6",
     "typescript": "5.0.4",
     "wasm-pack": "0.10.3",
-    "webpack": "5.81.0",
+    "webpack": "5.82.0",
     "webpack-cli": "5.0.2",
     "webpack-dev-server": "4.13.3",
     "webpack-node-externals": "3.0.0",