Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions src/base/traverseFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,22 @@ function recursivelyMarkUsed( tile, frameCount, lruCache, renderer ) {

}

function recursivelyLoadTiles( tile, depthFromRenderedParent, renderer ) {
function recursivelyLoadTiles( tile, depthFromRenderedParent, renderer, frameCount ) {

renderer.ensureChildrenArePreprocessed( tile );

// Try to load any external tile set children if the external tile set has loaded.
const doTraverse =
tile.__contentEmpty && (
! tile.__externalTileSet ||
isDownloadFinished( tile.__loadingState )
);
if ( doTraverse ) {
const lruCache = renderer.lruCache;
if ( isUsedThisFrame( tile, frameCount ) && ! lruCache.isFull() ) {

const doLoad = ( ! tile.__contentEmpty || tile.__externalTileSet ) && ! isDownloadFinished( tile.__loadingState );

if ( doLoad ) {

renderer.requestTileContents( tile );

}

tile.__depthFromRenderedParent = depthFromRenderedParent;

const children = tile.children;
for ( let i = 0, l = children.length; i < l; i ++ ) {
Expand All @@ -74,15 +79,10 @@ function recursivelyLoadTiles( tile, depthFromRenderedParent, renderer ) {
// the next layer of rendered children as just a single depth away for the
// sake of sorting.
const child = children[ i ];
child.__depthFromRenderedParent = depthFromRenderedParent;
recursivelyLoadTiles( child, depthFromRenderedParent, renderer );
recursivelyLoadTiles( child, ! tile.__contentEmpty ? depthFromRenderedParent : depthFromRenderedParent + 1, renderer, frameCount );

}

} else {

renderer.requestTileContents( tile );

}

}
Expand Down Expand Up @@ -364,13 +364,7 @@ export function skipTraversal( tile, renderer ) {
// layer when the data has loaded.
for ( let i = 0, l = children.length; i < l; i ++ ) {

const c = children[ i ];
if ( isUsedThisFrame( c, frameCount ) && ! lruCache.isFull() ) {

c.__depthFromRenderedParent = tile.__depthFromRenderedParent + 1;
recursivelyLoadTiles( c, c.__depthFromRenderedParent, renderer );

}
recursivelyLoadTiles( children[ i ], tile.__depthFromRenderedParent + 1, renderer, frameCount );

}

Expand Down
5 changes: 5 additions & 0 deletions src/utilities/LRUCache.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ class LRUCache {

if ( this.isFull() ) {

// TODO: can we check if the tile being added is a better tile to include and remove
// other tiles to make space. Ideally this would use the other priority sort function as
// the other callback functions.
// But how can we efficiently find the less viable tile? Sort every time on add when full?
// Binary sort insert? It will be slow when reaching the limits
return false;

}
Expand Down