@cognite/reveal 4.0.0-dev.20230123 → 4.0.0-dev.20230125

package/dist/packages/cad-model/src/batching/MultiBufferBatchingManager.d.ts

@@ -1,5 +1,5 @@
 import { Group } from 'three';
-import { Materials } from '../../../rendering';
+import { Materials, StyledTreeIndexSets } from '../../../rendering';
 import { ParsedGeometry } from '../../../sector-parser';
 import { DrawCallBatchingManager } from './DrawCallBatchingManager';
 /**
@@ -16,7 +16,8 @@ export declare class MultiBufferBatchingManager implements DrawCallBatchingManag
     private readonly _instanceBatches;
     private readonly _materials;
     private readonly _batchGroup;
-    constructor(batchGroup: Group, materials: Materials, initialBufferSize?: number, numberOfInstanceBatches?: number);
+    private readonly _styledTreeIndexSets;
+    constructor(batchGroup: Group, materials: Materials, styleTreeIndexSets: StyledTreeIndexSets, initialBufferSize?: number, numberOfInstanceBatches?: number);
     batchGeometries(geometryBatchingQueue: ParsedGeometry[], sectorId: number): void;
     removeSectorBatches(sectorId: number): void;
     dispose(): void;

package/dist/packages/cad-model/src/wrappers/CadNode.d.ts

@@ -16,6 +16,9 @@ export declare class CadNode extends Object3D {
     private _geometryBatchingManager?;
     private readonly _sourceTransform;
     private readonly _customTransform;
+    private readonly _setModelRenderLayers;
+    private readonly _batchedGeometryMeshGroup;
+    private readonly _styledTreeIndexSets;
     private _needsRedraw;
     constructor(model: CadModelMetadata, materialManager: CadMaterialManager, sectorRepository: SectorRepository);
     get needsRedraw(): boolean;
@@ -44,6 +47,7 @@ export declare class CadNode extends Object3D {
      */
     getModelTransformation(out?: Matrix4): Matrix4;
     getCdfToDefaultModelTransformation(out?: Matrix4): Matrix4;
+    setModelRenderLayers(root?: Object3D): void;
     get prioritizedAreas(): PrioritizedArea[];
     batchGeometry(geometryBatchingQueue: ParsedGeometry[], sectorId: number): void;
     removeBatchedSectorGeometries(sectorId: number): void;

package/dist/packages/rendering/index.d.ts

@@ -11,7 +11,8 @@ export * from './src/pointcloud-rendering/types';
 export * from './src/pointcloud-rendering/PointCloudObjectIdMaps';
 export { DEFAULT_CLASSIFICATION } from './src/pointcloud-rendering/classification';
 export { RenderMode } from './src/rendering/RenderMode';
-export { RenderLayer } from './src/utilities/renderUtilities';
+export { RenderLayer, setModelRenderLayers } from './src/utilities/renderUtilities';
+export { StyledTreeIndexSets } from './src/utilities/types';
 export { coverageShaders } from './src/rendering/shaders';
 export { Materials } from './src/rendering/materials';
 export { PointCloudMaterial, OctreeMaterialParams } from './src/pointcloud-rendering';

package/dist/packages/rendering/src/render-pipeline-providers/CadGeometryRenderModePipelineProvider.d.ts

@@ -9,8 +9,6 @@ import { RenderMode } from '../rendering/RenderMode';
 import { SceneHandler } from '../../../utilities';
 import { SettableRenderTarget } from '../rendering/SettableRenderTarget';
 export declare class CadGeometryRenderModePipelineProvider implements RenderPipelineProvider, SettableRenderTarget {
-    private readonly _materialManager;
-    private readonly _cadModels;
     private readonly _renderTargetData;
     private readonly _geometryPass;
     private _outputRenderTarget;

package/dist/packages/rendering/src/utilities/renderUtilities.d.ts

@@ -4,6 +4,7 @@
 import * as THREE from 'three';
 import { WebGLRendererStateHelper } from '../../../utilities';
 import { CadMaterialManager } from '../CadMaterialManager';
+import { StyledTreeIndexSets } from './types';
 import { BlitOptions, DepthBlendBlitOptions, PointCloudPassParameters, PointCloudPostProcessingOptions } from '../render-passes/types';
 export declare const unitOrthographicCamera: THREE.OrthographicCamera;
 export declare function createFullScreenTriangleMesh(shaderMaterial: THREE.RawShaderMaterial): THREE.Mesh;
@@ -18,14 +19,11 @@ export declare enum RenderLayer {
     PointCloud = 8,
     Default = 0
 }
-export declare function setupCadModelsGeometryLayers(materialManager: CadMaterialManager, cadModels?: {
-    cadNode: THREE.Object3D;
-    modelIdentifier: string;
-}[]): void;
 export declare function getLayerMask(renderLayer: number): number;
 export declare function hasStyledNodes(modelIdentifiers: string[], materialManager: CadMaterialManager): {
     back: boolean;
     inFront: boolean;
     ghost: boolean;
 };
+export declare function setModelRenderLayers(rootNode: THREE.Object3D, stylingSets: StyledTreeIndexSets): void;
 export declare function setRendererParameters(rendererHelper: WebGLRendererStateHelper, parameters: PointCloudPassParameters): void;

package/dist/packages/rendering/src/utilities/types.d.ts

@@ -1,6 +1,7 @@
 /*!
  * Copyright 2021 Cognite AS
  */
+import { IndexSet } from '../../../utilities';
 import * as THREE from 'three';
 /**
  * Colors from the Cognite theme.
@@ -24,3 +25,9 @@ export declare class RevealColors {
     static readonly Red: THREE.Color;
     static readonly Green: THREE.Color;
 }
+export type StyledTreeIndexSets = {
+    back: IndexSet;
+    ghost: IndexSet;
+    inFront: IndexSet;
+    visible: IndexSet;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.0.0-dev.20230123",
+  "version": "4.0.0-dev.20230125",
   "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": {
@@ -85,13 +85,13 @@
   },
   "devDependencies": {
     "@azure/msal-browser": "2.32.2",
-    "@cognite/sdk": "7.15.0",
+    "@cognite/sdk": "7.16.0",
     "@microsoft/api-extractor": "^7.33.6",
     "@types/dat.gui": "0.7.7",
     "@types/expect-puppeteer": "5.0.2",
     "@types/gl": "^6.0.2",
     "@types/glob": "8.0.0",
-    "@types/jest": "29.2.5",
+    "@types/jest": "29.2.6",
     "@types/jest-environment-puppeteer": "5.0.3",
     "@types/jest-image-snapshot": "6.1.0",
     "@types/jsdom": "20.0.1",
@@ -103,8 +103,8 @@
     "@types/stats": "0.16.30",
     "@types/three": "0.148.0",
     "@types/tween.js": "18.5.1",
-    "@typescript-eslint/eslint-plugin": "5.48.1",
-    "@typescript-eslint/parser": "5.48.1",
+    "@typescript-eslint/eslint-plugin": "5.48.2",
+    "@typescript-eslint/parser": "5.48.2",
     "concurrently": "7.6.0",
     "cross-env": "7.0.3",
     "cross-var": "1.1.0",