@cognite/reveal 4.2.0-dev.20230427 → 4.2.0-dev.20230428

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

@@ -10,4 +10,6 @@ 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 { Image360AnnotationAppearance } from './src/annotation/types';
+export { Image360Annotation } from './src/annotation/Image360Annotation';
 export { DefaultImage360Collection } from './src/collection/DefaultImage360Collection';

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

@@ -0,0 +1,22 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import { Color } from 'three';
+import { AnnotationModel } from '@cognite/sdk';
+/**
+ * An annotation associated with a 360 image revision
+ */
+export interface Image360Annotation {
+    /**
+     * The underlying CDF annotation
+     */
+    readonly annotation: AnnotationModel;
+    /**
+     * Set the display color of this annotation. Default: Color(1, 1, 0)
+     */
+    setColor(color?: Color): void;
+    /**
+     * Set whether this annotation should be visible. Default: true
+     */
+    setVisibility(visible?: boolean): void;
+}

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

@@ -3,16 +3,25 @@
  */
 import { AnnotationModel } from '@cognite/sdk';
 import { Image360FileDescriptor } from '../../../data-providers';
-import { Object3D } from 'three';
+import { Color, Object3D } from 'three';
+import { Image360Annotation } from './Image360Annotation';
+import { Image360AnnotationAppearance } from './types';
 type FaceType = Image360FileDescriptor['face'];
-export declare class ImageAnnotationObject {
+export declare class ImageAnnotationObject implements Image360Annotation {
     private readonly _annotation;
     private readonly _mesh;
+    private readonly _material;
+    private _defaultAppearance;
+    private readonly _appearance;
     get annotation(): AnnotationModel;
     static createAnnotationObject(annotation: AnnotationModel, face: FaceType): ImageAnnotationObject | undefined;
     private constructor();
     private getRotationFromFace;
     private initializeTransform;
     getObject(): Object3D;
+    updateMaterial(): void;
+    setDefaultStyle(appearance: Image360AnnotationAppearance): void;
+    setColor(color?: Color): void;
+    setVisibility(visible?: boolean): void;
 }
 export {};

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

@@ -0,0 +1,17 @@
+/*!
+ * Copyright 2023 Cognite AS
+ */
+import { Color } from 'three';
+/**
+ * The appearance of a 360 image annotation
+ */
+export type Image360AnnotationAppearance = {
+    /**
+     * The color of the annotation. Default: THREE.Color(1, 1, 0)
+     */
+    color?: Color;
+    /**
+     * Whether the annotation is visible. Default: true
+     */
+    visibility?: boolean;
+};

package/dist/packages/360-images/src/cache/Image360LoadingCache.d.ts

@@ -6,14 +6,13 @@ import { Image360RevisionEntity } from '../entity/Image360RevisionEntity';
 export type DownloadRequest = {
     entity: Image360Entity;
     revision: Image360RevisionEntity;
-    firstCompleted: Promise<void>;
-    fullResolutionCompleted: Promise<void>;
+    anyCompleted: Promise<void>;
+    allCompleted: Promise<void>;
     abort: () => void;
 };
 export type Loaded360Image = {
     entity: Image360Entity;
     revision: Image360RevisionEntity;
-    isFullResolution: boolean;
 };
 export declare class Image360LoadingCache {
     private readonly _imageCacheSize;
@@ -27,8 +26,11 @@ export declare class Image360LoadingCache {
     constructor(_imageCacheSize?: number, _downloadCacheSize?: number);
     cachedPreload(entity: Image360Entity, revision: Image360RevisionEntity, lockDownload?: boolean): Promise<void>;
     purge(entity: Image360Entity): Promise<void>;
+    private cacheWhenAllComplete;
+    private purgeFromInProgressDownloads;
     private addRevisionToCache;
     private abortLastRecentlyReqestedRevision;
+    private purgeRevision;
     private createAbortSignal;
     private isRevisionVisible;
 }

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

@@ -7,6 +7,7 @@ import { Image360Entity } from '../entity/Image360Entity';
 import { Image360AnnotationClickedDelegate, Image360AnnotationHoveredDelegate, Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 import { IconCollection, IconCullingScheme } from '../icons/IconCollection';
 import { ImageAnnotationObject } from '../annotation/ImageAnnotationObject';
+import { Image360AnnotationAppearance } from '../annotation/types';
 /**
  * Default implementation of {@link Image360Collection}. Used for events when entering
  * and exiting 360 image mode
@@ -22,6 +23,7 @@ export declare class DefaultImage360Collection implements Image360Collection {
      */
     private _targetRevisionDate;
     private _needsRedraw;
+    private _defaultStyle;
     private readonly _events;
     private readonly _icons;
     private _isCollectionVisible;
@@ -79,4 +81,6 @@ export declare class DefaultImage360Collection implements Image360Collection {
     dispose(): void;
     get needsRedraw(): boolean;
     resetRedraw(): void;
+    get defaultStyle(): Image360AnnotationAppearance;
+    setDefaultStyle(defaultStyle: Image360AnnotationAppearance): void;
 }

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

@@ -3,6 +3,7 @@
  */
 import { Image360 } from './../entity/Image360';
 import { Image360AnnotationClickedDelegate, Image360AnnotationHoveredDelegate, Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
+import { Image360AnnotationAppearance } from '../annotation/types';
 /**
  * A wrapper that represents a set of 360 images.
  */
@@ -49,4 +50,8 @@ export interface Image360Collection {
     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
+     */
+    setDefaultStyle(appearance: Image360AnnotationAppearance): void;
 }

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

@@ -45,6 +45,7 @@ export declare class Image360Entity implements Image360 {
      */
     getActiveRevision(): Image360RevisionEntity;
     setActiveRevision(revision: Image360RevisionEntity): void;
+    applyFullResolutionTextures(): Promise<void>;
     getMostRecentRevision(): Image360RevisionEntity;
     /**
      * Get the revision closest to the provided date.

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

@@ -1,6 +1,7 @@
 /*!
  * Copyright 2022 Cognite AS
  */
+import { Image360Annotation } from '../annotation/Image360Annotation';
 /**
  * Interface used to manage historical revisions of {@link Image360}.
  * One instance represents one specific image revision.
@@ -11,4 +12,8 @@ export interface Image360Revision {
      * @returns Date | undefined
      */
     readonly date: Date | undefined;
+    /**
+     * The annotations associated with this revision
+     */
+    annotations: Image360Annotation[];
 }

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

@@ -9,8 +9,9 @@ export declare class Image360RevisionEntity implements Image360Revision {
     private readonly _imageProvider;
     private readonly _image360Descriptor;
     private readonly _image360VisualzationBox;
-    private _textures;
-    private _getFullResolutionTextures;
+    private _previewTextures;
+    private _fullResolutionTextures;
+    private _onFullResolutionCompleted;
     private _annotations;
     constructor(imageProvider: Image360DataProvider, image360Descriptor: Image360Descriptor, image360VisualzationBox: Image360VisualizationBox);
     /**
@@ -23,29 +24,32 @@ export declare class Image360RevisionEntity implements Image360Revision {
     /**
      * Loads the textures needed for the 360 image (6 faces).
      *
-     * This will start the download of both low and full resolution textures and return one promise for when the first image set is ready
-     * and one promise for when both downloads are completed. If the low resolution images are completed first the full resolution
-     * download and texture loading will continue in the background, and applyFullResolution can be used to apply full resolution textures
-     * to the image360VisualzationBox at a desired time.
+     * This will start the download of both low and full resolution textures and return one promise for when each texture set is ready.
+     * If the low resolution images are completed first the full resolution download and texture loading will continue in the background,
+     * and applyFullResolutionTextures can be called to apply full resolution textures to the image360VisualzationBox at a desired time.
      *
-     * @returns firstCompleted A promise for when the first set of textures has been loaded.
-     * @returns fullResolutionCompleted A promise for when full resolution images are done loading.
+     * @returns lowResolutionCompleted A promise for when the low resolution images are done loading.
+     * @returns fullResolutionCompleted A promise for when the full resolution images are done loading.
      */
     loadTextures(abortSignal?: AbortSignal): {
-        firstCompleted: Promise<void>;
+        lowResolutionCompleted: Promise<void>;
         fullResolutionCompleted: Promise<void>;
+        annotationsCompleted: Promise<void>;
     };
+    private loadPreviewTextures;
+    private loadFullTextures;
     private loadAnnotations;
     /**
      * Clear the cached textures used by this revision.
      */
-    clearTextures(): void;
+    dispose(): void;
     /**
      * Apply cached textures to the image360VisualzationBox.
      */
     applyTextures(): void;
     /**
-     * Apply full resolution textures to the image360VisualzationBox. This has no effect if full resolution has already been applied.
+     * Apply full resolution textures to the image360VisualzationBox.
+     * This has no effect if full resolution has already been applied.
      */
     applyFullResolutionTextures(): Promise<void>;
 }

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

@@ -18,6 +18,7 @@ export declare class Image360VisualizationBox implements Image360Visualization {
     private readonly _faceMaterialOrder;
     private readonly _meshLoadPromise;
     private readonly _annotationsLoadPromise;
+    private readonly _annotationsGroup;
     get opacity(): number;
     set opacity(alpha: number);
     get visible(): boolean;
@@ -30,4 +31,5 @@ export declare class Image360VisualizationBox implements Image360Visualization {
     loadFaceTextures(faces: Image360Face[]): Promise<Image360Texture[]>;
     unloadImages(): void;
     private getScaledImageTexture;
+    setAnnotationsVisibility(visibility: boolean): void;
 }

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

@@ -1,9 +1,9 @@
 /*!
  * Copyright 2023 Cognite AS
  */
-import { AnnotationModel } from '@cognite/sdk';
 import { Image360 } from './entity/Image360';
 import { Image360Revision } from './entity/Image360Revision';
+import { Image360Annotation } from './annotation/Image360Annotation';
 /**
  * Delegate for 360 image mode entered events.
  */
@@ -15,8 +15,8 @@ export type Image360ExitedDelegate = () => void;
 /**
  * Delegate for 360 image annotation hover events
  */
-export type Image360AnnotationHoveredDelegate = (annotation: AnnotationModel) => void;
+export type Image360AnnotationHoveredDelegate = (annotation: Image360Annotation) => void;
 /**
  * Delegate for 360 image annotation click events
  */
-export type Image360AnnotationClickedDelegate = (annotation: AnnotationModel) => void;
+export type Image360AnnotationClickedDelegate = (annotation: Image360Annotation) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.2.0-dev.20230427",
+  "version": "4.2.0-dev.20230428",
   "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": {
@@ -91,7 +91,7 @@
     "@types/jsdom": "21.1.1",
     "@types/lodash": "4.14.194",
     "@types/mixpanel-browser": "2.38.1",
-    "@types/node": "18.15.13",
+    "@types/node": "18.16.0",
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.4",
     "@types/stats": "0.16.30",
@@ -111,7 +111,7 @@
     "eslint-plugin-unused-imports": "2.0.0",
     "file-loader": "6.2.0",
     "gl": "6.0.2",
-    "glob": "10.2.1",
+    "glob": "10.2.2",
     "glslify-loader": "2.0.0",
     "html-webpack-plugin": "5.5.1",
     "jest": "29.5.0",
@@ -123,7 +123,7 @@
     "jsdom": "21.1.1",
     "moq.ts": "10.0.2",
     "nock": "13.3.0",
-    "prettier": "2.8.7",
+    "prettier": "2.8.8",
     "process": "0.11.10",
     "puppeteer": "19.10.1",
     "random-seed": "0.3.0",