@cognite/reveal 4.36.0 → 4.38.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/eptBinaryDecoder.worker-AfUP5xy8.js.map +1 -0
- package/dist/index.js +13343 -12698
- package/dist/index.js.map +1 -1
- package/dist/packages/360-images/index.d.ts +7 -0
- package/dist/packages/360-images/src/collection/DefaultImage360Collection.d.ts +2 -2
- package/dist/packages/360-images/src/collection/Image360CollectionFactory.d.ts +1 -1
- package/dist/packages/360-images/src/entity/Image360Entity.d.ts +2 -1
- package/dist/packages/360-images/src/entity/Image360RevisionEntity.d.ts +2 -1
- package/dist/packages/{data-providers/src/image-360-data-providers → 360-images/src/providers}/Cdf360ImageAnnotationProvider.d.ts +6 -4
- package/dist/packages/{data-providers/src/image-360-data-providers → 360-images/src/providers}/CoreDm360ImageAnnotationProvider.d.ts +4 -3
- package/dist/packages/360-images/src/providers/Image360AnnotationProvider.d.ts +24 -0
- package/dist/packages/{data-providers/src → 360-images/src/providers}/Image360Provider.d.ts +3 -3
- package/dist/packages/{data-providers/src → 360-images/src/providers}/Image360ProviderCombiner.d.ts +5 -4
- package/dist/packages/{data-providers/src/image-360-data-providers → 360-images/src/providers}/Local360ImageProvider.d.ts +5 -4
- package/dist/packages/{data-providers/src/image-360-data-providers → 360-images/src/providers}/annotations.d.ts +1 -1
- package/dist/packages/api/src/api-helpers/Image360ApiHelper.d.ts +2 -0
- package/dist/packages/api/src/public/RevealManager.d.ts +3 -0
- package/dist/packages/api/src/public/RevealOptions.d.ts +1 -0
- package/dist/packages/api/src/public/migration/Cognite3DViewer.d.ts +23 -0
- package/dist/packages/api/src/public/migration/renderOptionsHelpers.d.ts +6 -1
- package/dist/packages/api/src/public/migration/types.d.ts +9 -0
- package/dist/packages/api/src/public/types.d.ts +1 -1
- package/dist/packages/cad-model/src/types.d.ts +4 -18
- package/dist/packages/camera-manager/src/Flexible/FlexibleCameraManager.d.ts +1 -3
- package/dist/packages/camera-manager/src/Flexible/GetPickedPointByPixelCoordinates.d.ts +1 -1
- package/dist/packages/camera-manager/src/types.d.ts +5 -0
- package/dist/packages/data-providers/index.d.ts +10 -10
- package/dist/packages/data-providers/src/DataSourceType.d.ts +2 -1
- package/dist/packages/data-providers/src/GeometryFilter.d.ts +18 -0
- package/dist/packages/{pointcloud-styling/src → data-providers/src/point-cloud-collections}/PointCloudDMVolumeCollection.d.ts +1 -1
- package/dist/packages/data-providers/src/types.d.ts +0 -21
- package/dist/packages/data-providers/src/utilities/internalAddModelOptions.d.ts +1 -1
- package/dist/packages/model-base/src/types.d.ts +2 -0
- package/dist/packages/pointcloud-styling/index.d.ts +1 -2
- package/dist/packages/pointcloud-styling/src/AnnotationIdPointCloudObjectCollection.d.ts +1 -1
- package/dist/packages/pointcloud-styling/src/utils.d.ts +1 -2
- package/dist/packages/pointclouds/src/PointCloudPickingHandler.d.ts +22 -2
- package/dist/packages/pointclouds/src/potree-three-loader/tree/PointCloudOctreePicker.d.ts +17 -0
- package/dist/packages/pointclouds/src/potree-three-loader/tree/PointCloudOctreePickerHelper.d.ts +29 -4
- package/dist/packages/rendering/index.d.ts +2 -0
- package/dist/packages/rendering/src/CadMaterialManager.d.ts +6 -1
- package/dist/packages/rendering/src/RenderPipelineProvider.d.ts +4 -1
- package/dist/packages/rendering/src/pointcloud-rendering/PointCloudMaterial.d.ts +4 -0
- package/dist/packages/rendering/src/pointcloud-rendering/PointCloudObjectAppearanceTexture.d.ts +1 -0
- package/dist/packages/rendering/src/pointcloud-rendering/constants.d.ts +44 -0
- package/dist/packages/rendering/src/render-passes/CadShadowPass.d.ts +31 -0
- package/dist/packages/rendering/src/render-passes/PostProcessingPass.d.ts +12 -1
- package/dist/packages/rendering/src/render-passes/ShadowMapPass.d.ts +56 -0
- package/dist/packages/rendering/src/render-passes/types.d.ts +3 -0
- package/dist/packages/rendering/src/render-pipeline-providers/DefaultRenderPipelineProvider.d.ts +10 -2
- package/dist/packages/rendering/src/render-pipeline-providers/types.d.ts +19 -1
- package/dist/packages/rendering/src/rendering/CadShadowReceiverForCustomObjectMaterial.d.ts +15 -0
- package/dist/packages/rendering/src/rendering/cadLighting.d.ts +5 -0
- package/dist/packages/rendering/src/rendering/shaders.d.ts +1 -0
- package/dist/packages/rendering/src/rendering/types.d.ts +1 -0
- package/dist/packages/utilities/index.d.ts +1 -0
- package/dist/packages/utilities/src/SceneHandler.d.ts +2 -0
- package/dist/packages/utilities/src/customObject/CustomObject.d.ts +8 -0
- package/dist/packages/utilities/src/customObject/ICustomObject.d.ts +6 -0
- package/dist/packages/utilities/src/renderContextState.d.ts +4 -0
- package/package.json +6 -6
- package/dist/assets/eptBinaryDecoder.worker-B63sS5sK.js.map +0 -1
- /package/dist/packages/{pointcloud-styling/src → data-providers/src/point-cloud-collections}/PointCloudObjectCollection.d.ts +0 -0
|
@@ -5,10 +5,27 @@ import { PickParams } from './PointCloudOctreePickerHelper';
|
|
|
5
5
|
export type { PickParams };
|
|
6
6
|
export declare class PointCloudOctreePicker {
|
|
7
7
|
private static readonly helperVec3;
|
|
8
|
+
private static readonly helperVec2;
|
|
9
|
+
private static readonly REBUILD_HOLDOFF_MS;
|
|
8
10
|
private pickState;
|
|
9
11
|
private readonly _renderer;
|
|
10
12
|
private readonly _pickerHelper;
|
|
13
|
+
private _cache;
|
|
14
|
+
private _invalidationCount;
|
|
15
|
+
private _lastInvalidatedAt;
|
|
11
16
|
constructor(renderer: WebGLRenderer);
|
|
12
17
|
dispose(): void;
|
|
18
|
+
/**
|
|
19
|
+
* Invalidates the cached full-frame pick buffer. Must be called whenever a new frame of the
|
|
20
|
+
* scene is rendered (camera, point cloud LOD, styling or clipping changes) and on resize.
|
|
21
|
+
*/
|
|
22
|
+
invalidateCache(): void;
|
|
13
23
|
pick(camera: Camera, ray: Ray, octrees: PointCloudOctree[], params?: Partial<PickParams>): Promise<PickPoint | null>;
|
|
24
|
+
private pickWindowed;
|
|
25
|
+
private isCacheUsable;
|
|
26
|
+
private buildCache;
|
|
27
|
+
/** Picks the smallest node-index bit width that fits every visible node, or undefined if there are no nodes or none fits. */
|
|
28
|
+
private computeNodeIndexBits;
|
|
29
|
+
private renderAndReadBackPixels;
|
|
30
|
+
private pickFromCache;
|
|
14
31
|
}
|
package/dist/packages/pointclouds/src/potree-three-loader/tree/PointCloudOctreePickerHelper.d.ts
CHANGED
|
@@ -29,6 +29,25 @@ export interface PickParams {
|
|
|
29
29
|
* @param renterTarget The render target used for picking.
|
|
30
30
|
*/
|
|
31
31
|
onBeforePickRender: (material: PointCloudMaterial, renterTarget: WebGLRenderTarget) => void;
|
|
32
|
+
/**
|
|
33
|
+
* Whether the camera is currently known to be in motion (e.g. during an interactive zoom/pan/
|
|
34
|
+
* orbit). When true, the full-frame pick cache is never rebuilt for this call, regardless of
|
|
35
|
+
* how long ago it was last invalidated. Confirmed by measurement: a full-frame rebuild's async
|
|
36
|
+
* GPU readback (tens to hundreds of ms) routinely doesn't finish before the next camera-change
|
|
37
|
+
* invalidates it again during continuous motion, so the rebuild is started, pays its full cost,
|
|
38
|
+
* gets discarded, and the caller still has to fall back to a windowed pick anyway. Falls back to
|
|
39
|
+
* the time-based holdoff when omitted.
|
|
40
|
+
*/
|
|
41
|
+
cameraInMotion?: boolean;
|
|
42
|
+
/**
|
|
43
|
+
* Unconditionally skips the full-frame pick cache (both serving from it and rebuilding it) for
|
|
44
|
+
* this call, regardless of camera-motion state. Intended for callers that pick on every input
|
|
45
|
+
* event of a fast, continuous interaction (e.g. wheel-driven zoom-to-cursor) where even
|
|
46
|
+
* checking/rebuilding the cache adds latency that matters more than the cache's benefit - unlike
|
|
47
|
+
* `cameraInMotion`, this doesn't depend on the camera having already started moving, which
|
|
48
|
+
* matters because some callers pick *before* moving the camera for that same input event.
|
|
49
|
+
*/
|
|
50
|
+
forceWindowedPick?: boolean;
|
|
32
51
|
}
|
|
33
52
|
/**
|
|
34
53
|
* Helper class for PointCloudOctreePicker.
|
|
@@ -40,15 +59,21 @@ export declare class PointCloudOctreePickerHelper {
|
|
|
40
59
|
private readonly _rendererStateHelper;
|
|
41
60
|
constructor(renderer: WebGLRenderer);
|
|
42
61
|
resetState(): void;
|
|
43
|
-
prepareRender(x: number, y: number,
|
|
44
|
-
render(camera: Camera, pickMaterial: PointCloudMaterial, octrees: PointCloudOctree[], ray: Ray, pickState: IPickState, params: Partial<PickParams
|
|
62
|
+
prepareRender(x: number, y: number, width: number, height: number, pickMaterial: PointCloudMaterial, pickState: IPickState): void;
|
|
63
|
+
render(camera: Camera, pickMaterial: PointCloudMaterial, octrees: PointCloudOctree[], ray: Ray | undefined, pickState: IPickState, params: Partial<PickParams>, nodeIndexBits?: number): RenderedNode[];
|
|
45
64
|
private static nodesOnRay;
|
|
46
|
-
readPixelsAsync(x: number, y: number,
|
|
65
|
+
readPixelsAsync(x: number, y: number, width: number, height: number, renderTarget: WebGLRenderTarget, pixels?: Uint8Array): Promise<Uint8Array>;
|
|
47
66
|
private static createTempNodes;
|
|
48
67
|
private static updatePickMaterial;
|
|
49
68
|
static updatePickRenderTarget(pickState: IPickState, width: number, height: number): void;
|
|
50
69
|
private static makePickRenderTarget;
|
|
51
|
-
static
|
|
70
|
+
static computeBitSplit(nodeCount: number, maxPointsPerNode: number): number | undefined;
|
|
71
|
+
static decodePackedPixel(packedIndex: number, nodeIndexBits: number): {
|
|
72
|
+
nodeIndex: number;
|
|
73
|
+
pointIndex: number;
|
|
74
|
+
};
|
|
75
|
+
static findHit(pixels: Uint8Array, pickWndSize: number, nodes: RenderedNode[], camera: Camera, nodeIndexBits?: number): PointCloudHit | null;
|
|
76
|
+
static findHitInBuffer(ibuffer: Uint32Array, bufferWidth: number, bufferHeight: number, centerX: number, centerY: number, windowSize: number, nodes: RenderedNode[], camera: Camera, nodeIndexBits: number): PointCloudHit | null;
|
|
52
77
|
static getPickPoint(hit: PointCloudHit | null, nodes: RenderedNode[]): PickPoint | null;
|
|
53
78
|
static getPointPosition(nodes: RenderedNode[], pcIndex: number, pIndex: number): Vector3;
|
|
54
79
|
private static addPositionToPickPoint;
|
|
@@ -6,6 +6,7 @@ export { CadMaterialManager, createCadMaterial } from './src/CadMaterialManager'
|
|
|
6
6
|
export { PointCloudMaterialManager } from './src/PointCloudMaterialManager';
|
|
7
7
|
export type { RenderOptions, SsaoParameters, EdlOptions } from './src/rendering/types';
|
|
8
8
|
export { defaultRenderOptions, SsaoSampleQuality, AntiAliasingMode } from './src/rendering/types';
|
|
9
|
+
export { shouldApplyEdl } from './src/render-pipeline-providers/pointCloudParameterUtils';
|
|
9
10
|
export * from './src/pointcloud-rendering/constants';
|
|
10
11
|
export * from './src/pointcloud-rendering/enums';
|
|
11
12
|
export type * from './src/pointcloud-rendering/types';
|
|
@@ -17,6 +18,7 @@ export type { StyledTreeIndexSets } from './src/utilities/types';
|
|
|
17
18
|
export { type Materials, initializeDefinesAndUniforms, forEachMaterial } from './src/rendering/materials';
|
|
18
19
|
export type { OctreeMaterialParams } from './src/pointcloud-rendering';
|
|
19
20
|
export { PointCloudMaterial } from './src/pointcloud-rendering';
|
|
21
|
+
export { CadShadowReceiverForCustomObjectMaterial } from './src/rendering/CadShadowReceiverForCustomObjectMaterial';
|
|
20
22
|
export { DefaultRenderPipelineProvider } from './src/render-pipeline-providers/DefaultRenderPipelineProvider';
|
|
21
23
|
export { CadGeometryRenderModePipelineProvider } from './src/render-pipeline-providers/CadGeometryRenderModePipelineProvider';
|
|
22
24
|
export { BasicPipelineExecutor } from './src/pipeline-executors/BasicPipelineExecutor';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Plane, RawShaderMaterial, Texture } from 'three';
|
|
1
|
+
import { Camera, Plane, RawShaderMaterial, Texture } from 'three';
|
|
2
2
|
import { Materials } from './rendering/materials';
|
|
3
3
|
import { RenderMode } from './rendering/RenderMode';
|
|
4
4
|
import { NodeAppearance, ClippingPlanesProvider, NodeAppearanceProvider, NodeAppearanceTextureBuilder, NodeTransformProvider, NodeTransformTextureBuilder } from '../../cad-styling';
|
|
@@ -18,6 +18,9 @@ export declare class CadMaterialManager {
|
|
|
18
18
|
get needsRedraw(): boolean;
|
|
19
19
|
private _renderMode;
|
|
20
20
|
private readonly materialsMap;
|
|
21
|
+
private readonly _cadLightView;
|
|
22
|
+
private readonly _cadUpView;
|
|
23
|
+
private _cadLightingEnabled;
|
|
21
24
|
private _clippingPlanes;
|
|
22
25
|
private _needsRedraw;
|
|
23
26
|
addModelMaterials(modelIdentifier: symbol, cadMaterial: CadMaterial): void;
|
|
@@ -35,6 +38,8 @@ export declare class CadMaterialManager {
|
|
|
35
38
|
getModelVisibleTreeIndices(modelIdentifier: symbol): IndexSet;
|
|
36
39
|
setRenderMode(mode: RenderMode): void;
|
|
37
40
|
getRenderMode(): RenderMode;
|
|
41
|
+
setCadLightingEnabled(enabled: boolean): void;
|
|
42
|
+
updateViewLighting(camera: Camera): void;
|
|
38
43
|
resetRedraw(): void;
|
|
39
44
|
dispose(): void;
|
|
40
45
|
private updateClippingPlanesForModel;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { WebGLRenderer } from 'three';
|
|
1
|
+
import { WebGLRenderer, Vector3 } from 'three';
|
|
2
2
|
import { RenderPass } from './RenderPass';
|
|
3
3
|
/**
|
|
4
4
|
* Defines a provider that provides a set of renderpasses
|
|
@@ -10,4 +10,7 @@ import { RenderPass } from './RenderPass';
|
|
|
10
10
|
export interface RenderPipelineProvider {
|
|
11
11
|
pipeline(renderer: WebGLRenderer): Generator<RenderPass>;
|
|
12
12
|
dispose(): void;
|
|
13
|
+
shadowsEnabled?: boolean;
|
|
14
|
+
setShadowFocus?(focus: Vector3): void;
|
|
15
|
+
readonly needsRedraw?: boolean;
|
|
13
16
|
}
|
|
@@ -23,6 +23,7 @@ export interface IPointCloudMaterialUniforms {
|
|
|
23
23
|
level: IUniform<number>;
|
|
24
24
|
maxSize: IUniform<number>;
|
|
25
25
|
minSize: IUniform<number>;
|
|
26
|
+
nodeIndexBits: IUniform<number>;
|
|
26
27
|
objectIdLUT: IUniform<Texture>;
|
|
27
28
|
octreeSize: IUniform<number>;
|
|
28
29
|
pcIndex: IUniform<number>;
|
|
@@ -47,6 +48,7 @@ export declare class PointCloudMaterial extends RawShaderMaterial {
|
|
|
47
48
|
private readonly _gradient;
|
|
48
49
|
private gradientTexture;
|
|
49
50
|
private _objectAppearanceTexture;
|
|
51
|
+
private _ownsObjectAppearanceTexture;
|
|
50
52
|
private _classification;
|
|
51
53
|
private classificationTexture;
|
|
52
54
|
uniforms: IPointCloudMaterialUniforms & Record<string, IUniform<any>>;
|
|
@@ -68,6 +70,8 @@ export declare class PointCloudMaterial extends RawShaderMaterial {
|
|
|
68
70
|
set maxSize(value: number);
|
|
69
71
|
get minSize(): number;
|
|
70
72
|
set minSize(value: number);
|
|
73
|
+
get nodeIndexBits(): number;
|
|
74
|
+
set nodeIndexBits(value: number);
|
|
71
75
|
get octreeSize(): number;
|
|
72
76
|
set octreeSize(value: number);
|
|
73
77
|
get screenHeight(): number;
|
|
@@ -3,6 +3,7 @@ export declare const DEFAULT_MAX_POINT_SIZE = 10;
|
|
|
3
3
|
export declare const DEFAULT_MIN_NODE_PIXEL_SIZE = 50;
|
|
4
4
|
export declare const DEFAULT_MIN_POINT_SIZE = 1;
|
|
5
5
|
export declare const DEFAULT_PICK_WINDOW_SIZE = 15;
|
|
6
|
+
export declare const DEFAULT_NODE_INDEX_BITS = 8;
|
|
6
7
|
export declare const DEFAULT_POINT_BUDGET = 3000000;
|
|
7
8
|
export declare const MAX_LOADS_TO_GPU = 15;
|
|
8
9
|
export declare const MAX_NUM_NODES_LOADING = 8;
|
|
@@ -11,5 +12,48 @@ export declare const PERSPECTIVE_CAMERA = "PerspectiveCamera";
|
|
|
11
12
|
export declare const COLOR_BLACK: Color;
|
|
12
13
|
export declare const COLOR_WHITE: Color;
|
|
13
14
|
export declare const DEFAULT_EDL_NEIGHBOURS_COUNT = 16;
|
|
15
|
+
export declare const POINT_SIZE_REFERENCE_SCREEN_HEIGHT = 1080;
|
|
16
|
+
export declare const MAX_EDL_RADIUS = 5;
|
|
17
|
+
/**
|
|
18
|
+
* Half-width, in samples, of the depth-aware gap fill applied while compositing the point
|
|
19
|
+
* cloud. An empty pixel with enough covered neighbours adopts the nearest one, closing the gap
|
|
20
|
+
* without inflating point sizes. Cost is O(radius^2) texture taps per empty pixel per step.
|
|
21
|
+
* 0 disables it.
|
|
22
|
+
*/
|
|
23
|
+
export declare const DEFAULT_POINTCLOUD_GAP_FILL_RADIUS = 2;
|
|
24
|
+
/**
|
|
25
|
+
* Number of strided search widths the gap fill tries per empty pixel: step 1px, 2px, 4px, ...
|
|
26
|
+
* The tight step closes fine gaps seen from a distance; wider steps bridge the large gaps that
|
|
27
|
+
* open up with the camera close. Reaches ~GAP_FILL_RADIUS * 2^(steps-1) pixels.
|
|
28
|
+
*/
|
|
29
|
+
export declare const DEFAULT_POINTCLOUD_GAP_FILL_STEPS = 5;
|
|
30
|
+
/**
|
|
31
|
+
* Largest hole the fill will bridge, in world units (scene metres) at the surrounding
|
|
32
|
+
* surface's depth - NOT pixels. This is what makes the fill camera-distance aware: 0.3 m of
|
|
33
|
+
* surface projects to many pixels up close (big on-screen gaps get filled) but only a few
|
|
34
|
+
* pixels from far away (the model keeps its true silhouette). Independent of the depth checks.
|
|
35
|
+
*/
|
|
36
|
+
export declare const DEFAULT_POINTCLOUD_GAP_FILL_MAX_WORLD_GAP = 0.3;
|
|
37
|
+
/**
|
|
38
|
+
* Depth spread a gap fill tolerates as "one surface", as a fraction of the surface's view-space
|
|
39
|
+
* distance. Covers curvature and noise. Lower = fills only very flat patches, less bleeding
|
|
40
|
+
* across silhouettes; higher = fills more aggressively.
|
|
41
|
+
*/
|
|
42
|
+
export declare const DEFAULT_POINTCLOUD_GAP_FILL_DEPTH_TOLERANCE = 0.02;
|
|
43
|
+
/**
|
|
44
|
+
* Extra depth spread tolerated per world unit of search-window width, to allow steeply grazing
|
|
45
|
+
* surfaces (a floor seen edge-on) whose depth changes fast across the screen. ~tan of the
|
|
46
|
+
* steepest grazing angle still treated as a fillable surface (3 ~= 72 degrees).
|
|
47
|
+
*/
|
|
48
|
+
export declare const DEFAULT_POINTCLOUD_GAP_FILL_GRAZE_TOLERANCE = 3;
|
|
49
|
+
/**
|
|
50
|
+
* Coverage-weight threshold, under point blending, below which a pixel is treated as a gap even
|
|
51
|
+
* though the depth pre-pass gave it valid depth. The depth pre-pass writes full opaque depth for
|
|
52
|
+
* any pixel inside a point's circular footprint, including one right at the sprite's edge that
|
|
53
|
+
* the separate weighted colour pass only gave a sliver of coverage (color.w near 0) - visually a
|
|
54
|
+
* gap, but invisible to a depth>=1 check alone. 0 disables this (only literal depth>=1 gaps are
|
|
55
|
+
* filled).
|
|
56
|
+
*/
|
|
57
|
+
export declare const DEFAULT_POINTCLOUD_GAP_FILL_MIN_COVERAGE_WEIGHT = 0.2;
|
|
14
58
|
export declare const OBJECT_STYLING_TEXTURE_WIDTH = 256;
|
|
15
59
|
export declare const OBJECT_STYLING_TEXTURE_HEIGHT = 256;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Camera, RenderTargetOptions, ShaderMaterialParameters, Texture, WebGLRenderer, RawShaderMaterial, WebGLRenderTarget } from 'three';
|
|
2
|
+
import { RenderPass } from '../RenderPass';
|
|
3
|
+
import { createFullScreenTriangleMesh } from '../utilities/renderUtilities';
|
|
4
|
+
import { CadShadowMap } from '../render-pipeline-providers/types';
|
|
5
|
+
export type CadShadowPassFactories = {
|
|
6
|
+
createRenderTarget: (width: number, height: number, options: RenderTargetOptions) => WebGLRenderTarget;
|
|
7
|
+
createMaterial: (parameters: ShaderMaterialParameters) => RawShaderMaterial;
|
|
8
|
+
createFullScreenTriangleMesh: typeof createFullScreenTriangleMesh;
|
|
9
|
+
};
|
|
10
|
+
export declare const defaultCadShadowPassDependencies: CadShadowPassFactories;
|
|
11
|
+
export declare class CadShadowPass implements RenderPass {
|
|
12
|
+
private readonly _renderTarget;
|
|
13
|
+
private readonly _material;
|
|
14
|
+
private readonly _mesh;
|
|
15
|
+
private readonly _scene;
|
|
16
|
+
private readonly _shadowMap;
|
|
17
|
+
private readonly _clearColor;
|
|
18
|
+
private readonly _focusProbe;
|
|
19
|
+
private readonly _viewProjection;
|
|
20
|
+
private _focusDistance;
|
|
21
|
+
private _disposed;
|
|
22
|
+
constructor(cameraDepthTexture: Texture | null, shadowMap: CadShadowMap, terminatorFade?: number, factories?: Partial<CadShadowPassFactories>);
|
|
23
|
+
get texture(): Texture;
|
|
24
|
+
setSize(width: number, height: number): void;
|
|
25
|
+
render(renderer: WebGLRenderer, camera: Camera): void;
|
|
26
|
+
probeFocus(renderer: WebGLRenderer, camera: Camera): void;
|
|
27
|
+
dispose(): void;
|
|
28
|
+
private issueFocusReading;
|
|
29
|
+
private collectFocusReading;
|
|
30
|
+
private applyFocusReading;
|
|
31
|
+
}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Camera, Scene, WebGLRenderer } from 'three';
|
|
2
2
|
import { PostProcessingObjectsVisibilityParameters } from './types';
|
|
3
3
|
import { RenderPass } from '../RenderPass';
|
|
4
|
+
import { CadShadowPassFactories } from './CadShadowPass';
|
|
4
5
|
import { PostProcessingPipelineOptions } from '../render-pipeline-providers/types';
|
|
6
|
+
import { ICustomObject } from '../../../utilities';
|
|
5
7
|
/**
|
|
6
8
|
* Single pass that applies post processing effects and
|
|
7
9
|
* combines results from geometry passes.
|
|
@@ -13,9 +15,18 @@ export declare class PostProcessingPass implements RenderPass {
|
|
|
13
15
|
private readonly _postProcessingObjects;
|
|
14
16
|
private readonly _pointcloudBlitMaterial;
|
|
15
17
|
private readonly _postProcessingOptions;
|
|
18
|
+
private readonly _cadShadowPass;
|
|
19
|
+
private readonly _cadShadowMap;
|
|
20
|
+
private readonly _backBlitMaterial;
|
|
16
21
|
private readonly setBlendFactorByBackVisibility;
|
|
22
|
+
private _receiversForCustomObjectsEnabled;
|
|
17
23
|
updateRenderObjectsVisibility(visibilityParameters: PostProcessingObjectsVisibilityParameters): void;
|
|
18
|
-
constructor(scene: Scene, postProcessingPipelineOptions: PostProcessingPipelineOptions);
|
|
24
|
+
constructor(scene: Scene, postProcessingPipelineOptions: PostProcessingPipelineOptions, cadShadowPassDependencies?: Partial<CadShadowPassFactories>);
|
|
25
|
+
setSize(width: number, height: number): void;
|
|
26
|
+
adoptCustomObject(customObject: ICustomObject): void;
|
|
27
|
+
releaseCustomObject(customObject: ICustomObject): void;
|
|
28
|
+
setReceiversForCustomObjectsEnabled(enabled: boolean): void;
|
|
19
29
|
render(renderer: WebGLRenderer, camera: Camera): void;
|
|
30
|
+
private renderCadShadows;
|
|
20
31
|
dispose(): void;
|
|
21
32
|
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { Box3, Camera, Texture, WebGLRenderer, Matrix4, Vector3 } from 'three';
|
|
2
|
+
import { SceneHandler } from '../../../utilities';
|
|
3
|
+
import { CadMaterialManager } from '../CadMaterialManager';
|
|
4
|
+
import { RenderPass } from '../RenderPass';
|
|
5
|
+
import { CadShadowMap } from '../render-pipeline-providers/types';
|
|
6
|
+
export declare function resolveShadowMapResolution(maxTextureSize: number, mobileOrTablet: boolean): number;
|
|
7
|
+
export declare class ShadowMapPass implements RenderPass, CadShadowMap {
|
|
8
|
+
private readonly _renderTarget;
|
|
9
|
+
private readonly _depthTexture;
|
|
10
|
+
private readonly _lightCamera;
|
|
11
|
+
private readonly _geometryPass;
|
|
12
|
+
private readonly _matrix;
|
|
13
|
+
private readonly _center;
|
|
14
|
+
private readonly _corner;
|
|
15
|
+
private readonly _rayOrigin;
|
|
16
|
+
private readonly _rayDir;
|
|
17
|
+
private readonly _hit;
|
|
18
|
+
private readonly _focusPoint;
|
|
19
|
+
private readonly _boundingSphere;
|
|
20
|
+
private _hasFocus;
|
|
21
|
+
private _focusDistance;
|
|
22
|
+
private _renderedFocusDistance;
|
|
23
|
+
private _focusReadbackPending;
|
|
24
|
+
private _spanLevel;
|
|
25
|
+
private _fullLeft;
|
|
26
|
+
private _fullRight;
|
|
27
|
+
private _fullBottom;
|
|
28
|
+
private _fullTop;
|
|
29
|
+
private _stableTexelWorldSize;
|
|
30
|
+
private _resolution;
|
|
31
|
+
private _texelWorldSize;
|
|
32
|
+
private _depthRange;
|
|
33
|
+
private _hasValidBounds;
|
|
34
|
+
private _userEnabled;
|
|
35
|
+
private readonly _mobileOrTablet;
|
|
36
|
+
constructor(sceneHandler: SceneHandler, materialManager: CadMaterialManager, userEnabled?: boolean, mobileOrTablet?: boolean);
|
|
37
|
+
get depthTexture(): Texture;
|
|
38
|
+
get matrix(): Matrix4;
|
|
39
|
+
get texelWorldSize(): number;
|
|
40
|
+
get stableTexelWorldSize(): number;
|
|
41
|
+
get depthRange(): number;
|
|
42
|
+
get enabled(): boolean;
|
|
43
|
+
get userEnabled(): boolean;
|
|
44
|
+
setEnabled(enabled: boolean): void;
|
|
45
|
+
setFocusPoint(point: Vector3 | null): void;
|
|
46
|
+
setFocusDistance(distance: number | undefined, readbackPending?: boolean): void;
|
|
47
|
+
get focusNeedsRedraw(): boolean;
|
|
48
|
+
setCadBounds(bounds: Box3): void;
|
|
49
|
+
render(renderer: WebGLRenderer, camera?: Camera): void;
|
|
50
|
+
dispose(): void;
|
|
51
|
+
private applyShadowMapResolution;
|
|
52
|
+
private fitWindowToFocus;
|
|
53
|
+
private quantizeSpan;
|
|
54
|
+
private captureStableTexel;
|
|
55
|
+
private updateTexelWorldSize;
|
|
56
|
+
}
|
|
@@ -21,6 +21,7 @@ export type BlitOptions = {
|
|
|
21
21
|
overrideAlpha?: number;
|
|
22
22
|
edges?: boolean;
|
|
23
23
|
outline?: boolean;
|
|
24
|
+
cadShadow?: boolean;
|
|
24
25
|
};
|
|
25
26
|
export type DepthBlendBlitOptions = {
|
|
26
27
|
texture: Texture;
|
|
@@ -37,6 +38,8 @@ export type PointCloudPostProcessingOptions = {
|
|
|
37
38
|
depthTexture: DepthTexture | null;
|
|
38
39
|
pointBlending: boolean;
|
|
39
40
|
edlOptions: EdlOptions;
|
|
41
|
+
/** Half-width in samples of the gap fill. Defaults to DEFAULT_POINTCLOUD_GAP_FILL_RADIUS; 0 disables it. */
|
|
42
|
+
gapFillRadius?: number;
|
|
40
43
|
};
|
|
41
44
|
export declare const transparentBlendOptions: BlendOptions;
|
|
42
45
|
export type ThreeUniforms = {
|
package/dist/packages/rendering/src/render-pipeline-providers/DefaultRenderPipelineProvider.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { WebGLRenderTarget, WebGLRenderer } from 'three';
|
|
1
|
+
import { Vector3, WebGLRenderTarget, WebGLRenderer } from 'three';
|
|
2
2
|
import { CadMaterialManager } from '../CadMaterialManager';
|
|
3
3
|
import { RenderPass } from '../RenderPass';
|
|
4
4
|
import { RenderPipelineProvider } from '../RenderPipelineProvider';
|
|
@@ -17,17 +17,22 @@ export declare class DefaultRenderPipelineProvider implements RenderPipelineProv
|
|
|
17
17
|
private readonly _cadGeometryRenderPipeline;
|
|
18
18
|
private readonly _pointCloudRenderPipeline;
|
|
19
19
|
private readonly _postProcessingPass;
|
|
20
|
+
private readonly _shadowMapPass;
|
|
20
21
|
private readonly _ssaoPass;
|
|
21
22
|
private readonly _blitToScreenMaterial;
|
|
22
23
|
private readonly _blitToScreenMesh;
|
|
23
24
|
private readonly _materialManager;
|
|
24
25
|
private _rendererStateHelper;
|
|
25
26
|
private _ssaoSampleSize;
|
|
27
|
+
private readonly _cadBounds;
|
|
28
|
+
private readonly _cadModelBounds;
|
|
29
|
+
get shadowsEnabled(): boolean;
|
|
30
|
+
set shadowsEnabled(enabled: boolean);
|
|
26
31
|
set renderOptions(renderOptions: RenderOptions);
|
|
27
32
|
constructor(materialManager: CadMaterialManager, pointCloudMaterialManager: PointCloudMaterialManager, sceneHandler: SceneHandler, renderOptions: RenderOptions, outputRenderTarget?: {
|
|
28
33
|
target: WebGLRenderTarget;
|
|
29
34
|
autoSize?: boolean;
|
|
30
|
-
});
|
|
35
|
+
}, enableShadows?: boolean);
|
|
31
36
|
setOutputRenderTarget(target: WebGLRenderTarget | null, autoSizeRenderTarget?: boolean): void;
|
|
32
37
|
pipeline(renderer: WebGLRenderer): Generator<RenderPass>;
|
|
33
38
|
dispose(): void;
|
|
@@ -35,4 +40,7 @@ export declare class DefaultRenderPipelineProvider implements RenderPipelineProv
|
|
|
35
40
|
private updateRenderTargetSizes;
|
|
36
41
|
private shouldRenderSsao;
|
|
37
42
|
private shouldRenderPointClouds;
|
|
43
|
+
setShadowFocus(focus: Vector3): void;
|
|
44
|
+
get needsRedraw(): boolean;
|
|
45
|
+
private updateShadowCasterBounds;
|
|
38
46
|
}
|
|
@@ -1,5 +1,19 @@
|
|
|
1
|
-
import { Texture, Vector2, WebGLRenderTarget } from 'three';
|
|
1
|
+
import { Matrix4, Object3D, Texture, Vector2, WebGLRenderTarget } from 'three';
|
|
2
|
+
import { SectorScene } from '../../../cad-parsers';
|
|
2
3
|
import { EdlOptions } from '../rendering/types';
|
|
4
|
+
export type CadNodeLike = Object3D & {
|
|
5
|
+
readonly sectorScene: SectorScene;
|
|
6
|
+
readonly rootSector: Object3D;
|
|
7
|
+
};
|
|
8
|
+
export type CadShadowMap = {
|
|
9
|
+
readonly depthTexture: Texture;
|
|
10
|
+
readonly matrix: Matrix4;
|
|
11
|
+
readonly texelWorldSize: number;
|
|
12
|
+
readonly stableTexelWorldSize: number;
|
|
13
|
+
readonly depthRange: number;
|
|
14
|
+
readonly enabled: boolean;
|
|
15
|
+
setFocusDistance?(distance: number | undefined, readbackPending: boolean): void;
|
|
16
|
+
};
|
|
3
17
|
export type RenderTargetData = {
|
|
4
18
|
currentRenderSize: Vector2;
|
|
5
19
|
ssaoRenderTarget: WebGLRenderTarget;
|
|
@@ -17,7 +31,11 @@ export type PointCloudRenderTargets = {
|
|
|
17
31
|
};
|
|
18
32
|
export type PostProcessingPipelineOptions = CadGeometryRenderTargets & PointCloudRenderTargets & {
|
|
19
33
|
ssaoTexture: Texture;
|
|
34
|
+
cadShadow?: {
|
|
35
|
+
map: CadShadowMap;
|
|
36
|
+
};
|
|
20
37
|
edges: boolean;
|
|
21
38
|
pointBlending?: boolean;
|
|
22
39
|
edlOptions: EdlOptions;
|
|
23
40
|
};
|
|
41
|
+
export type PointCloudBlitUniformName = 'screenWidth' | 'screenHeight' | 'cameraNear' | 'cameraFar' | 'orthographicCamera' | 'worldPerPixel';
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Camera, ColorRepresentation, Texture, WebGLRenderer, Scene, RawShaderMaterial } from 'three';
|
|
2
|
+
/**
|
|
3
|
+
* Surface on a custom object that samples a color or texture and receives CAD shadows.
|
|
4
|
+
* The viewer creates one for each up-facing plane that receives shadows.
|
|
5
|
+
* A skybox stays on its own material when `receiveShadow` is false.
|
|
6
|
+
* @public
|
|
7
|
+
*/
|
|
8
|
+
export declare class CadShadowReceiverForCustomObjectMaterial extends RawShaderMaterial {
|
|
9
|
+
private static frameShadowMap;
|
|
10
|
+
constructor(color?: ColorRepresentation, map?: Texture | null);
|
|
11
|
+
onBeforeRender(_renderer: WebGLRenderer, _scene: Scene, camera: Camera, _geometry: unknown, _object: unknown, _group: unknown): void;
|
|
12
|
+
setMap(map: Texture | null): void;
|
|
13
|
+
setColor(color: ColorRepresentation): void;
|
|
14
|
+
private refreshMapTransform;
|
|
15
|
+
}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Camera, Vector3 } from 'three';
|
|
2
|
+
export declare const CAD_LIGHT_WORLD: Vector3;
|
|
3
|
+
export declare const CAD_SHADOW_STRENGTH = 0.4;
|
|
4
|
+
export declare function cadLightDirectionInViewSpace(camera: Camera, target: Vector3): Vector3;
|
|
5
|
+
export declare function cadUpDirectionInViewSpace(camera: Camera, target: Vector3): Vector3;
|
|
@@ -34,5 +34,6 @@ export declare const pointCloudShaders: PointCloudShaders;
|
|
|
34
34
|
*/
|
|
35
35
|
export declare const ssaoShaders: ShaderPair;
|
|
36
36
|
export declare const blitShaders: ShaderPair;
|
|
37
|
+
export declare const cadShadowShaders: ShaderPair;
|
|
37
38
|
export declare const depthBlendBlitShaders: ShaderPair;
|
|
38
39
|
export {};
|
|
@@ -61,6 +61,7 @@ export { isPointVisibleByPlanes } from './src/three/isPointVisibleByPlanes';
|
|
|
61
61
|
export { CDF_TO_VIEWER_TRANSFORMATION } from './src/constants';
|
|
62
62
|
export { createUint8View } from './src/createUint8View';
|
|
63
63
|
export { isDefined } from './src/isDefined';
|
|
64
|
+
export { isRenderContextLost, setRenderContextLost } from './src/renderContextState';
|
|
64
65
|
export * from './src/fdm';
|
|
65
66
|
export * from './src/assetMappings';
|
|
66
67
|
export * from './src/shapes';
|
|
@@ -5,6 +5,8 @@ export declare class SceneHandler {
|
|
|
5
5
|
private readonly _cadModels;
|
|
6
6
|
private readonly _pointCloudModels;
|
|
7
7
|
private readonly _customObjects;
|
|
8
|
+
onCustomObjectAdded: ((customObject: ICustomObject) => void) | undefined;
|
|
9
|
+
onCustomObjectRemoved: ((customObject: ICustomObject) => void) | undefined;
|
|
8
10
|
get scene(): Scene;
|
|
9
11
|
get cadModels(): {
|
|
10
12
|
cadNode: Object3D;
|
|
@@ -13,6 +13,7 @@ export declare class CustomObject implements ICustomObject {
|
|
|
13
13
|
private _shouldPick;
|
|
14
14
|
private _shouldPickBoundingBox;
|
|
15
15
|
private _useDepthTest;
|
|
16
|
+
private _receiveShadow;
|
|
16
17
|
/**
|
|
17
18
|
* Constructor
|
|
18
19
|
* @beta
|
|
@@ -51,6 +52,13 @@ export declare class CustomObject implements ICustomObject {
|
|
|
51
52
|
*/
|
|
52
53
|
get useDepthTest(): boolean;
|
|
53
54
|
set useDepthTest(value: boolean);
|
|
55
|
+
/**
|
|
56
|
+
* Whether CAD shadows fall on this object.
|
|
57
|
+
* Default is false.
|
|
58
|
+
* @beta
|
|
59
|
+
*/
|
|
60
|
+
get receiveShadow(): boolean;
|
|
61
|
+
set receiveShadow(value: boolean);
|
|
54
62
|
/**
|
|
55
63
|
* Get the bounding box from the object
|
|
56
64
|
* @beta
|
|
@@ -36,6 +36,12 @@ export interface ICustomObject {
|
|
|
36
36
|
* @beta
|
|
37
37
|
*/
|
|
38
38
|
get useDepthTest(): boolean;
|
|
39
|
+
/**
|
|
40
|
+
* Whether CAD shadows fall on this object.
|
|
41
|
+
* Optional. When omitted, the object does not receive shadows.
|
|
42
|
+
* @beta
|
|
43
|
+
*/
|
|
44
|
+
readonly receiveShadow?: boolean;
|
|
39
45
|
/**
|
|
40
46
|
* Get the bounding box from the object
|
|
41
47
|
* @beta
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cognite/reveal",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.38.0",
|
|
4
4
|
"description": "WebGL based 3D viewer for CAD and point clouds processed in Cognite Data Fusion.",
|
|
5
5
|
"homepage": "https://github.com/cognitedata/reveal/tree/master/viewer",
|
|
6
6
|
"repository": {
|
|
@@ -85,12 +85,12 @@
|
|
|
85
85
|
"@types/random-seed": "^0.3.5",
|
|
86
86
|
"@types/skmeans": "^0.11.7",
|
|
87
87
|
"@types/stats": "^0.16.30",
|
|
88
|
-
"@types/three": "^0.
|
|
88
|
+
"@types/three": "^0.186.0",
|
|
89
89
|
"@vitest/coverage-v8": "^4.1.7",
|
|
90
90
|
"dat.gui": "^0.7.9",
|
|
91
91
|
"eslint": "^10.5.0",
|
|
92
92
|
"eslint-config-prettier": "^10.0.0",
|
|
93
|
-
"eslint-plugin-jsdoc": "^
|
|
93
|
+
"eslint-plugin-jsdoc": "^65.0.0",
|
|
94
94
|
"eslint-plugin-prettier": "^5.1.3",
|
|
95
95
|
"eslint-plugin-unused-imports": "^4.0.0",
|
|
96
96
|
"globals": "^17.0.0",
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
"prettier": "^3.2.5",
|
|
102
102
|
"shx": "^0.4.0",
|
|
103
103
|
"stats.js": "^0.17.0",
|
|
104
|
-
"three": "0.
|
|
104
|
+
"three": "0.186.1",
|
|
105
105
|
"typescript": "^6.0.3",
|
|
106
106
|
"unplugin-dts": "^1.0.2",
|
|
107
107
|
"vite": "^8.1.0",
|
|
@@ -112,10 +112,10 @@
|
|
|
112
112
|
},
|
|
113
113
|
"peerDependencies": {
|
|
114
114
|
"@cognite/sdk": "^10.0.0",
|
|
115
|
-
"three": "0.
|
|
115
|
+
"three": "0.186.1"
|
|
116
116
|
},
|
|
117
117
|
"files": [
|
|
118
118
|
"dist"
|
|
119
119
|
],
|
|
120
|
-
"packageManager": "pnpm@11.
|
|
120
|
+
"packageManager": "pnpm@12.11.2"
|
|
121
121
|
}
|