mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 05:06:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rotation-seams' into rotation-seams

Browse Source
This commit is contained in:
Aiosa 2023-07-26 23:58:07 +02:00 committed by GitHub
commit ca45e96142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 359 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tile.js
View File

@ -34,7 +34,7 @@
(function( $ ){ (function( $ ){
/** /**
* @class Tile * @class Tile
* @memberof OpenSeadragon * @memberof OpenSeadragon
* @param {Number} level The zoom level this tile belongs to. * @param {Number} level The zoom level this tile belongs to.
@ -56,7 +56,7 @@
* see TileSource::getPostData) or null * see TileSource::getPostData) or null
* @param {String} cacheKey key to act as a tile cache, must be unique for tiles with unique image data * @param {String} cacheKey key to act as a tile cache, must be unique for tiles with unique image data
*/ */
$.Tile = function(level, x, y, bounds, exists, url, context2D, loadWithAjax, ajaxHeaders, sourceBounds, postData, cacheKey) { $.Tile = function(level, x, y, bounds, exists, url, context2D, loadWithAjax, ajaxHeaders, sourceBounds, postData, cacheKey) {
/** /**
* The zoom level this tile belongs to. * The zoom level this tile belongs to.
* @member {Number} level * @member {Number} level
@ -258,10 +258,10 @@
* @memberof OpenSeadragon.Tile# * @memberof OpenSeadragon.Tile#
*/ */
this.isBottomMost = false; this.isBottomMost = false;
}; };
/** @lends OpenSeadragon.Tile.prototype */ /** @lends OpenSeadragon.Tile.prototype */
$.Tile.prototype = { $.Tile.prototype = {
/** /**
* Provides a string representation of this tiles level and (x,y) * Provides a string representation of this tiles level and (x,y)
@ -394,6 +394,6 @@
this.loaded = false; this.loaded = false;
this.loading = false; this.loading = false;
} }
}; };
}( OpenSeadragon )); }( OpenSeadragon ));

2
src/world.js
View File

@ -262,7 +262,7 @@ $.extend( $.World.prototype, $.EventSource.prototype, /** @lends OpenSeadragon.W
this.viewer.drawer.draw(this._items); this.viewer.drawer.draw(this._items);
this._needsDraw = false; this._needsDraw = false;
this._items.forEach(function(item){ this._items.forEach(function(item){
this._needsDraw = item.setDrawn() || this._needsDraw || true; this._needsDraw = item.setDrawn() || this._needsDraw;
}); });
}, },

2
test/demo/drawerperformance.html
View File

@ -8,7 +8,7 @@
<link rel="stylesheet" href="../lib/jquery-ui-1.10.2/css/smoothness/jquery-ui-1.10.2.min.css"> <link rel="stylesheet" href="../lib/jquery-ui-1.10.2/css/smoothness/jquery-ui-1.10.2.min.css">
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/stats.js/17/Stats.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script> --> <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/stats.js/17/Stats.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
<!-- <script type="text/javascript" src="./webgldemodrawer.js"></script> --> <script type="text/javascript" src="./webgldemodrawer.js"></script>
<script type="module" src="./drawerperformance.js"></script> <script type="module" src="./drawerperformance.js"></script>
<style type="text/css"> <style type="text/css">
.content{ .content{

2
test/demo/drawerperformance.js
View File

@ -56,7 +56,7 @@ function run(drawerType, num) {
window.setInterval(()=>{ window.setInterval(()=>{
let m = movingLeft ? 1 : -1; let m = movingLeft ? 1 : -1;
movingLeft = m === -1; movingLeft = m === -1;
let dist = viewer.viewport.getBounds().width / 2 / viewer.viewport.getZoom(); let dist = viewer.viewport.getBounds().width;
viewer.viewport.panBy(new OpenSeadragon.Point( dist * m/2, 0)); viewer.viewport.panBy(new OpenSeadragon.Point( dist * m/2, 0));
}, 1000); }, 1000);

2
test/demo/webgldemodrawer.js
View File

@ -302,8 +302,8 @@
tiledImage._croppingPolygons || tiledImage._croppingPolygons ||
tiledImage.debugMode tiledImage.debugMode
); );
let useTwoPassRendering = useContext2dPipeline ||(tiledImage.opacity < 1); // TODO: check hasTransparency in addition to opacity
let useTwoPassRendering = useContext2dPipeline ||(tiledImage.opacity < 1); // TODO: check hasTransparency in addition to opacity
let tilesToDraw = tiledImage.getTilesToDraw(); let tilesToDraw = tiledImage.getTilesToDraw();