@loaders.gl/tiles 5.0.0-alpha.1 → 5.0.0-alpha.2
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/LICENSE +14 -3
- package/dist/dist.dev.js +2396 -274
- package/dist/dist.min.js +1 -1
- package/dist/index.cjs +2763 -337
- package/dist/index.cjs.map +3 -4
- package/dist/index.d.ts +7 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/point-cloud/point-cloud-tile.d.ts.map +1 -1
- package/dist/point-cloud/point-cloud-tile.js +3 -0
- package/dist/point-cloud/point-cloud-tile.js.map +1 -1
- package/dist/point-cloud/point-cloud-tileset.d.ts.map +1 -1
- package/dist/point-cloud/point-cloud-tileset.js +3 -0
- package/dist/point-cloud/point-cloud-tileset.js.map +1 -1
- package/dist/point-cloud/types.d.ts.map +1 -1
- package/dist/point-cloud/types.js +3 -0
- package/dist/point-cloud/types.js.map +1 -1
- package/dist/raster-set.d.ts +35 -29
- package/dist/raster-set.d.ts.map +1 -1
- package/dist/raster-set.js +7 -1
- package/dist/raster-set.js.map +1 -1
- package/dist/tileset-3d/common/tile-3d.d.ts +98 -3
- package/dist/tileset-3d/common/tile-3d.d.ts.map +1 -1
- package/dist/tileset-3d/common/tile-3d.js +229 -15
- package/dist/tileset-3d/common/tile-3d.js.map +1 -1
- package/dist/tileset-3d/common/tileset-3d.d.ts +143 -3
- package/dist/tileset-3d/common/tileset-3d.d.ts.map +1 -1
- package/dist/tileset-3d/common/tileset-3d.js +257 -16
- package/dist/tileset-3d/common/tileset-3d.js.map +1 -1
- package/dist/tileset-3d/common/tileset-cache.d.ts +11 -1
- package/dist/tileset-3d/common/tileset-cache.d.ts.map +1 -1
- package/dist/tileset-3d/common/tileset-cache.js +11 -3
- package/dist/tileset-3d/common/tileset-cache.js.map +1 -1
- package/dist/tileset-3d/common/tileset-source.d.ts +18 -0
- package/dist/tileset-3d/common/tileset-source.d.ts.map +1 -1
- package/dist/tileset-3d/common/tileset-source.js.map +1 -1
- package/dist/tileset-3d/common/tileset-traverser.d.ts +13 -0
- package/dist/tileset-3d/common/tileset-traverser.d.ts.map +1 -1
- package/dist/tileset-3d/common/tileset-traverser.js +28 -1
- package/dist/tileset-3d/common/tileset-traverser.js.map +1 -1
- package/dist/tileset-3d/format-3d-tiles/implicit-tiling.d.ts +111 -0
- package/dist/tileset-3d/format-3d-tiles/implicit-tiling.d.ts.map +1 -0
- package/dist/tileset-3d/format-3d-tiles/implicit-tiling.js +340 -0
- package/dist/tileset-3d/format-3d-tiles/implicit-tiling.js.map +1 -0
- package/dist/tileset-3d/format-3d-tiles/tiles-3d-source.d.ts +92 -3
- package/dist/tileset-3d/format-3d-tiles/tiles-3d-source.d.ts.map +1 -1
- package/dist/tileset-3d/format-3d-tiles/tiles-3d-source.js +211 -13
- package/dist/tileset-3d/format-3d-tiles/tiles-3d-source.js.map +1 -1
- package/dist/tileset-3d/format-3d-tiles/tileset-3d-traverser.d.ts +36 -0
- package/dist/tileset-3d/format-3d-tiles/tileset-3d-traverser.d.ts.map +1 -1
- package/dist/tileset-3d/format-3d-tiles/tileset-3d-traverser.js +66 -0
- package/dist/tileset-3d/format-3d-tiles/tileset-3d-traverser.js.map +1 -1
- package/dist/tileset-3d/format-i3s/i3s-pending-tiles-register.d.ts.map +1 -1
- package/dist/tileset-3d/format-i3s/i3s-pending-tiles-register.js +3 -0
- package/dist/tileset-3d/format-i3s/i3s-pending-tiles-register.js.map +1 -1
- package/dist/tileset-3d/format-i3s/i3s-tile-manager.d.ts.map +1 -1
- package/dist/tileset-3d/format-i3s/i3s-tile-manager.js +3 -0
- package/dist/tileset-3d/format-i3s/i3s-tile-manager.js.map +1 -1
- package/dist/tileset-3d/format-i3s/i3s-tileset-traverser.d.ts.map +1 -1
- package/dist/tileset-3d/format-i3s/i3s-tileset-traverser.js +3 -0
- package/dist/tileset-3d/format-i3s/i3s-tileset-traverser.js.map +1 -1
- package/dist/tileset-3d/helpers/3d-tiles-options.d.ts.map +1 -1
- package/dist/tileset-3d/helpers/3d-tiles-options.js +3 -0
- package/dist/tileset-3d/helpers/3d-tiles-options.js.map +1 -1
- package/dist/tileset-3d/helpers/bounding-volume.d.ts.map +1 -1
- package/dist/tileset-3d/helpers/bounding-volume.js +1 -0
- package/dist/tileset-3d/helpers/bounding-volume.js.map +1 -1
- package/dist/tileset-3d/helpers/frame-state.d.ts +59 -1
- package/dist/tileset-3d/helpers/frame-state.d.ts.map +1 -1
- package/dist/tileset-3d/helpers/frame-state.js +84 -9
- package/dist/tileset-3d/helpers/frame-state.js.map +1 -1
- package/dist/tileset-3d/helpers/tiles-3d-lod.d.ts +61 -9
- package/dist/tileset-3d/helpers/tiles-3d-lod.d.ts.map +1 -1
- package/dist/tileset-3d/helpers/tiles-3d-lod.js +198 -93
- package/dist/tileset-3d/helpers/tiles-3d-lod.js.map +1 -1
- package/dist/tileset-3d/helpers/tiles-3d-request-priority.d.ts +134 -0
- package/dist/tileset-3d/helpers/tiles-3d-request-priority.d.ts.map +1 -0
- package/dist/tileset-3d/helpers/tiles-3d-request-priority.js +179 -0
- package/dist/tileset-3d/helpers/tiles-3d-request-priority.js.map +1 -0
- package/dist/types.d.ts +2 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +3 -0
- package/dist/types.js.map +1 -1
- package/dist/utils/doubly-linked-list.d.ts.map +1 -1
- package/dist/utils/doubly-linked-list.js +1 -0
- package/dist/utils/doubly-linked-list.js.map +1 -1
- package/dist/utils/managed-array.d.ts.map +1 -1
- package/dist/utils/managed-array.js +1 -0
- package/dist/utils/managed-array.js.map +1 -1
- package/package.json +5 -5
- package/src/index.ts +19 -0
- package/src/point-cloud/point-cloud-tile.ts +4 -0
- package/src/point-cloud/point-cloud-tileset.ts +4 -0
- package/src/point-cloud/types.ts +4 -0
- package/src/raster-set.ts +81 -43
- package/src/tileset-3d/common/tile-3d.ts +285 -21
- package/src/tileset-3d/common/tileset-3d.ts +368 -17
- package/src/tileset-3d/common/tileset-cache.ts +15 -7
- package/src/tileset-3d/common/tileset-source.ts +21 -0
- package/src/tileset-3d/common/tileset-traverser.ts +29 -1
- package/src/tileset-3d/format-3d-tiles/implicit-tiling.ts +534 -0
- package/src/tileset-3d/format-3d-tiles/tiles-3d-source.ts +266 -13
- package/src/tileset-3d/format-3d-tiles/tileset-3d-traverser.ts +77 -0
- package/src/tileset-3d/format-i3s/i3s-pending-tiles-register.ts +4 -0
- package/src/tileset-3d/format-i3s/i3s-tile-manager.ts +4 -0
- package/src/tileset-3d/format-i3s/i3s-tileset-traverser.ts +4 -0
- package/src/tileset-3d/helpers/3d-tiles-options.ts +4 -0
- package/src/tileset-3d/helpers/bounding-volume.ts +2 -0
- package/src/tileset-3d/helpers/frame-state.ts +139 -11
- package/src/tileset-3d/helpers/tiles-3d-lod.ts +291 -112
- package/src/tileset-3d/helpers/tiles-3d-request-priority.ts +301 -0
- package/src/types.ts +6 -0
- package/src/utils/doubly-linked-list.ts +2 -0
- package/src/utils/managed-array.ts +2 -0
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
// loaders.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
|
|
1
5
|
import type {Tile3D} from '../common/tile-3d';
|
|
2
6
|
import {Vector3} from '@math.gl/core';
|
|
3
7
|
import {CullingVolume, Plane} from '@math.gl/culling';
|
|
@@ -6,9 +10,18 @@ import {GeospatialViewport, Viewport} from '../../types';
|
|
|
6
10
|
|
|
7
11
|
export type FrameState = {
|
|
8
12
|
camera: {
|
|
13
|
+
/** Camera position in WGS84 Cartesian meters. */
|
|
9
14
|
position: number[];
|
|
15
|
+
/** Normalized camera direction in WGS84 Cartesian coordinates. */
|
|
10
16
|
direction: number[];
|
|
17
|
+
/** Normalized camera up direction in WGS84 Cartesian coordinates. */
|
|
11
18
|
up: number[];
|
|
19
|
+
/** Camera position as `[longitude, latitude, height]`, with height in meters. */
|
|
20
|
+
cartographicPosition: [number, number, number];
|
|
21
|
+
/** Perspective vertical field of view in radians. */
|
|
22
|
+
verticalFieldOfView: number;
|
|
23
|
+
/** Elapsed seconds since camera position or direction last changed. */
|
|
24
|
+
timeSinceMovement: number;
|
|
12
25
|
};
|
|
13
26
|
viewport: GeospatialViewport;
|
|
14
27
|
topDownViewport: GeospatialViewport; // Use it to calculate projected radius for a tile
|
|
@@ -16,10 +29,38 @@ export type FrameState = {
|
|
|
16
29
|
cullingVolume: CullingVolume;
|
|
17
30
|
frameNumber: number; // TODO: This can be the same between updates, what number is unique for between updates?
|
|
18
31
|
sseDenominator: number; // Assumes fovy = 60 degrees
|
|
32
|
+
/** View-dependent density used by perspective dynamic screen-space error for this traversal. */
|
|
33
|
+
dynamicScreenSpaceErrorDensity: number;
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
/** Optional camera and projection measurements supplied when constructing a frame state. */
|
|
37
|
+
export type GetFrameStateOptions = {
|
|
38
|
+
/** Elapsed seconds since camera position or direction last changed. */
|
|
39
|
+
timeSinceCameraMovement?: number;
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
/** Camera pose and timestamp retained between traversal frames. */
|
|
43
|
+
export type CameraMotionState = {
|
|
44
|
+
/** Last observed Earth-centered, Earth-fixed camera position. */
|
|
45
|
+
position: number[];
|
|
46
|
+
/** Last observed normalized Earth-centered, Earth-fixed camera direction. */
|
|
47
|
+
direction: number[];
|
|
48
|
+
/** Timestamp in milliseconds of the last observed pose change. */
|
|
49
|
+
lastMovementTime: number;
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
/** Updated camera state and elapsed stationary time for a traversal frame. */
|
|
53
|
+
export type CameraMotionUpdate = {
|
|
54
|
+
/** Camera pose to retain for the next traversal. */
|
|
55
|
+
state: CameraMotionState;
|
|
56
|
+
/** Elapsed seconds since the camera pose last changed. */
|
|
57
|
+
timeSinceMovement: number;
|
|
19
58
|
};
|
|
20
59
|
|
|
21
60
|
const scratchVector = new Vector3();
|
|
22
61
|
const scratchPosition = new Vector3();
|
|
62
|
+
const CAMERA_POSITION_EPSILON = 1e-5;
|
|
63
|
+
const CAMERA_DIRECTION_EPSILON = 1e-7;
|
|
23
64
|
const cullingVolume = new CullingVolume([
|
|
24
65
|
new Plane(),
|
|
25
66
|
new Plane(),
|
|
@@ -29,12 +70,26 @@ const cullingVolume = new CullingVolume([
|
|
|
29
70
|
new Plane()
|
|
30
71
|
]);
|
|
31
72
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
73
|
+
/**
|
|
74
|
+
* Extracts a frame state appropriate for tile culling from a structural deck.gl viewport.
|
|
75
|
+
*
|
|
76
|
+
* `options.timeSinceCameraMovement` can be supplied by a caller that retains camera pose across
|
|
77
|
+
* calls. It defaults to a stationary camera so standalone callers do not defer requests.
|
|
78
|
+
*
|
|
79
|
+
* @param viewport - Geospatial viewport supplying camera and projection measurements.
|
|
80
|
+
* @param frameNumber - Current tileset traversal frame number.
|
|
81
|
+
* @param options - Additional camera and projection measurements for traversal.
|
|
82
|
+
* @returns Frame state used for visibility, SSE, and request-priority calculations.
|
|
83
|
+
*/
|
|
84
|
+
export function getFrameState(
|
|
85
|
+
viewport: GeospatialViewport,
|
|
86
|
+
frameNumber: number,
|
|
87
|
+
options: GetFrameStateOptions = {}
|
|
88
|
+
): FrameState {
|
|
35
89
|
// Traverse and and request. Update _selectedTiles so that we know what to render.
|
|
36
90
|
// Traverse and and request. Update _selectedTiles so that we know what to render.
|
|
37
|
-
const {
|
|
91
|
+
const {cameraUp, height} = viewport;
|
|
92
|
+
const cameraDirection = viewport.cameraDirection as number[] | undefined;
|
|
38
93
|
const {metersPerUnit} = viewport.distanceScales;
|
|
39
94
|
|
|
40
95
|
// TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.
|
|
@@ -49,10 +104,26 @@ export function getFrameState(viewport: GeospatialViewport, frameNumber: number)
|
|
|
49
104
|
);
|
|
50
105
|
|
|
51
106
|
// These should still be normalized as the transform has scale 1 (goes from meters to meters)
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
107
|
+
let cameraDirectionCartesian: Vector3;
|
|
108
|
+
if (cameraDirection) {
|
|
109
|
+
cameraDirectionCartesian = new Vector3(
|
|
110
|
+
// @ts-ignore
|
|
111
|
+
enuToFixedTransform.transformAsVector(new Vector3(cameraDirection).scale(metersPerUnit))
|
|
112
|
+
).normalize();
|
|
113
|
+
} else {
|
|
114
|
+
// Concrete deck.gl viewports do not expose the legacy structural cameraDirection field.
|
|
115
|
+
// The near-plane center is on the view axis, so its world-space direction is equivalent and
|
|
116
|
+
// works for perspective foveation without coupling loaders.gl to deck.gl internals.
|
|
117
|
+
// getFrustumPlanes is required by traversal but omitted from the minimal structural Viewport
|
|
118
|
+
// type for compatibility with existing application-side declarations.
|
|
119
|
+
// @ts-expect-error Runtime geospatial viewports provide getFrustumPlanes.
|
|
120
|
+
const nearPlane = viewport.getFrustumPlanes().near;
|
|
121
|
+
const nearCenterCommon = closestPointOnPlane(nearPlane, viewport.cameraPosition);
|
|
122
|
+
const nearCenterCartesian = worldToCartesian(viewport, nearCenterCommon);
|
|
123
|
+
cameraDirectionCartesian = new Vector3(nearCenterCartesian)
|
|
124
|
+
.subtract(cameraPositionCartesian)
|
|
125
|
+
.normalize();
|
|
126
|
+
}
|
|
56
127
|
const cameraUpCartesian = new Vector3(
|
|
57
128
|
// @ts-ignore
|
|
58
129
|
enuToFixedTransform.transformAsVector(new Vector3(cameraUp).scale(metersPerUnit))
|
|
@@ -78,14 +149,71 @@ export function getFrameState(viewport: GeospatialViewport, frameNumber: number)
|
|
|
78
149
|
camera: {
|
|
79
150
|
position: cameraPositionCartesian,
|
|
80
151
|
direction: cameraDirectionCartesian,
|
|
81
|
-
up: cameraUpCartesian
|
|
152
|
+
up: cameraUpCartesian,
|
|
153
|
+
cartographicPosition: cameraPositionCartographic,
|
|
154
|
+
verticalFieldOfView:
|
|
155
|
+
Number.isFinite(viewport.fovy) && Number(viewport.fovy) > 0
|
|
156
|
+
? (Number(viewport.fovy) * Math.PI) / 180
|
|
157
|
+
: Math.PI / 3,
|
|
158
|
+
timeSinceMovement: options.timeSinceCameraMovement ?? Number.POSITIVE_INFINITY
|
|
82
159
|
},
|
|
83
160
|
viewport,
|
|
84
161
|
topDownViewport,
|
|
85
162
|
height,
|
|
86
163
|
cullingVolume,
|
|
87
164
|
frameNumber, // TODO: This can be the same between updates, what number is unique for between updates?
|
|
88
|
-
sseDenominator: 1.15 // Assumes fovy = 60 degrees
|
|
165
|
+
sseDenominator: 1.15, // Assumes fovy = 60 degrees
|
|
166
|
+
// Tileset3D fills this immediately before traversal because it depends on the root volume.
|
|
167
|
+
dynamicScreenSpaceErrorDensity: 0
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/**
|
|
172
|
+
* Updates retained camera motion state and calculates how long the current pose has been stable.
|
|
173
|
+
*
|
|
174
|
+
* The first observation is treated as stationary so initial tileset loading is never delayed.
|
|
175
|
+
* Position and direction are both compared because orbiting in place changes request relevance
|
|
176
|
+
* without necessarily changing the viewport's camera position.
|
|
177
|
+
*
|
|
178
|
+
* @param previousState - Pose retained from the preceding traversal for this viewport.
|
|
179
|
+
* @param position - Current Earth-centered, Earth-fixed camera position.
|
|
180
|
+
* @param direction - Current normalized Earth-centered, Earth-fixed camera direction.
|
|
181
|
+
* @param currentTime - Current monotonic-enough wall-clock time in milliseconds.
|
|
182
|
+
* @returns Updated pose and elapsed stationary time.
|
|
183
|
+
*/
|
|
184
|
+
export function updateCameraMotionState(
|
|
185
|
+
previousState: CameraMotionState | undefined,
|
|
186
|
+
position: number[] | Vector3,
|
|
187
|
+
direction: number[] | Vector3,
|
|
188
|
+
currentTime: number
|
|
189
|
+
): CameraMotionUpdate {
|
|
190
|
+
const positionArray = Array.from(position);
|
|
191
|
+
const directionArray = Array.from(direction);
|
|
192
|
+
const positionChanged = previousState
|
|
193
|
+
? positionArray.length !== previousState.position.length ||
|
|
194
|
+
positionArray.some(
|
|
195
|
+
(value, index) => Math.abs(value - previousState.position[index]) > CAMERA_POSITION_EPSILON
|
|
196
|
+
)
|
|
197
|
+
: false;
|
|
198
|
+
const directionChanged = previousState
|
|
199
|
+
? directionArray.length !== previousState.direction.length ||
|
|
200
|
+
directionArray.some(
|
|
201
|
+
(value, index) =>
|
|
202
|
+
Math.abs(value - previousState.direction[index]) > CAMERA_DIRECTION_EPSILON
|
|
203
|
+
)
|
|
204
|
+
: false;
|
|
205
|
+
const lastMovementTime =
|
|
206
|
+
positionChanged || directionChanged
|
|
207
|
+
? currentTime
|
|
208
|
+
: (previousState?.lastMovementTime ?? Number.NEGATIVE_INFINITY);
|
|
209
|
+
|
|
210
|
+
return {
|
|
211
|
+
state: {
|
|
212
|
+
position: positionArray,
|
|
213
|
+
direction: directionArray,
|
|
214
|
+
lastMovementTime
|
|
215
|
+
},
|
|
216
|
+
timeSinceMovement: Math.max((currentTime - lastMovementTime) / 1000, 0)
|
|
89
217
|
};
|
|
90
218
|
}
|
|
91
219
|
|
|
@@ -162,7 +290,7 @@ function commonSpacePlanesToWGS84(viewport) {
|
|
|
162
290
|
|
|
163
291
|
function closestPointOnPlane(
|
|
164
292
|
plane: {distance: number; normal: Vector3},
|
|
165
|
-
refPoint: [
|
|
293
|
+
refPoint: number[] | Vector3,
|
|
166
294
|
out: Vector3 = new Vector3()
|
|
167
295
|
): Vector3 {
|
|
168
296
|
const distanceToRef = plane.normal.dot(refPoint);
|