@loaders.gl/tiles 3.3.0-alpha.1 → 3.3.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/dist/dist.min.js +96 -50
- package/dist/es5/tileset/helpers/frame-state.js +26 -11
- package/dist/es5/tileset/helpers/frame-state.js.map +1 -1
- package/dist/es5/tileset/helpers/i3s-lod.js.map +1 -1
- package/dist/es5/tileset/tile-3d.js +11 -2
- package/dist/es5/tileset/tile-3d.js.map +1 -1
- package/dist/es5/tileset/tileset-3d.js +11 -11
- package/dist/es5/tileset/tileset-3d.js.map +1 -1
- package/dist/es5/tileset/traversers/{i3s-frame-counter.js → i3s-pending-tiles-register.js} +19 -9
- package/dist/es5/tileset/traversers/i3s-pending-tiles-register.js.map +1 -0
- package/dist/es5/tileset/traversers/i3s-tile-manager.js +22 -12
- package/dist/es5/tileset/traversers/i3s-tile-manager.js.map +1 -1
- package/dist/es5/tileset/traversers/i3s-tileset-traverser.js +4 -5
- package/dist/es5/tileset/traversers/i3s-tileset-traverser.js.map +1 -1
- package/dist/es5/tileset/traversers/tileset-traverser.js +2 -2
- package/dist/es5/tileset/traversers/tileset-traverser.js.map +1 -1
- package/dist/esm/tileset/helpers/frame-state.js +25 -9
- package/dist/esm/tileset/helpers/frame-state.js.map +1 -1
- package/dist/esm/tileset/helpers/i3s-lod.js.map +1 -1
- package/dist/esm/tileset/tile-3d.js +11 -2
- package/dist/esm/tileset/tile-3d.js.map +1 -1
- package/dist/esm/tileset/tileset-3d.js +12 -9
- package/dist/esm/tileset/tileset-3d.js.map +1 -1
- package/dist/esm/tileset/traversers/i3s-pending-tiles-register.js +33 -0
- package/dist/esm/tileset/traversers/i3s-pending-tiles-register.js.map +1 -0
- package/dist/esm/tileset/traversers/i3s-tile-manager.js +32 -11
- package/dist/esm/tileset/traversers/i3s-tile-manager.js.map +1 -1
- package/dist/esm/tileset/traversers/i3s-tileset-traverser.js +4 -5
- package/dist/esm/tileset/traversers/i3s-tileset-traverser.js.map +1 -1
- package/dist/esm/tileset/traversers/tileset-traverser.js +2 -2
- package/dist/esm/tileset/traversers/tileset-traverser.js.map +1 -1
- package/dist/tileset/helpers/frame-state.d.ts +4 -7
- package/dist/tileset/helpers/frame-state.d.ts.map +1 -1
- package/dist/tileset/helpers/frame-state.js +26 -12
- package/dist/tileset/helpers/i3s-lod.d.ts.map +1 -1
- package/dist/tileset/tile-3d.d.ts +10 -3
- package/dist/tileset/tile-3d.d.ts.map +1 -1
- package/dist/tileset/tile-3d.js +11 -2
- package/dist/tileset/tileset-3d.d.ts +3 -2
- package/dist/tileset/tileset-3d.d.ts.map +1 -1
- package/dist/tileset/tileset-3d.js +11 -9
- package/dist/tileset/traversers/{i3s-frame-counter.d.ts → i3s-pending-tiles-register.d.ts} +7 -4
- package/dist/tileset/traversers/i3s-pending-tiles-register.d.ts.map +1 -0
- package/dist/tileset/traversers/{i3s-frame-counter.js → i3s-pending-tiles-register.js} +17 -8
- package/dist/tileset/traversers/i3s-tile-manager.d.ts +19 -1
- package/dist/tileset/traversers/i3s-tile-manager.d.ts.map +1 -1
- package/dist/tileset/traversers/i3s-tile-manager.js +32 -12
- package/dist/tileset/traversers/i3s-tileset-traverser.d.ts +1 -1
- package/dist/tileset/traversers/i3s-tileset-traverser.d.ts.map +1 -1
- package/dist/tileset/traversers/i3s-tileset-traverser.js +5 -5
- package/dist/tileset/traversers/tileset-traverser.d.ts +1 -1
- package/dist/tileset/traversers/tileset-traverser.d.ts.map +1 -1
- package/dist/tileset/traversers/tileset-traverser.js +2 -2
- package/dist/types.d.ts +21 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/tileset/helpers/frame-state.ts +46 -19
- package/src/tileset/helpers/i3s-lod.ts +3 -1
- package/src/tileset/tile-3d.ts +11 -2
- package/src/tileset/tileset-3d.ts +17 -14
- package/src/tileset/traversers/i3s-pending-tiles-register.ts +44 -0
- package/src/tileset/traversers/i3s-tile-manager.ts +47 -11
- package/src/tileset/traversers/i3s-tileset-traverser.ts +5 -5
- package/src/tileset/traversers/tileset-traverser.ts +2 -2
- package/src/types.ts +23 -0
- package/dist/es5/tileset/traversers/i3s-frame-counter.js.map +0 -1
- package/dist/esm/tileset/traversers/i3s-frame-counter.js +0 -23
- package/dist/esm/tileset/traversers/i3s-frame-counter.js.map +0 -1
- package/dist/tileset/traversers/i3s-frame-counter.d.ts.map +0 -1
- package/src/tileset/traversers/i3s-frame-counter.ts +0 -35
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
-
import I3SPendingTilesRegister from './i3s-
|
|
2
|
+
import I3SPendingTilesRegister from './i3s-pending-tiles-register';
|
|
3
3
|
const STATUS = {
|
|
4
4
|
REQUESTED: 'REQUESTED',
|
|
5
5
|
COMPLETED: 'COMPLETED',
|
|
@@ -17,7 +17,10 @@ export default class I3STileManager {
|
|
|
17
17
|
add(request, key, callback, frameState) {
|
|
18
18
|
if (!this._statusMap[key]) {
|
|
19
19
|
const {
|
|
20
|
-
frameNumber
|
|
20
|
+
frameNumber,
|
|
21
|
+
viewport: {
|
|
22
|
+
id
|
|
23
|
+
}
|
|
21
24
|
} = frameState;
|
|
22
25
|
this._statusMap[key] = {
|
|
23
26
|
request,
|
|
@@ -26,21 +29,27 @@ export default class I3STileManager {
|
|
|
26
29
|
frameState,
|
|
27
30
|
status: STATUS.REQUESTED
|
|
28
31
|
};
|
|
29
|
-
this.pendingTilesRegister.register(frameNumber);
|
|
32
|
+
this.pendingTilesRegister.register(id, frameNumber);
|
|
30
33
|
request().then(data => {
|
|
31
34
|
this._statusMap[key].status = STATUS.COMPLETED;
|
|
32
35
|
const {
|
|
33
|
-
frameNumber: actualFrameNumber
|
|
36
|
+
frameNumber: actualFrameNumber,
|
|
37
|
+
viewport: {
|
|
38
|
+
id
|
|
39
|
+
}
|
|
34
40
|
} = this._statusMap[key].frameState;
|
|
35
|
-
this.pendingTilesRegister.deregister(actualFrameNumber);
|
|
41
|
+
this.pendingTilesRegister.deregister(id, actualFrameNumber);
|
|
36
42
|
|
|
37
43
|
this._statusMap[key].callback(data, frameState);
|
|
38
44
|
}).catch(error => {
|
|
39
45
|
this._statusMap[key].status = STATUS.ERROR;
|
|
40
46
|
const {
|
|
41
|
-
frameNumber: actualFrameNumber
|
|
47
|
+
frameNumber: actualFrameNumber,
|
|
48
|
+
viewport: {
|
|
49
|
+
id
|
|
50
|
+
}
|
|
42
51
|
} = this._statusMap[key].frameState;
|
|
43
|
-
this.pendingTilesRegister.deregister(actualFrameNumber);
|
|
52
|
+
this.pendingTilesRegister.deregister(id, actualFrameNumber);
|
|
44
53
|
callback(error);
|
|
45
54
|
});
|
|
46
55
|
}
|
|
@@ -48,8 +57,20 @@ export default class I3STileManager {
|
|
|
48
57
|
|
|
49
58
|
update(key, frameState) {
|
|
50
59
|
if (this._statusMap[key]) {
|
|
51
|
-
|
|
52
|
-
|
|
60
|
+
const {
|
|
61
|
+
frameNumber,
|
|
62
|
+
viewport: {
|
|
63
|
+
id
|
|
64
|
+
}
|
|
65
|
+
} = this._statusMap[key].frameState;
|
|
66
|
+
this.pendingTilesRegister.deregister(id, frameNumber);
|
|
67
|
+
const {
|
|
68
|
+
frameNumber: newFrameNumber,
|
|
69
|
+
viewport: {
|
|
70
|
+
id: newViewportId
|
|
71
|
+
}
|
|
72
|
+
} = frameState;
|
|
73
|
+
this.pendingTilesRegister.register(newViewportId, newFrameNumber);
|
|
53
74
|
this._statusMap[key].frameState = frameState;
|
|
54
75
|
}
|
|
55
76
|
}
|
|
@@ -58,8 +79,8 @@ export default class I3STileManager {
|
|
|
58
79
|
return this._statusMap[key];
|
|
59
80
|
}
|
|
60
81
|
|
|
61
|
-
hasPendingTiles(frameNumber) {
|
|
62
|
-
return !this.pendingTilesRegister.isZero(frameNumber);
|
|
82
|
+
hasPendingTiles(viewportId, frameNumber) {
|
|
83
|
+
return !this.pendingTilesRegister.isZero(viewportId, frameNumber);
|
|
63
84
|
}
|
|
64
85
|
|
|
65
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/tileset/traversers/i3s-tile-manager.ts"],"names":["I3SPendingTilesRegister","STATUS","REQUESTED","COMPLETED","ERROR","I3STileManager","constructor","_statusMap","add","request","key","callback","frameState","frameNumber","status","pendingTilesRegister","register","then","data","actualFrameNumber","deregister","catch","error","update","find","hasPendingTiles","isZero"],"mappings":";AACA,OAAOA,uBAAP,MAAoC,
|
|
1
|
+
{"version":3,"sources":["../../../../src/tileset/traversers/i3s-tile-manager.ts"],"names":["I3SPendingTilesRegister","STATUS","REQUESTED","COMPLETED","ERROR","I3STileManager","constructor","_statusMap","add","request","key","callback","frameState","frameNumber","viewport","id","status","pendingTilesRegister","register","then","data","actualFrameNumber","deregister","catch","error","update","newFrameNumber","newViewportId","find","hasPendingTiles","viewportId","isZero"],"mappings":"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","sourcesContent":["import {FrameState} from '../helpers/frame-state';\nimport I3SPendingTilesRegister from './i3s-pending-tiles-register';\n\nconst STATUS = {\n REQUESTED: 'REQUESTED',\n COMPLETED: 'COMPLETED',\n ERROR: 'ERROR'\n};\n\n// A helper class to manage tile metadata fetching\nexport default class I3STileManager {\n private _statusMap: object;\n private pendingTilesRegister = new I3SPendingTilesRegister();\n\n constructor() {\n this._statusMap = {};\n }\n\n /**\n * Add request to map\n * @param request - node metadata request\n * @param key - unique key\n * @param callback - callback after request completed\n * @param frameState - frameState data\n */\n add(request, key, callback, frameState: FrameState) {\n if (!this._statusMap[key]) {\n const {\n frameNumber,\n viewport: {id}\n } = frameState;\n this._statusMap[key] = {request, callback, key, frameState, status: STATUS.REQUESTED};\n // Register pending request for the frameNumber\n this.pendingTilesRegister.register(id, frameNumber);\n request()\n .then((data) => {\n this._statusMap[key].status = STATUS.COMPLETED;\n const {\n frameNumber: actualFrameNumber,\n viewport: {id}\n } = this._statusMap[key].frameState;\n // Deregister pending request for the frameNumber\n this.pendingTilesRegister.deregister(id, actualFrameNumber);\n this._statusMap[key].callback(data, frameState);\n })\n .catch((error) => {\n this._statusMap[key].status = STATUS.ERROR;\n const {\n frameNumber: actualFrameNumber,\n viewport: {id}\n } = this._statusMap[key].frameState;\n // Deregister pending request for the frameNumber\n this.pendingTilesRegister.deregister(id, actualFrameNumber);\n callback(error);\n });\n }\n }\n\n /**\n * Update request if it is still actual for the new frameState\n * @param key - unique key\n * @param frameState - frameState data\n */\n update(key, frameState: FrameState) {\n if (this._statusMap[key]) {\n // Deregister pending request for the old frameNumber\n const {\n frameNumber,\n viewport: {id}\n } = this._statusMap[key].frameState;\n this.pendingTilesRegister.deregister(id, frameNumber);\n\n // Register pending request for the new frameNumber\n const {\n frameNumber: newFrameNumber,\n viewport: {id: newViewportId}\n } = frameState;\n this.pendingTilesRegister.register(newViewportId, newFrameNumber);\n this._statusMap[key].frameState = frameState;\n }\n }\n\n /**\n * Find request in the map\n * @param key - unique key\n * @returns\n */\n find(key) {\n return this._statusMap[key];\n }\n\n /**\n * Check it there are pending tile headers for the particular frameNumber\n * @param viewportId\n * @param frameNumber\n * @returns\n */\n hasPendingTiles(viewportId: string, frameNumber: number): boolean {\n return !this.pendingTilesRegister.isZero(viewportId, frameNumber);\n }\n}\n"],"file":"i3s-tile-manager.js"}
|
|
@@ -5,8 +5,8 @@ import { getLodStatus } from '../helpers/i3s-lod';
|
|
|
5
5
|
import TileHeader from '../tile-3d';
|
|
6
6
|
import I3STileManager from './i3s-tile-manager';
|
|
7
7
|
export default class I3STilesetTraverser extends TilesetTraverser {
|
|
8
|
-
|
|
9
|
-
return !this._tileManager.hasPendingTiles(this._frameNumber || 0);
|
|
8
|
+
traversalFinished(frameState) {
|
|
9
|
+
return !this._tileManager.hasPendingTiles(frameState.viewport.id, this._frameNumber || 0);
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
constructor(options) {
|
|
@@ -60,8 +60,7 @@ export default class I3STilesetTraverser extends TilesetTraverser {
|
|
|
60
60
|
const nodeUrl = tileset.getTileUrl("".concat(tileset.url, "/nodes/").concat(nodeId));
|
|
61
61
|
const options = { ...tileset.loadOptions,
|
|
62
62
|
i3s: { ...tileset.loadOptions.i3s,
|
|
63
|
-
isTileHeader: true
|
|
64
|
-
loadContent: false
|
|
63
|
+
isTileHeader: true
|
|
65
64
|
}
|
|
66
65
|
};
|
|
67
66
|
return await load(nodeUrl, loader, options);
|
|
@@ -75,7 +74,7 @@ export default class I3STilesetTraverser extends TilesetTraverser {
|
|
|
75
74
|
|
|
76
75
|
this.updateTile(childTile, frameState);
|
|
77
76
|
|
|
78
|
-
if (this._frameNumber === frameState.frameNumber && (this.traversalFinished || new Date().getTime() - this.lastUpdate > this.updateDebounceTime)) {
|
|
77
|
+
if (this._frameNumber === frameState.frameNumber && (this.traversalFinished(frameState) || new Date().getTime() - this.lastUpdate > this.updateDebounceTime)) {
|
|
79
78
|
this.executeTraversal(childTile, frameState);
|
|
80
79
|
}
|
|
81
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/tileset/traversers/i3s-tileset-traverser.ts"],"names":["load","TilesetTraverser","getLodStatus","TileHeader","I3STileManager","I3STilesetTraverser","traversalFinished","_tileManager","hasPendingTiles","_frameNumber","constructor","options","shouldRefine","tile","
|
|
1
|
+
{"version":3,"sources":["../../../../src/tileset/traversers/i3s-tileset-traverser.ts"],"names":["load","TilesetTraverser","getLodStatus","TileHeader","I3STileManager","I3STilesetTraverser","traversalFinished","frameState","_tileManager","hasPendingTiles","viewport","id","_frameNumber","constructor","options","shouldRefine","tile","_lodJudge","updateChildTiles","children","header","childTiles","tileset","child","extendedId","childTile","find","t","request","_loadTile","cachedRequest","nodePages","nodePagesTile","formTileFromNodePages","add","_onTileLoad","update","updateTile","nodeId","loader","nodeUrl","getTileUrl","url","loadOptions","i3s","isTileHeader","push","frameNumber","Date","getTime","lastUpdate","updateDebounceTime","executeTraversal"],"mappings":"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","sourcesContent":["import {load} from '@loaders.gl/core';\nimport TilesetTraverser from './tileset-traverser';\n\nimport {getLodStatus} from '../helpers/i3s-lod';\nimport TileHeader from '../tile-3d';\nimport I3STileManager from './i3s-tile-manager';\nimport {FrameState} from '../helpers/frame-state';\n\nexport default class I3STilesetTraverser extends TilesetTraverser {\n private _tileManager: I3STileManager;\n\n /**\n * Check if there are no penging tile header requests,\n * that means the traversal is finished and we can call\n * following-up callbacks.\n */\n protected traversalFinished(frameState: FrameState): boolean {\n return !this._tileManager.hasPendingTiles(frameState.viewport.id, this._frameNumber || 0);\n }\n\n constructor(options) {\n super(options);\n this._tileManager = new I3STileManager();\n }\n\n shouldRefine(tile, frameState: FrameState) {\n tile._lodJudge = getLodStatus(tile, frameState);\n return tile._lodJudge === 'DIG';\n }\n\n updateChildTiles(tile, frameState: FrameState): boolean {\n const children = tile.header.children || [];\n // children which are already fetched and constructed as Tile3D instances\n const childTiles = tile.children;\n const tileset = tile.tileset;\n\n for (const child of children) {\n const extendedId = `${child.id}-${frameState.viewport.id}`;\n // if child tile is not fetched\n const childTile = childTiles && childTiles.find((t) => t.id === extendedId);\n if (!childTile) {\n let request = () => this._loadTile(child.id, tileset);\n const cachedRequest = this._tileManager.find(extendedId);\n if (!cachedRequest) {\n // eslint-disable-next-line max-depth\n if (tileset.tileset.nodePages) {\n request = () => tileset.tileset.nodePagesTile.formTileFromNodePages(child.id);\n }\n this._tileManager.add(\n request,\n extendedId,\n (header) => this._onTileLoad(header, tile, extendedId),\n frameState\n );\n } else {\n // update frameNumber since it is still needed in current frame\n this._tileManager.update(extendedId, frameState);\n }\n } else if (childTile) {\n // if child tile is fetched and available\n this.updateTile(childTile, frameState);\n }\n }\n return false;\n }\n\n async _loadTile(nodeId, tileset) {\n const {loader} = tileset;\n const nodeUrl = tileset.getTileUrl(`${tileset.url}/nodes/${nodeId}`);\n // load metadata\n const options = {\n ...tileset.loadOptions,\n i3s: {\n ...tileset.loadOptions.i3s,\n isTileHeader: true\n }\n };\n\n return await load(nodeUrl, loader, options);\n }\n\n /**\n * The callback to init TileHeader instance after loading the tile JSON\n * @param {Object} header - the tile JSON from a dataset\n * @param {TileHeader} tile - the parent TileHeader instance\n * @param {string} extendedId - optional ID to separate copies of a tile for different viewports.\n * const extendedId = `${tile.id}-${frameState.viewport.id}`;\n * @return {void}\n */\n _onTileLoad(header, tile, extendedId) {\n // after child tile is fetched\n const childTile = new TileHeader(tile.tileset, header, tile, extendedId);\n tile.children.push(childTile);\n const frameState = this._tileManager.find(childTile.id).frameState;\n this.updateTile(childTile, frameState);\n\n // after tile fetched, resume traversal if still in current update/traversal frame\n if (\n this._frameNumber === frameState.frameNumber &&\n (this.traversalFinished(frameState) ||\n new Date().getTime() - this.lastUpdate > this.updateDebounceTime)\n ) {\n this.executeTraversal(childTile, frameState);\n }\n }\n}\n"],"file":"i3s-tileset-traverser.js"}
|
|
@@ -11,7 +11,7 @@ export const DEFAULT_PROPS = {
|
|
|
11
11
|
basePath: ''
|
|
12
12
|
};
|
|
13
13
|
export default class TilesetTraverser {
|
|
14
|
-
|
|
14
|
+
traversalFinished(frameState) {
|
|
15
15
|
return true;
|
|
16
16
|
}
|
|
17
17
|
|
|
@@ -111,7 +111,7 @@ export default class TilesetTraverser {
|
|
|
111
111
|
|
|
112
112
|
const newTime = new Date().getTime();
|
|
113
113
|
|
|
114
|
-
if (this.traversalFinished || newTime - this.lastUpdate > this.updateDebounceTime) {
|
|
114
|
+
if (this.traversalFinished(frameState) || newTime - this.lastUpdate > this.updateDebounceTime) {
|
|
115
115
|
this.lastUpdate = newTime;
|
|
116
116
|
this.options.onTraversalEnd(frameState);
|
|
117
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/tileset/traversers/tileset-traverser.ts"],"names":["ManagedArray","TILE_REFINEMENT","DEFAULT_PROPS","loadSiblings","skipLevelOfDetail","maximumScreenSpaceError","updateTransforms","onTraversalEnd","viewportTraversersMap","basePath","TilesetTraverser","traversalFinished","constructor","options","Date","getTime","_traversalStack","_emptyTraversalStack","_frameNumber","root","selectedTiles","requestedTiles","emptyTiles","traverse","frameState","reset","updateTile","frameNumber","executeTraversal","stack","_selectionDepth","push","length","tile","pop","shouldRefine","canTraverse","updateChildTiles","updateAndPushChildren","hasRenderContent","parent","parentRefines","Boolean","_shouldRefine","stoppedRefining","id","loadTile","selectTile","refine","ADD","REPLACE","touchTile","newTime","lastUpdate","updateDebounceTime","children","child","depth","sort","compareDistanceToCamera","bind","checkRefines","hasVisibleChild","refines","isVisibleAndInRequestVolume","find","delete","childRefines","_inRequestVolume","executeEmptyTraversal","contentAvailable","updateTileVisibility","shouldSelectTile","_selectedFrame","shouldLoadTile","_requestedFrame","_priority","_getPriority","tileset","_cache","touch","_touchedFrame","useParentMetric","ignoreVisibility","hasChildren","hasTilesetContent","contentExpired","hasUnloadedContent","screenSpaceError","_screenSpaceError","getScreenSpaceError","viewportIds","key","value","viewport","updateVisibility","b","a","_distanceToCamera","anyChildrenVisible","anyVisible","allDescendantsLoaded"],"mappings":"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","sourcesContent":["import ManagedArray from '../../utils/managed-array';\nimport {TILE_REFINEMENT} from '../../constants';\nimport {FrameState} from '../helpers/frame-state';\n\nexport type TilesetTraverserProps = {\n loadSiblings?: boolean;\n skipLevelOfDetail?: boolean;\n maximumScreenSpaceError?: number;\n onTraversalEnd?: (frameState) => any;\n viewportTraversersMap?: {[key: string]: any};\n basePath?: string;\n};\n\nexport type Props = {\n loadSiblings: boolean;\n skipLevelOfDetail: boolean;\n updateTransforms: boolean;\n maximumScreenSpaceError: number;\n onTraversalEnd: (frameState) => any;\n viewportTraversersMap: {[key: string]: any};\n basePath: string;\n};\n\nexport const DEFAULT_PROPS: Props = {\n loadSiblings: false,\n skipLevelOfDetail: false,\n maximumScreenSpaceError: 2,\n updateTransforms: true,\n onTraversalEnd: () => {},\n viewportTraversersMap: {},\n basePath: ''\n};\n\nexport default class TilesetTraverser {\n options: Props;\n\n root: any;\n requestedTiles: object;\n selectedTiles: object;\n emptyTiles: object;\n\n protected lastUpdate: number = new Date().getTime();\n protected readonly updateDebounceTime = 1000;\n protected _traversalStack: ManagedArray;\n protected _emptyTraversalStack: ManagedArray;\n protected _frameNumber: number | null;\n\n protected get traversalFinished(): boolean {\n return true;\n }\n\n // TODO nested props\n constructor(options: TilesetTraverserProps) {\n this.options = {...DEFAULT_PROPS, ...options};\n // TRAVERSAL\n // temporary storage to hold the traversed tiles during a traversal\n this._traversalStack = new ManagedArray();\n this._emptyTraversalStack = new ManagedArray();\n\n // set in every traverse cycle\n this._frameNumber = null;\n\n // fulfill in traverse call\n this.root = null;\n\n // RESULT\n // tiles should be rendered\n this.selectedTiles = {};\n // tiles should be loaded from server\n this.requestedTiles = {};\n // tiles does not have render content\n this.emptyTiles = {};\n }\n\n // tiles should be visible\n traverse(root, frameState, options) {\n this.root = root; // for root screen space error\n this.options = {...this.options, ...options};\n\n // reset result\n this.reset();\n\n // update tile (visibility and expiration)\n this.updateTile(root, frameState);\n\n this._frameNumber = frameState.frameNumber;\n this.executeTraversal(root, frameState);\n }\n\n reset() {\n this.requestedTiles = {};\n this.selectedTiles = {};\n this.emptyTiles = {};\n this._traversalStack.reset();\n this._emptyTraversalStack.reset();\n }\n\n // execute traverse\n // Depth-first traversal that traverses all visible tiles and marks tiles for selection.\n // If skipLevelOfDetail is off then a tile does not refine until all children are loaded.\n // This is the traditional replacement refinement approach and is called the base traversal.\n // Tiles that have a greater screen space error than the base screen space error are part of the base traversal,\n // all other tiles are part of the skip traversal. The skip traversal allows for skipping levels of the tree\n // and rendering children and parent tiles simultaneously.\n /* eslint-disable-next-line complexity, max-statements */\n executeTraversal(root, frameState: FrameState) {\n // stack to store traversed tiles, only visible tiles should be added to stack\n // visible: visible in the current view frustum\n const stack = this._traversalStack;\n root._selectionDepth = 1;\n\n stack.push(root);\n while (stack.length > 0) {\n // 1. pop tile\n const tile = stack.pop();\n\n // 2. check if tile needs to be refine, needs refine if a tile's LoD is not sufficient and tile has available children (available content)\n let shouldRefine = false;\n if (this.canTraverse(tile, frameState)) {\n this.updateChildTiles(tile, frameState);\n shouldRefine = this.updateAndPushChildren(\n tile,\n frameState,\n stack,\n tile.hasRenderContent ? tile._selectionDepth + 1 : tile._selectionDepth\n );\n }\n\n // 3. decide if should render (select) this tile\n // - tile does not have render content\n // - tile has render content and tile is `add` type (pointcloud)\n // - tile has render content and tile is `replace` type (photogrammetry) and can't refine any further\n const parent = tile.parent;\n const parentRefines = Boolean(!parent || parent._shouldRefine);\n const stoppedRefining = !shouldRefine;\n\n if (!tile.hasRenderContent) {\n this.emptyTiles[tile.id] = tile;\n this.loadTile(tile, frameState);\n if (stoppedRefining) {\n this.selectTile(tile, frameState);\n }\n // additive tiles\n } else if (tile.refine === TILE_REFINEMENT.ADD) {\n // Additive tiles are always loaded and selected\n this.loadTile(tile, frameState);\n this.selectTile(tile, frameState);\n\n // replace tiles\n } else if (tile.refine === TILE_REFINEMENT.REPLACE) {\n // Always load tiles in the base traversal\n // Select tiles that can't refine further\n this.loadTile(tile, frameState);\n if (stoppedRefining) {\n this.selectTile(tile, frameState);\n }\n }\n\n // 3. update cache, most recent touched tiles have higher priority to be fetched from server\n this.touchTile(tile, frameState);\n\n // 4. update tile refine prop and parent refinement status to trickle down to the descendants\n tile._shouldRefine = shouldRefine && parentRefines;\n }\n\n const newTime = new Date().getTime();\n if (this.traversalFinished || newTime - this.lastUpdate > this.updateDebounceTime) {\n this.lastUpdate = newTime;\n this.options.onTraversalEnd(frameState);\n }\n }\n\n updateChildTiles(tile, frameState) {\n const children = tile.children;\n for (const child of children) {\n this.updateTile(child, frameState);\n }\n return true;\n }\n\n /* eslint-disable complexity, max-statements */\n updateAndPushChildren(tile, frameState, stack, depth) {\n const {loadSiblings, skipLevelOfDetail} = this.options;\n\n const children = tile.children;\n\n // sort children tiles\n children.sort(this.compareDistanceToCamera.bind(this));\n\n // For traditional replacement refinement only refine if all children are loaded.\n // Empty tiles are exempt since it looks better if children stream in as they are loaded to fill the empty space.\n const checkRefines =\n tile.refine === TILE_REFINEMENT.REPLACE && tile.hasRenderContent && !skipLevelOfDetail;\n\n let hasVisibleChild = false;\n let refines = true;\n\n for (const child of children) {\n child._selectionDepth = depth;\n if (child.isVisibleAndInRequestVolume) {\n if (stack.find(child)) {\n stack.delete(child);\n }\n stack.push(child);\n hasVisibleChild = true;\n } else if (checkRefines || loadSiblings) {\n // Keep non-visible children loaded since they are still needed before the parent can refine.\n // Or loadSiblings is true so always load tiles regardless of visibility.\n this.loadTile(child, frameState);\n this.touchTile(child, frameState);\n }\n\n if (checkRefines) {\n let childRefines;\n if (!child._inRequestVolume) {\n childRefines = false;\n } else if (!child.hasRenderContent) {\n childRefines = this.executeEmptyTraversal(child, frameState);\n } else {\n childRefines = child.contentAvailable;\n }\n refines = refines && childRefines;\n\n if (!refines) {\n return false;\n }\n }\n }\n\n if (!hasVisibleChild) {\n refines = false;\n }\n return refines;\n }\n /* eslint-enable complexity, max-statements */\n\n updateTile(tile, frameState) {\n this.updateTileVisibility(tile, frameState);\n }\n\n // tile to render in the browser\n selectTile(tile, frameState) {\n if (this.shouldSelectTile(tile)) {\n // The tile can be selected right away and does not require traverseAndSelect\n tile._selectedFrame = frameState.frameNumber;\n this.selectedTiles[tile.id] = tile;\n }\n }\n\n // tile to load from server\n loadTile(tile, frameState) {\n if (this.shouldLoadTile(tile)) {\n tile._requestedFrame = frameState.frameNumber;\n tile._priority = tile._getPriority();\n this.requestedTiles[tile.id] = tile;\n }\n }\n\n // cache tile\n touchTile(tile, frameState) {\n tile.tileset._cache.touch(tile);\n tile._touchedFrame = frameState.frameNumber;\n }\n\n // tile should be visible\n // tile should have children\n // tile LoD (level of detail) is not sufficient under current viewport\n canTraverse(tile, frameState, useParentMetric = false, ignoreVisibility = false) {\n if (!tile.hasChildren) {\n return false;\n }\n\n // cesium specific\n if (tile.hasTilesetContent) {\n // Traverse external this to visit its root tile\n // Don't traverse if the subtree is expired because it will be destroyed\n return !tile.contentExpired;\n }\n\n if (!ignoreVisibility && !tile.isVisibleAndInRequestVolume) {\n return false;\n }\n\n return this.shouldRefine(tile, frameState, useParentMetric);\n }\n\n shouldLoadTile(tile) {\n // if request tile is in current frame\n // and has unexpired render content\n return tile.hasUnloadedContent || tile.contentExpired;\n }\n\n shouldSelectTile(tile) {\n // if select tile is in current frame\n // and content available\n return tile.contentAvailable && !this.options.skipLevelOfDetail;\n }\n\n // Decide if tile LoD (level of detail) is not sufficient under current viewport\n shouldRefine(tile, frameState, useParentMetric) {\n let screenSpaceError = tile._screenSpaceError;\n if (useParentMetric) {\n screenSpaceError = tile.getScreenSpaceError(frameState, true);\n }\n\n return screenSpaceError > this.options.maximumScreenSpaceError;\n }\n\n updateTileVisibility(tile, frameState) {\n const viewportIds: string[] = [];\n if (this.options.viewportTraversersMap) {\n for (const key in this.options.viewportTraversersMap) {\n const value = this.options.viewportTraversersMap[key];\n if (value === frameState.viewport.id) {\n viewportIds.push(key);\n }\n }\n } else {\n viewportIds.push(frameState.viewport.id);\n }\n tile.updateVisibility(frameState, viewportIds);\n }\n\n // UTILITIES\n\n compareDistanceToCamera(b, a) {\n return b._distanceToCamera - a._distanceToCamera;\n }\n\n anyChildrenVisible(tile, frameState) {\n let anyVisible = false;\n for (const child of tile.children) {\n child.updateVisibility(frameState);\n anyVisible = anyVisible || child.isVisibleAndInRequestVolume;\n }\n return anyVisible;\n }\n\n // Depth-first traversal that checks if all nearest descendants with content are loaded.\n // Ignores visibility.\n executeEmptyTraversal(root, frameState) {\n let allDescendantsLoaded = true;\n const stack = this._emptyTraversalStack;\n\n stack.push(root);\n\n while (stack.length > 0 && allDescendantsLoaded) {\n const tile = stack.pop();\n\n this.updateTile(tile, frameState);\n\n if (!tile.isVisibleAndInRequestVolume) {\n // Load tiles that aren't visible since they are still needed for the parent to refine\n this.loadTile(tile, frameState);\n }\n\n this.touchTile(tile, frameState);\n\n // Only traverse if the tile is empty - traversal stop at descendants with content\n const traverse = !tile.hasRenderContent && this.canTraverse(tile, frameState, false, true);\n\n if (traverse) {\n const children = tile.children;\n for (const child of children) {\n // eslint-disable-next-line max-depth\n if (stack.find(child)) {\n stack.delete(child);\n }\n stack.push(child);\n }\n } else if (!tile.contentAvailable) {\n allDescendantsLoaded = false;\n }\n }\n\n return allDescendantsLoaded;\n }\n}\n\n// TODO\n// enable expiration\n// enable optimization hint\n"],"file":"tileset-traverser.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/tileset/traversers/tileset-traverser.ts"],"names":["ManagedArray","TILE_REFINEMENT","DEFAULT_PROPS","loadSiblings","skipLevelOfDetail","maximumScreenSpaceError","updateTransforms","onTraversalEnd","viewportTraversersMap","basePath","TilesetTraverser","traversalFinished","frameState","constructor","options","Date","getTime","_traversalStack","_emptyTraversalStack","_frameNumber","root","selectedTiles","requestedTiles","emptyTiles","traverse","reset","updateTile","frameNumber","executeTraversal","stack","_selectionDepth","push","length","tile","pop","shouldRefine","canTraverse","updateChildTiles","updateAndPushChildren","hasRenderContent","parent","parentRefines","Boolean","_shouldRefine","stoppedRefining","id","loadTile","selectTile","refine","ADD","REPLACE","touchTile","newTime","lastUpdate","updateDebounceTime","children","child","depth","sort","compareDistanceToCamera","bind","checkRefines","hasVisibleChild","refines","isVisibleAndInRequestVolume","find","delete","childRefines","_inRequestVolume","executeEmptyTraversal","contentAvailable","updateTileVisibility","shouldSelectTile","_selectedFrame","shouldLoadTile","_requestedFrame","_priority","_getPriority","tileset","_cache","touch","_touchedFrame","useParentMetric","ignoreVisibility","hasChildren","hasTilesetContent","contentExpired","hasUnloadedContent","screenSpaceError","_screenSpaceError","getScreenSpaceError","viewportIds","key","value","viewport","updateVisibility","b","a","_distanceToCamera","anyChildrenVisible","anyVisible","allDescendantsLoaded"],"mappings":"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","sourcesContent":["import ManagedArray from '../../utils/managed-array';\nimport {TILE_REFINEMENT} from '../../constants';\nimport {FrameState} from '../helpers/frame-state';\n\nexport type TilesetTraverserProps = {\n loadSiblings?: boolean;\n skipLevelOfDetail?: boolean;\n maximumScreenSpaceError?: number;\n onTraversalEnd?: (frameState) => any;\n viewportTraversersMap?: {[key: string]: any};\n basePath?: string;\n};\n\nexport type Props = {\n loadSiblings: boolean;\n skipLevelOfDetail: boolean;\n updateTransforms: boolean;\n maximumScreenSpaceError: number;\n onTraversalEnd: (frameState) => any;\n viewportTraversersMap: {[key: string]: any};\n basePath: string;\n};\n\nexport const DEFAULT_PROPS: Props = {\n loadSiblings: false,\n skipLevelOfDetail: false,\n maximumScreenSpaceError: 2,\n updateTransforms: true,\n onTraversalEnd: () => {},\n viewportTraversersMap: {},\n basePath: ''\n};\n\nexport default class TilesetTraverser {\n options: Props;\n\n root: any;\n requestedTiles: object;\n selectedTiles: object;\n emptyTiles: object;\n\n protected lastUpdate: number = new Date().getTime();\n protected readonly updateDebounceTime = 1000;\n protected _traversalStack: ManagedArray;\n protected _emptyTraversalStack: ManagedArray;\n protected _frameNumber: number | null;\n\n protected traversalFinished(frameState: FrameState): boolean {\n return true;\n }\n\n // TODO nested props\n constructor(options: TilesetTraverserProps) {\n this.options = {...DEFAULT_PROPS, ...options};\n // TRAVERSAL\n // temporary storage to hold the traversed tiles during a traversal\n this._traversalStack = new ManagedArray();\n this._emptyTraversalStack = new ManagedArray();\n\n // set in every traverse cycle\n this._frameNumber = null;\n\n // fulfill in traverse call\n this.root = null;\n\n // RESULT\n // tiles should be rendered\n this.selectedTiles = {};\n // tiles should be loaded from server\n this.requestedTiles = {};\n // tiles does not have render content\n this.emptyTiles = {};\n }\n\n // tiles should be visible\n traverse(root, frameState, options) {\n this.root = root; // for root screen space error\n this.options = {...this.options, ...options};\n\n // reset result\n this.reset();\n\n // update tile (visibility and expiration)\n this.updateTile(root, frameState);\n\n this._frameNumber = frameState.frameNumber;\n this.executeTraversal(root, frameState);\n }\n\n reset() {\n this.requestedTiles = {};\n this.selectedTiles = {};\n this.emptyTiles = {};\n this._traversalStack.reset();\n this._emptyTraversalStack.reset();\n }\n\n // execute traverse\n // Depth-first traversal that traverses all visible tiles and marks tiles for selection.\n // If skipLevelOfDetail is off then a tile does not refine until all children are loaded.\n // This is the traditional replacement refinement approach and is called the base traversal.\n // Tiles that have a greater screen space error than the base screen space error are part of the base traversal,\n // all other tiles are part of the skip traversal. The skip traversal allows for skipping levels of the tree\n // and rendering children and parent tiles simultaneously.\n /* eslint-disable-next-line complexity, max-statements */\n executeTraversal(root, frameState: FrameState) {\n // stack to store traversed tiles, only visible tiles should be added to stack\n // visible: visible in the current view frustum\n const stack = this._traversalStack;\n root._selectionDepth = 1;\n\n stack.push(root);\n while (stack.length > 0) {\n // 1. pop tile\n const tile = stack.pop();\n\n // 2. check if tile needs to be refine, needs refine if a tile's LoD is not sufficient and tile has available children (available content)\n let shouldRefine = false;\n if (this.canTraverse(tile, frameState)) {\n this.updateChildTiles(tile, frameState);\n shouldRefine = this.updateAndPushChildren(\n tile,\n frameState,\n stack,\n tile.hasRenderContent ? tile._selectionDepth + 1 : tile._selectionDepth\n );\n }\n\n // 3. decide if should render (select) this tile\n // - tile does not have render content\n // - tile has render content and tile is `add` type (pointcloud)\n // - tile has render content and tile is `replace` type (photogrammetry) and can't refine any further\n const parent = tile.parent;\n const parentRefines = Boolean(!parent || parent._shouldRefine);\n const stoppedRefining = !shouldRefine;\n\n if (!tile.hasRenderContent) {\n this.emptyTiles[tile.id] = tile;\n this.loadTile(tile, frameState);\n if (stoppedRefining) {\n this.selectTile(tile, frameState);\n }\n // additive tiles\n } else if (tile.refine === TILE_REFINEMENT.ADD) {\n // Additive tiles are always loaded and selected\n this.loadTile(tile, frameState);\n this.selectTile(tile, frameState);\n\n // replace tiles\n } else if (tile.refine === TILE_REFINEMENT.REPLACE) {\n // Always load tiles in the base traversal\n // Select tiles that can't refine further\n this.loadTile(tile, frameState);\n if (stoppedRefining) {\n this.selectTile(tile, frameState);\n }\n }\n\n // 3. update cache, most recent touched tiles have higher priority to be fetched from server\n this.touchTile(tile, frameState);\n\n // 4. update tile refine prop and parent refinement status to trickle down to the descendants\n tile._shouldRefine = shouldRefine && parentRefines;\n }\n\n const newTime = new Date().getTime();\n if (this.traversalFinished(frameState) || newTime - this.lastUpdate > this.updateDebounceTime) {\n this.lastUpdate = newTime;\n this.options.onTraversalEnd(frameState);\n }\n }\n\n updateChildTiles(tile, frameState) {\n const children = tile.children;\n for (const child of children) {\n this.updateTile(child, frameState);\n }\n return true;\n }\n\n /* eslint-disable complexity, max-statements */\n updateAndPushChildren(tile, frameState, stack, depth) {\n const {loadSiblings, skipLevelOfDetail} = this.options;\n\n const children = tile.children;\n\n // sort children tiles\n children.sort(this.compareDistanceToCamera.bind(this));\n\n // For traditional replacement refinement only refine if all children are loaded.\n // Empty tiles are exempt since it looks better if children stream in as they are loaded to fill the empty space.\n const checkRefines =\n tile.refine === TILE_REFINEMENT.REPLACE && tile.hasRenderContent && !skipLevelOfDetail;\n\n let hasVisibleChild = false;\n let refines = true;\n\n for (const child of children) {\n child._selectionDepth = depth;\n if (child.isVisibleAndInRequestVolume) {\n if (stack.find(child)) {\n stack.delete(child);\n }\n stack.push(child);\n hasVisibleChild = true;\n } else if (checkRefines || loadSiblings) {\n // Keep non-visible children loaded since they are still needed before the parent can refine.\n // Or loadSiblings is true so always load tiles regardless of visibility.\n this.loadTile(child, frameState);\n this.touchTile(child, frameState);\n }\n\n if (checkRefines) {\n let childRefines;\n if (!child._inRequestVolume) {\n childRefines = false;\n } else if (!child.hasRenderContent) {\n childRefines = this.executeEmptyTraversal(child, frameState);\n } else {\n childRefines = child.contentAvailable;\n }\n refines = refines && childRefines;\n\n if (!refines) {\n return false;\n }\n }\n }\n\n if (!hasVisibleChild) {\n refines = false;\n }\n return refines;\n }\n /* eslint-enable complexity, max-statements */\n\n updateTile(tile, frameState) {\n this.updateTileVisibility(tile, frameState);\n }\n\n // tile to render in the browser\n selectTile(tile, frameState) {\n if (this.shouldSelectTile(tile)) {\n // The tile can be selected right away and does not require traverseAndSelect\n tile._selectedFrame = frameState.frameNumber;\n this.selectedTiles[tile.id] = tile;\n }\n }\n\n // tile to load from server\n loadTile(tile, frameState) {\n if (this.shouldLoadTile(tile)) {\n tile._requestedFrame = frameState.frameNumber;\n tile._priority = tile._getPriority();\n this.requestedTiles[tile.id] = tile;\n }\n }\n\n // cache tile\n touchTile(tile, frameState) {\n tile.tileset._cache.touch(tile);\n tile._touchedFrame = frameState.frameNumber;\n }\n\n // tile should be visible\n // tile should have children\n // tile LoD (level of detail) is not sufficient under current viewport\n canTraverse(tile, frameState, useParentMetric = false, ignoreVisibility = false) {\n if (!tile.hasChildren) {\n return false;\n }\n\n // cesium specific\n if (tile.hasTilesetContent) {\n // Traverse external this to visit its root tile\n // Don't traverse if the subtree is expired because it will be destroyed\n return !tile.contentExpired;\n }\n\n if (!ignoreVisibility && !tile.isVisibleAndInRequestVolume) {\n return false;\n }\n\n return this.shouldRefine(tile, frameState, useParentMetric);\n }\n\n shouldLoadTile(tile) {\n // if request tile is in current frame\n // and has unexpired render content\n return tile.hasUnloadedContent || tile.contentExpired;\n }\n\n shouldSelectTile(tile) {\n // if select tile is in current frame\n // and content available\n return tile.contentAvailable && !this.options.skipLevelOfDetail;\n }\n\n // Decide if tile LoD (level of detail) is not sufficient under current viewport\n shouldRefine(tile, frameState, useParentMetric) {\n let screenSpaceError = tile._screenSpaceError;\n if (useParentMetric) {\n screenSpaceError = tile.getScreenSpaceError(frameState, true);\n }\n\n return screenSpaceError > this.options.maximumScreenSpaceError;\n }\n\n updateTileVisibility(tile, frameState) {\n const viewportIds: string[] = [];\n if (this.options.viewportTraversersMap) {\n for (const key in this.options.viewportTraversersMap) {\n const value = this.options.viewportTraversersMap[key];\n if (value === frameState.viewport.id) {\n viewportIds.push(key);\n }\n }\n } else {\n viewportIds.push(frameState.viewport.id);\n }\n tile.updateVisibility(frameState, viewportIds);\n }\n\n // UTILITIES\n\n compareDistanceToCamera(b, a) {\n return b._distanceToCamera - a._distanceToCamera;\n }\n\n anyChildrenVisible(tile, frameState) {\n let anyVisible = false;\n for (const child of tile.children) {\n child.updateVisibility(frameState);\n anyVisible = anyVisible || child.isVisibleAndInRequestVolume;\n }\n return anyVisible;\n }\n\n // Depth-first traversal that checks if all nearest descendants with content are loaded.\n // Ignores visibility.\n executeEmptyTraversal(root, frameState) {\n let allDescendantsLoaded = true;\n const stack = this._emptyTraversalStack;\n\n stack.push(root);\n\n while (stack.length > 0 && allDescendantsLoaded) {\n const tile = stack.pop();\n\n this.updateTile(tile, frameState);\n\n if (!tile.isVisibleAndInRequestVolume) {\n // Load tiles that aren't visible since they are still needed for the parent to refine\n this.loadTile(tile, frameState);\n }\n\n this.touchTile(tile, frameState);\n\n // Only traverse if the tile is empty - traversal stop at descendants with content\n const traverse = !tile.hasRenderContent && this.canTraverse(tile, frameState, false, true);\n\n if (traverse) {\n const children = tile.children;\n for (const child of children) {\n // eslint-disable-next-line max-depth\n if (stack.find(child)) {\n stack.delete(child);\n }\n stack.push(child);\n }\n } else if (!tile.contentAvailable) {\n allDescendantsLoaded = false;\n }\n }\n\n return allDescendantsLoaded;\n }\n}\n\n// TODO\n// enable expiration\n// enable optimization hint\n"],"file":"tileset-traverser.js"}
|
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
import { Tile3D } from '@loaders.gl/tiles';
|
|
2
2
|
import { CullingVolume } from '@math.gl/culling';
|
|
3
|
+
import { Viewport } from '../../types';
|
|
3
4
|
export declare type FrameState = {
|
|
4
5
|
camera: {
|
|
5
6
|
position: number[];
|
|
6
7
|
direction: number[];
|
|
7
8
|
up: number[];
|
|
8
9
|
};
|
|
9
|
-
viewport:
|
|
10
|
-
|
|
11
|
-
};
|
|
12
|
-
topDownViewport: {
|
|
13
|
-
[key: string]: any;
|
|
14
|
-
};
|
|
10
|
+
viewport: Viewport;
|
|
11
|
+
topDownViewport: Viewport;
|
|
15
12
|
height: number;
|
|
16
13
|
cullingVolume: CullingVolume;
|
|
17
14
|
frameNumber: number;
|
|
18
15
|
sseDenominator: number;
|
|
19
16
|
};
|
|
20
|
-
export declare function getFrameState(viewport:
|
|
17
|
+
export declare function getFrameState(viewport: Viewport, frameNumber: number): FrameState;
|
|
21
18
|
/**
|
|
22
19
|
* Limit `tiles` array length with `maximumTilesSelected` number.
|
|
23
20
|
* The criteria for this filtering is distance of a tile center
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frame-state.d.ts","sourceRoot":"","sources":["../../../src/tileset/helpers/frame-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAC,aAAa,EAAQ,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"frame-state.d.ts","sourceRoot":"","sources":["../../../src/tileset/helpers/frame-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAC,aAAa,EAAQ,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErC,oBAAY,UAAU,GAAG;IACvB,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,EAAE,EAAE,MAAM,EAAE,CAAC;KACd,CAAC;IACF,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,QAAQ,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAeF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,GAAG,UAAU,CAuDjF;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,EAAE,UAAU,EACtB,oBAAoB,EAAE,MAAM,GAC3B,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAyBtB"}
|
|
@@ -20,10 +20,9 @@ function getFrameState(viewport, frameNumber) {
|
|
|
20
20
|
// Traverse and and request. Update _selectedTiles so that we know what to render.
|
|
21
21
|
const { cameraDirection, cameraUp, height } = viewport;
|
|
22
22
|
const { metersPerUnit } = viewport.distanceScales;
|
|
23
|
-
const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);
|
|
24
23
|
// TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.
|
|
25
24
|
// TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?
|
|
26
|
-
const viewportCenterCartesian =
|
|
25
|
+
const viewportCenterCartesian = worldToCartesian(viewport, viewport.center);
|
|
27
26
|
const enuToFixedTransform = geospatial_1.Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);
|
|
28
27
|
const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);
|
|
29
28
|
const cameraPositionCartesian = geospatial_1.Ellipsoid.WGS84.cartographicToCartesian(cameraPositionCartographic, new core_1.Vector3());
|
|
@@ -34,7 +33,7 @@ function getFrameState(viewport, frameNumber) {
|
|
|
34
33
|
const cameraUpCartesian = new core_1.Vector3(
|
|
35
34
|
// @ts-ignore
|
|
36
35
|
enuToFixedTransform.transformAsVector(new core_1.Vector3(cameraUp).scale(metersPerUnit))).normalize();
|
|
37
|
-
commonSpacePlanesToWGS84(viewport
|
|
36
|
+
commonSpacePlanesToWGS84(viewport);
|
|
38
37
|
const ViewportClass = viewport.constructor;
|
|
39
38
|
const { longitude, latitude, width, bearing, zoom } = viewport;
|
|
40
39
|
// @ts-ignore
|
|
@@ -98,21 +97,36 @@ function limitSelectedTiles(tiles, frameState, maximumTilesSelected) {
|
|
|
98
97
|
return [selectedTiles, unselectedTiles];
|
|
99
98
|
}
|
|
100
99
|
exports.limitSelectedTiles = limitSelectedTiles;
|
|
101
|
-
function commonSpacePlanesToWGS84(viewport
|
|
100
|
+
function commonSpacePlanesToWGS84(viewport) {
|
|
102
101
|
// Extract frustum planes based on current view.
|
|
103
102
|
const frustumPlanes = viewport.getFrustumPlanes();
|
|
103
|
+
// Get the near/far plane centers
|
|
104
|
+
const nearCenterCommon = closestPointOnPlane(frustumPlanes.near, viewport.cameraPosition);
|
|
105
|
+
const nearCenterCartesian = worldToCartesian(viewport, nearCenterCommon);
|
|
106
|
+
const cameraCartesian = worldToCartesian(viewport, viewport.cameraPosition, scratchPosition);
|
|
104
107
|
let i = 0;
|
|
108
|
+
cullingVolume.planes[i++].fromPointNormal(nearCenterCartesian, scratchVector.copy(nearCenterCartesian).subtract(cameraCartesian));
|
|
105
109
|
for (const dir in frustumPlanes) {
|
|
110
|
+
if (dir === 'near') {
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
106
113
|
const plane = frustumPlanes[dir];
|
|
107
|
-
const
|
|
108
|
-
scratchPosition
|
|
109
|
-
.copy(plane.normal)
|
|
110
|
-
.scale(plane.distance - distanceToCenter)
|
|
111
|
-
.add(viewport.center);
|
|
112
|
-
const cartographicPos = viewport.unprojectPosition(scratchPosition);
|
|
113
|
-
const cartesianPos = geospatial_1.Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, new core_1.Vector3());
|
|
114
|
+
const posCommon = closestPointOnPlane(plane, nearCenterCommon, scratchPosition);
|
|
115
|
+
const cartesianPos = worldToCartesian(viewport, posCommon, scratchPosition);
|
|
114
116
|
cullingVolume.planes[i++].fromPointNormal(cartesianPos,
|
|
115
117
|
// Want the normal to point into the frustum since that's what culling expects
|
|
116
|
-
scratchVector.copy(
|
|
118
|
+
scratchVector.copy(nearCenterCartesian).subtract(cartesianPos));
|
|
117
119
|
}
|
|
118
120
|
}
|
|
121
|
+
function closestPointOnPlane(plane, refPoint, out = new core_1.Vector3()) {
|
|
122
|
+
const distanceToRef = plane.normal.dot(refPoint);
|
|
123
|
+
out
|
|
124
|
+
.copy(plane.normal)
|
|
125
|
+
.scale(plane.distance - distanceToRef)
|
|
126
|
+
.add(refPoint);
|
|
127
|
+
return out;
|
|
128
|
+
}
|
|
129
|
+
function worldToCartesian(viewport, point, out = new core_1.Vector3()) {
|
|
130
|
+
const cartographicPos = viewport.unprojectPosition(point);
|
|
131
|
+
return geospatial_1.Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, out);
|
|
132
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i3s-lod.d.ts","sourceRoot":"","sources":["../../../src/tileset/helpers/i3s-lod.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,YAAY,CAAC;AAChC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAUzC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAczF;AAED;;;;;GAKG;AAEH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"i3s-lod.d.ts","sourceRoot":"","sources":["../../../src/tileset/helpers/i3s-lod.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,YAAY,CAAC;AAChC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAUzC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAczF;AAED;;;;;GAKG;AAEH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,MAAM,CA6C/E"}
|
|
@@ -178,9 +178,16 @@ export default class TileHeader {
|
|
|
178
178
|
_getLoaderSpecificOptions(loaderId: any): {
|
|
179
179
|
assetGltfUpAxis: any;
|
|
180
180
|
} | {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
181
|
+
_tileOptions: {
|
|
182
|
+
textureUrl: any;
|
|
183
|
+
textureFormat: any;
|
|
184
|
+
textureLoaderOptions: any;
|
|
185
|
+
materialDefinition: any;
|
|
186
|
+
isDracoGeometry: any;
|
|
187
|
+
mbs: any;
|
|
188
|
+
};
|
|
189
|
+
_tilesetOptions: {
|
|
190
|
+
store: any;
|
|
184
191
|
};
|
|
185
192
|
isTileHeader: boolean;
|
|
186
193
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile-3d.d.ts","sourceRoot":"","sources":["../../src/tileset/tile-3d.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tile-3d.d.ts","sourceRoot":"","sources":["../../src/tileset/tile-3d.ts"],"names":[],"mappings":"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"}
|
package/dist/tileset/tile-3d.js
CHANGED
|
@@ -560,8 +560,17 @@ class TileHeader {
|
|
|
560
560
|
case 'i3s':
|
|
561
561
|
return {
|
|
562
562
|
...this.tileset.options.i3s,
|
|
563
|
-
|
|
564
|
-
|
|
563
|
+
_tileOptions: {
|
|
564
|
+
textureUrl: this.header.textureUrl,
|
|
565
|
+
textureFormat: this.header.textureFormat,
|
|
566
|
+
textureLoaderOptions: this.header.textureLoaderOptions,
|
|
567
|
+
materialDefinition: this.header.materialDefinition,
|
|
568
|
+
isDracoGeometry: this.header.isDracoGeometry,
|
|
569
|
+
mbs: this.header.mbs
|
|
570
|
+
},
|
|
571
|
+
_tilesetOptions: {
|
|
572
|
+
store: this.tileset.tileset.store
|
|
573
|
+
},
|
|
565
574
|
isTileHeader: false
|
|
566
575
|
};
|
|
567
576
|
case '3d-tiles':
|
|
@@ -4,6 +4,7 @@ import { RequestScheduler, LoaderWithParser, LoaderOptions } from '@loaders.gl/l
|
|
|
4
4
|
import { FrameState } from './helpers/frame-state';
|
|
5
5
|
import Tile3D from './tile-3d';
|
|
6
6
|
import TilesetTraverser from './traversers/tileset-traverser';
|
|
7
|
+
import { Viewport } from '../types';
|
|
7
8
|
export declare type Tileset3DProps = {
|
|
8
9
|
throttleRequests?: boolean;
|
|
9
10
|
maxRequests?: number;
|
|
@@ -135,14 +136,14 @@ export default class Tileset3D {
|
|
|
135
136
|
* @param viewports - list of viewports
|
|
136
137
|
* @deprecated
|
|
137
138
|
*/
|
|
138
|
-
update(viewports?:
|
|
139
|
+
update(viewports?: Viewport[] | Viewport | null): void;
|
|
139
140
|
/**
|
|
140
141
|
* Update visible tiles relying on a list of viewports.
|
|
141
142
|
* Do it with debounce delay to prevent update spam
|
|
142
143
|
* @param viewports viewports
|
|
143
144
|
* @returns Promise of new frameNumber
|
|
144
145
|
*/
|
|
145
|
-
selectTiles(viewports?:
|
|
146
|
+
selectTiles(viewports?: Viewport[] | Viewport | null): Promise<number>;
|
|
146
147
|
/**
|
|
147
148
|
* Update visible tiles relying on a list of viewports
|
|
148
149
|
* @param viewports viewports
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tileset-3d.d.ts","sourceRoot":"","sources":["../../src/tileset/tileset-3d.ts"],"names":[],"mappings":"AAsCA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAE/C,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EACL,gBAAgB,EAGhB,gBAAgB,EAChB,aAAa,EACd,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAC,UAAU,EAAoC,MAAM,uBAAuB,CAAC;AAEpF,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"tileset-3d.d.ts","sourceRoot":"","sources":["../../src/tileset/tileset-3d.ts"],"names":[],"mappings":"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"}
|
|
@@ -240,7 +240,9 @@ class Tileset3D {
|
|
|
240
240
|
else {
|
|
241
241
|
this.lastUpdatedVieports = viewports;
|
|
242
242
|
}
|
|
243
|
-
|
|
243
|
+
if (viewports) {
|
|
244
|
+
this.doUpdate(viewports);
|
|
245
|
+
}
|
|
244
246
|
});
|
|
245
247
|
}
|
|
246
248
|
/**
|
|
@@ -257,7 +259,9 @@ class Tileset3D {
|
|
|
257
259
|
if (!this.updatePromise) {
|
|
258
260
|
this.updatePromise = new Promise((resolve) => {
|
|
259
261
|
setTimeout(() => {
|
|
260
|
-
|
|
262
|
+
if (this.lastUpdatedVieports) {
|
|
263
|
+
this.doUpdate(this.lastUpdatedVieports);
|
|
264
|
+
}
|
|
261
265
|
resolve(this._frameNumber);
|
|
262
266
|
this.updatePromise = null;
|
|
263
267
|
}, this.options.debounceTime);
|
|
@@ -270,22 +274,20 @@ class Tileset3D {
|
|
|
270
274
|
* @param viewports viewports
|
|
271
275
|
*/
|
|
272
276
|
// eslint-disable-next-line max-statements, complexity
|
|
273
|
-
doUpdate(viewports
|
|
277
|
+
doUpdate(viewports) {
|
|
274
278
|
if ('loadTiles' in this.options && !this.options.loadTiles) {
|
|
275
279
|
return;
|
|
276
280
|
}
|
|
277
281
|
if (this.traverseCounter > 0) {
|
|
278
282
|
return;
|
|
279
283
|
}
|
|
280
|
-
|
|
281
|
-
viewports = [viewports];
|
|
282
|
-
}
|
|
284
|
+
const preparedViewports = viewports instanceof Array ? viewports : [viewports];
|
|
283
285
|
this._cache.reset();
|
|
284
286
|
this._frameNumber++;
|
|
285
|
-
this.traverseCounter =
|
|
287
|
+
this.traverseCounter = preparedViewports.length;
|
|
286
288
|
const viewportsToTraverse = [];
|
|
287
289
|
// First loop to decrement traverseCounter
|
|
288
|
-
for (const viewport of
|
|
290
|
+
for (const viewport of preparedViewports) {
|
|
289
291
|
const id = viewport.id;
|
|
290
292
|
if (this._needTraverse(id)) {
|
|
291
293
|
viewportsToTraverse.push(id);
|
|
@@ -295,7 +297,7 @@ class Tileset3D {
|
|
|
295
297
|
}
|
|
296
298
|
}
|
|
297
299
|
// Second loop to traverse
|
|
298
|
-
for (const viewport of
|
|
300
|
+
for (const viewport of preparedViewports) {
|
|
299
301
|
const id = viewport.id;
|
|
300
302
|
if (!this.roots[id]) {
|
|
301
303
|
this.roots[id] = this._initializeTileHeaders(this.tileset, null);
|