mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-29 00:26:10 +03:00
Code Issues Projects Releases Wiki Activity

Tracking tile loading separately from tile drawing

Browse Source
This commit is contained in:
Ian Gilman 2017-05-11 11:49:18 -07:00
parent de2fcb1b74
commit 300ebbfe82
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tiledimage.js
View File

@ -146,7 +146,8 @@ $.TiledImage = function( options ) {
//internal state properties //internal state properties
viewer: null, viewer: null,
tilesMatrix: {}, // A '3d' dictionary [level][x][y] --> Tile. tilesMatrix: {}, // A '3d' dictionary [level][x][y] --> Tile.
coverage: {}, // A '3d' dictionary [level][x][y] --> Boolean. coverage: {}, // A '3d' dictionary [level][x][y] --> Boolean; shows what areas have been drawn.
loadingCoverage: {}, // A '3d' dictionary [level][x][y] --> Boolean; shows what areas are loaded or are being loaded/blended.
lastDrawn: [], // An unordered list of Tiles drawn last frame. lastDrawn: [], // An unordered list of Tiles drawn last frame.
lastResetTime: 0, // Last time for which the tiledImage was reset. lastResetTime: 0, // Last time for which the tiledImage was reset.
_midDraw: false, // Is the tiledImage currently updating the viewport? _midDraw: false, // Is the tiledImage currently updating the viewport?
@ -1122,6 +1123,7 @@ function updateLevel(tiledImage, haveDrawn, drawLevel, level, levelOpacity,
} }
resetCoverage(tiledImage.coverage, level); resetCoverage(tiledImage.coverage, level);
resetCoverage(tiledImage.loadingCoverage, level);
//OK, a new drawing so do your calculations //OK, a new drawing so do your calculations
var cornerTiles = tiledImage._getCornerTiles(level, topLeftBound, bottomRightBound); var cornerTiles = tiledImage._getCornerTiles(level, topLeftBound, bottomRightBound);
@ -1216,6 +1218,9 @@ function updateTile( tiledImage, haveDrawn, drawLevel, x, y, level, levelOpacity
setCoverage( tiledImage.coverage, level, x, y, false ); setCoverage( tiledImage.coverage, level, x, y, false );
var loadingCoverage = tile.loaded || tile.loading || isCovered(tiledImage.loadingCoverage, level, x, y);
setCoverage(tiledImage.loadingCoverage, level, x, y, loadingCoverage);
if ( !tile.exists ) { if ( !tile.exists ) {
return best; return best;
} }
@ -1269,7 +1274,7 @@ function updateTile( tiledImage, haveDrawn, drawLevel, x, y, level, levelOpacity
} else if ( tile.loading ) { } else if ( tile.loading ) {
// the tile is already in the download queue // the tile is already in the download queue
tiledImage._tilesLoading++; tiledImage._tilesLoading++;
} else { } else if (!loadingCoverage) {
best = compareTiles( best, tile ); best = compareTiles( best, tile );
} }