@cognite/reveal 4.1.1-dev.20230222 → 4.1.1-dev.20230223

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

@@ -2,14 +2,23 @@
  * Copyright 2022 Cognite AS
  */
 import { Image360Entity } from '../entity/Image360Entity';
+export type DownloadRequest = {
+    entity: Image360Entity;
+    load360Image: Promise<void>;
+    abort: () => void;
+};
 export declare class Image360LoadingCache {
-    private readonly _cacheSize;
+    private readonly _imageCacheSize;
+    private readonly _downloadCacheSize;
     private readonly _loaded360Images;
-    private readonly _inFlightEntities;
+    private readonly _inProgressDownloads;
     get cachedEntities(): Image360Entity[];
-    get currentlyLoadingEntities(): Map<Image360Entity, Promise<void>>;
-    constructor(_cacheSize?: number);
+    get currentlyLoadingEntities(): DownloadRequest[];
+    getDownloadInProgress(entity: Image360Entity): DownloadRequest | undefined;
+    constructor(_imageCacheSize?: number, _downloadCacheSize?: number);
     cachedPreload(entity: Image360Entity): Promise<void>;
     purge(entity: Image360Entity): Promise<void>;
     private purgeLastRecentlyUsedInvisibleEntity;
+    private abortLastRecentlyReqestedEntity;
+    private createAbortSignal;
 }

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

@@ -34,7 +34,7 @@ export declare class Image360Entity implements Image360 {
     /**
      * Loads the 360 image (6 faces) into the visualization object.
      */
-    load360Image(): Promise<void>;
+    load360Image(abortSignal?: AbortSignal): Promise<void>;
     /**
      * Drops the GPU resources for the 360 image
      * the icon will be preserved.

package/dist/packages/cad-parsers/src/metadata/parsers/types.d.ts

@@ -29,6 +29,7 @@ export type SceneSectorMetadata = {
     readonly boundingBox: BoundingBox;
     readonly geometryBoundingBox?: BoundingBox;
     readonly sectorFileName: string | null;
+    readonly texturedFileName: string | null;
     readonly maxDiagonalLength: number;
     readonly minDiagonalLength: number;
     readonly downloadSize: number;

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

@@ -8,7 +8,7 @@ export declare class Cdf360ImageEventProvider implements Image360Provider<Metada
     private readonly _client;
     constructor(client: CogniteClient);
     get360ImageDescriptors(metadataFilter: Metadata, preMultipliedRotation: boolean): Promise<Image360Descriptor[]>;
-    get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[]): Promise<Image360Face[]>;
+    get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     private mergeDescriptors;
     private listEvents;
     private listFiles;

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

@@ -4,5 +4,5 @@ export declare class Local360ImageProvider implements Image360Provider<unknown>
     private readonly _modelUrl;
     constructor(modelUrl: string);
     get360ImageDescriptors(): Promise<Image360Descriptor[]>;
-    get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[]): Promise<Image360Face[]>;
+    get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
 }

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

@@ -12,7 +12,7 @@ export interface Image360DescriptorProvider<T> {
     get360ImageDescriptors(metadataFilter: T, preMultipliedRotation: boolean): Promise<Image360Descriptor[]>;
 }
 export interface Image360FileProvider {
-    get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[]): Promise<Image360Face[]>;
+    get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
 }
 export type Image360Descriptor = Image360EventDescriptor & {
     faceDescriptors: Image360FileDescriptor[];

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

@@ -18,6 +18,8 @@ export declare class CadMaterialManager {
     off(event: 'materialsChanged', listener: () => void): void;
     addModelMaterials(modelIdentifier: string, maxTreeIndex: number): void;
     removeModelMaterials(modelIdentifier: string): void;
+    addTexturedMeshMaterial(modelIdentifier: string, sectorId: number, texture: THREE.Texture): THREE.RawShaderMaterial;
+    removeTexturedMeshMaterial(modelIdentifier: string, sectorId: number): void;
     getModelMaterials(modelIdentifier: string): Materials;
     getModelNodeAppearanceProvider(modelIdentifier: string): NodeAppearanceProvider;
     getModelNodeTransformProvider(modelIdentifier: string): NodeTransformProvider;
@@ -38,4 +40,5 @@ export declare class CadMaterialManager {
     private getModelMaterialsWrapper;
     private applyToAllMaterials;
     private triggerMaterialsChanged;
+    private initializeDefinesAndUniforms;
 }

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

@@ -19,5 +19,10 @@ export interface Materials {
     instancedMesh: THREE.RawShaderMaterial;
     triangleMesh: THREE.RawShaderMaterial;
     simple: THREE.RawShaderMaterial;
+    texturedMaterials: {
+        [key: string]: THREE.RawShaderMaterial;
+    };
 }
-export declare function createMaterials(renderMode: RenderMode, clippingPlanes: THREE.Plane[], overrideColorPerTreeIndex: THREE.DataTexture, transformOverrideIndexTexture: THREE.DataTexture, transformOverrideLookupTexture: THREE.DataTexture): Materials;
+export declare function forEachMaterial(materials: Materials, callback: (material: THREE.RawShaderMaterial) => void): void;
+export declare function createMaterials(renderMode: RenderMode, clippingPlanes: THREE.Plane[], overrideColorPerTreeIndex: THREE.DataTexture, transformOverrideIndexTexture: THREE.DataTexture, transformOverrideLookupTexture: THREE.DataTexture, matCapTexture: THREE.Texture): Materials;
+export declare function initializeDefinesAndUniforms(material: THREE.RawShaderMaterial, overrideColorPerTreeIndex: THREE.DataTexture, transformOverrideIndexTexture: THREE.DataTexture, transformOverrideTexture: THREE.DataTexture, matCapTexture: THREE.Texture, renderMode: RenderMode): void;

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

@@ -1,14 +1,6 @@
 /*!
  * Copyright 2021 Cognite AS
  */
-/**
- * Defines used to enable debugging features in shaders.
- */
-export declare const shaderDefines: {
-    defines: {
-        COGNITE_COLOR_BY_TREE_INDEX: boolean;
-    };
-};
 export declare const sectorShaders: {
     simpleMesh: {
         fragment: string;

package/dist/packages/sector-parser/src/GltfSectorParser.d.ts

@@ -8,6 +8,7 @@ export declare class GltfSectorParser {
     private processInstancedTriangleMesh;
     private processPrimitiveCollection;
     private processTriangleMesh;
+    private getDiffuseTexture;
     private getVertexBuffer;
     private setIndexBuffer;
     private setPositionBuffer;

package/dist/packages/sector-parser/src/types.d.ts

@@ -7,10 +7,13 @@ export type GltfJson = {
     bufferViews: BufferView[];
     buffers: Buffer[];
     extensionsUsed: string[];
+    images: Image[];
+    materials: Material[];
     meshes: Mesh[];
     nodes: Node[];
     scene: number;
     scenes: Scene[];
+    textures: Texture[];
 };
 export type Scene = {
     nodes: number[];
@@ -66,6 +69,22 @@ export type Primitive = {
             bufferView: number;
         } | undefined;
     };
+    material: number | undefined;
+};
+export type Material = {
+    name: string;
+    pbrMetallicRoughness: {
+        baseColorTexture: {
+            index: number;
+        };
+    };
+};
+export type Texture = {
+    source: number;
+};
+export type Image = {
+    bufferView: number;
+    mimeType: string;
 };
 export declare enum RevealGeometryCollectionType {
     BoxCollection = 0,
@@ -80,7 +99,8 @@ export declare enum RevealGeometryCollectionType {
     TrapeziumCollection = 9,
     NutCollection = 10,
     TriangleMesh = 11,
-    InstanceMesh = 12
+    TexturedTriangleMesh = 12,
+    InstanceMesh = 13
 }
 export type GlbHeaderData = {
     json: GltfJson;
@@ -97,10 +117,12 @@ export type GeometryProcessingPayload = {
     } | undefined;
     meshId: number | undefined;
     glbHeaderData: GlbHeaderData;
+    texture?: THREE.Texture;
     data: ArrayBuffer;
 };
 export type ParsedGeometry = {
     type: RevealGeometryCollectionType;
     geometryBuffer: THREE.BufferGeometry;
+    texture?: THREE.Texture;
     instanceId?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.1.1-dev.20230222",
+  "version": "4.1.1-dev.20230223",
   "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": {