rendered is the context with the pre-drawn image.
- * @param {Number} [scale=1] - Apply a scale to position and size
- * @param {OpenSeadragon.Point} [translate] - A translation vector
- * @param {Boolean} [shouldRoundPositionAndSize] - Tells whether to round
- * position and size of tiles supporting alpha channel in non-transparency
- * context.
- * @param {OpenSeadragon.TileSource} source - The source specification of the tile.
- */
- drawTileToCanvas: function( tile, context, drawingHandler, scale, translate, shouldRoundPositionAndSize, source) {
+ * @private
+ * @inner
+ * Renders the tile in a canvas-based context.
+ * @function
+ * @param {OpenSeadragon.Tile} tile - the tile to draw to the canvas
+ * @param {Canvas} context
+ * @param {Function} drawingHandler - Method for firing the drawing event.
+ * drawingHandler({context, tile, rendered})
+ * where rendered is the context with the pre-drawn image.
+ * @param {Number} [scale=1] - Apply a scale to position and size
+ * @param {OpenSeadragon.Point} [translate] - A translation vector
+ * @param {Boolean} [shouldRoundPositionAndSize] - Tells whether to round
+ * position and size of tiles supporting alpha channel in non-transparency
+ * context.
+ * @param {OpenSeadragon.TileSource} source - The source specification of the tile.
+ */
+ _drawTileToCanvas: function( tile, context, drawingHandler, scale, translate, shouldRoundPositionAndSize, source) {
var position = tile.position.times($.pixelDensityRatio),
size = tile.size.times($.pixelDensityRatio),
@@ -696,7 +640,7 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
if (!tile.context2D && !tile.cacheImageRecord) {
$.console.warn(
- '[Drawer.drawTileToCanvas] attempting to draw tile %s when it\'s not cached',
+ '[Drawer._drawTileToCanvas] attempting to draw tile %s when it\'s not cached',
tile.toString());
return;
}
@@ -782,15 +726,17 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
},
/**
- * Renders the tile in an html container.
- * @function
- * @param {OpenSeadragon.Tile} tile
- * @param {Element} container
- */
- drawTileToHTML: function( tile, container ) {
+ * @private
+ * @inner
+ * Renders the tile in an html container.
+ * @function
+ * @param {OpenSeadragon.Tile} tile
+ * @param {Element} container
+ */
+ _drawTileToHTML: function( tile, container ) {
if (!tile.cacheImageRecord) {
$.console.warn(
- '[Drawer.drawTileToHTML] attempting to draw tile %s when it\'s not cached',
+ '[Drawer._drawTileToHTML] attempting to draw tile %s when it\'s not cached',
tile.toString());
return;
}
@@ -840,6 +786,13 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
$.setElementOpacity( tile.element, tile.opacity );
},
+ /**
+ * @private
+ * @inner
+ * Get the context of the main or sketch canvas
+ * @param {Boolean} useSketch
+ * @returns
+ */
_getContext: function( useSketch ) {
var context = this.context;
if ( useSketch ) {
@@ -872,8 +825,14 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
return context;
},
- // private
- saveContext: function( useSketch ) {
+ /**
+ * @private
+ * @inner
+ * Save the context of the main or sketch canvas
+ * @param {Boolean} useSketch
+ * @returns
+ */
+ _saveContext: function( useSketch ) {
if (!this.useCanvas) {
return;
}
@@ -881,8 +840,14 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
this._getContext( useSketch ).save();
},
- // private
- restoreContext: function( useSketch ) {
+ /**
+ * @private
+ * @inner
+ * Restore the context of the main or sketch canvas
+ * @param {Boolean} useSketch
+ * @returns
+ */
+ _restoreContext: function( useSketch ) {
if (!this.useCanvas) {
return;
}
@@ -891,7 +856,7 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
},
// private
- setClip: function(rect, useSketch) {
+ _setClip: function(rect, useSketch) {
if (!this.useCanvas) {
return;
}
@@ -1118,42 +1083,6 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
context.restore();
},
- // private
- debugRect: function(rect) {
- if ( this.useCanvas ) {
- var context = this.context;
- context.save();
- context.lineWidth = 2 * $.pixelDensityRatio;
- context.strokeStyle = this.debugGridColor[0];
- context.fillStyle = this.debugGridColor[0];
-
- context.strokeRect(
- rect.x * $.pixelDensityRatio,
- rect.y * $.pixelDensityRatio,
- rect.width * $.pixelDensityRatio,
- rect.height * $.pixelDensityRatio
- );
-
- context.restore();
- }
- },
-
- /**
- * Turns image smoothing on or off for this viewer. Note: Ignored in some (especially older) browsers that do not support this property.
- *
- * @function
- * @param {Boolean} [imageSmoothingEnabled] - Whether or not the image is
- * drawn smoothly on the canvas; see imageSmoothingEnabled in
- * {@link OpenSeadragon.Options} for more explanation.
- */
- setImageSmoothingEnabled: function(imageSmoothingEnabled){
- if ( this.useCanvas ) {
- this._imageSmoothingEnabled = imageSmoothingEnabled;
- this._updateImageSmoothingEnabled(this.context);
- this.viewer.forceRedraw();
- }
- },
-
// private
_updateImageSmoothingEnabled: function(context){
context.msImageSmoothingEnabled = this._imageSmoothingEnabled;
@@ -1161,16 +1090,25 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
},
/**
+ * @private
+ * @inner
* Get the canvas size
* @param {Boolean} sketch If set to true return the size of the sketch canvas
* @returns {OpenSeadragon.Point} The size of the canvas
*/
- getCanvasSize: function(sketch) {
+ _getCanvasSize: function(sketch) {
var canvas = this._getContext(sketch).canvas;
return new $.Point(canvas.width, canvas.height);
},
- getCanvasCenter: function() {
+ /**
+ * @private
+ * @inner
+ * Get the canvas center
+ * @param {Boolean} sketch If set to true return the center point of the sketch canvas
+ * @returns {OpenSeadragon.Point} The center point of the canvas
+ */
+ _getCanvasCenter: function() {
return new $.Point(this.canvas.width / 2, this.canvas.height / 2);
},
@@ -1178,7 +1116,7 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
_offsetForRotation: function(options) {
var point = options.point ?
options.point.times($.pixelDensityRatio) :
- this.getCanvasCenter();
+ this._getCanvasCenter();
var context = this._getContext(options.useSketch);
context.save();
@@ -1198,7 +1136,7 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
options = options || {};
var point = options.point ?
options.point.times($.pixelDensityRatio) :
- this.getCanvasCenter();
+ this._getCanvasCenter();
var context = this._getContext(options.useSketch);
context.translate(point.x, 0);
@@ -1240,90 +1178,7 @@ $.extend( $.Drawer.prototype, $.DrawerBase.prototype, /** @lends OpenSeadragon.D
};
},
- // deprecated functions
- // deprecated
- addOverlay: function( element, location, placement, onDraw ) {
- $.console.error("drawer.addOverlay is deprecated. Use viewer.addOverlay instead.");
- this.viewer.addOverlay( element, location, placement, onDraw );
- return this;
- },
- // deprecated
- updateOverlay: function( element, location, placement ) {
- $.console.error("drawer.updateOverlay is deprecated. Use viewer.updateOverlay instead.");
- this.viewer.updateOverlay( element, location, placement );
- return this;
- },
-
- // deprecated
- removeOverlay: function( element ) {
- $.console.error("drawer.removeOverlay is deprecated. Use viewer.removeOverlay instead.");
- this.viewer.removeOverlay( element );
- return this;
- },
-
- // deprecated
- clearOverlays: function() {
- $.console.error("drawer.clearOverlays is deprecated. Use viewer.clearOverlays instead.");
- this.viewer.clearOverlays();
- return this;
- },
- // deprecated
- needsUpdate: function() {
- $.console.error( "[Drawer.needsUpdate] this function is deprecated. Use World.needsDraw instead." );
- return this.viewer.world.needsDraw();
- },
-
- // deprecated
- numTilesLoaded: function() {
- $.console.error( "[Drawer.numTilesLoaded] this function is deprecated. Use TileCache.numTilesLoaded instead." );
- return this.viewer.tileCache.numTilesLoaded();
- },
-
- // deprecated
- reset: function() {
- $.console.error( "[Drawer.reset] this function is deprecated. Use World.resetItems instead." );
- this.viewer.world.resetItems();
- return this;
- },
-
- // deprecated
- update: function() {
- $.console.error( "[Drawer.update] this function is deprecated. Use Drawer.clear and World.draw instead." );
- this.clear();
- this.viewer.world.draw();
- return this;
- },
- /**
- * Set the opacity of the drawer.
- * @param {Number} opacity
- * @returns {OpenSeadragon.Drawer} Chainable.
- */
- setOpacity: function( opacity ) {
- $.console.error("drawer.setOpacity is deprecated. Use tiledImage.setOpacity instead.");
- var world = this.viewer.world;
- for (var i = 0; i < world.getItemCount(); i++) {
- world.getItemAt( i ).setOpacity( opacity );
- }
- return this;
- },
-
- /**
- * Get the opacity of the drawer.
- * @returns {Number}
- */
- getOpacity: function() {
- $.console.error("drawer.getOpacity is deprecated. Use tiledImage.getOpacity instead.");
- var world = this.viewer.world;
- var maxOpacity = 0;
- for (var i = 0; i < world.getItemCount(); i++) {
- var opacity = world.getItemAt( i ).getOpacity();
- if ( opacity > maxOpacity ) {
- maxOpacity = opacity;
- }
- }
- return maxOpacity;
- },
});
diff --git a/src/drawerbase.js b/src/drawerbase.js
index e556ee1c..42357b71 100644
--- a/src/drawerbase.js
+++ b/src/drawerbase.js
@@ -98,6 +98,7 @@ $.DrawerBase = function( options ) {
*/
this.element = this.container;
+ // TO DO: Does this need to be in DrawerBase, or only in Drawer implementations?
// We force our container to ltr because our drawing math doesn't work in rtl.
// This issue only affects our canvas renderer, but we do it always for consistency.
// Note that this means overlays you want to be rtl need to be explicitly set to rtl.
@@ -123,10 +124,6 @@ $.DrawerBase = function( options ) {
this.container.style.textAlign = "left";
this.container.appendChild( this.canvas );
- // Image smoothing for canvas rendering (only if canvas is used).
- // Canvas default is "true", so this will only be changed if user specified "false".
- this._imageSmoothingEnabled = true;
-
this._checkForAPIOverrides();
};
@@ -134,14 +131,10 @@ $.DrawerBase = function( options ) {
$.DrawerBase.prototype = {
// Drawer implementaions must define the next four methods. These are called
- // by core OSD, and forcing overrides (even for nullop methods) makes the
+ // by core OSD and/or public APIs, and forcing overrides (even for nullop methods) makes the
// behavior of the implementations explicitly clear in the code.
// Whether these have been overridden by child classes is checked in the
- // constructor (via _checkForAPIOverrides). It could make sense to consolidate
- // these a bit (e.g. by making `draw` take an array of `TiledImage`s and
- // clearing the view as needed, rather than the existing pattern of
- // `drawer.clear(); world.draw()` in the calling code), but they have been
- // left as-is to maintain backwards compatibility.
+ // constructor (via _checkForAPIOverrides).
/**
* @param tiledImage the TiledImage that is ready to be drawn
@@ -164,13 +157,6 @@ $.DrawerBase.prototype = {
$.console.error('Drawer.destroy must be implemented by child class');
},
- /**
- * Clears the Drawer so it's ready to draw another frame.
- */
- clear: function() {
- $.console.error('Drawer.clear must be implemented by child class');
- },
-
/**
* Turns image smoothing on or off for this viewer. Note: Ignored in some (especially older) browsers that do not support this property.
*
@@ -184,8 +170,26 @@ $.DrawerBase.prototype = {
},
/**
- * Ensures that child classes have provided implementations for API methods
- * draw, canRotate, destroy, and clear. Throws an exception if the original
+ * Optional public API to draw a rectangle (e.g. for debugging purposes)
+ * Child classes can override this method if they wish to support this
+ * @param {OpenSeadragon.Rect} rect
+ */
+ drawDebuggingRect: function(rect) {
+ $.console.warn('[drawer].drawDebuggingRect is not implemented by this drawer');
+ },
+
+ // Deprecated functions
+ clear: function(){
+ $.console.warn('[drawer].clear() is deprecated. The drawer is responsible for clearing itself as needed before drawing tiles.');
+ },
+
+ // Private functions
+
+ /**
+ * @private
+ * @inner
+ * Ensures that child classes have provided implementations for public API methods
+ * draw, canRotate, destroy, and setImageSmoothinEnabled. Throws an exception if the original
* placeholder methods are still in place.
*/
_checkForAPIOverrides: function(){
@@ -198,21 +202,24 @@ $.DrawerBase.prototype = {
if(this.destroy === $.DrawerBase.prototype.destroy){
throw("[drawer].destroy must be implemented by child class");
}
- if(this.clear === $.DrawerBase.prototype.clear){
- throw("[drawer].clear must be implemented by child class");
- }
+
if(this.setImageSmoothingEnabled === $.DrawerBase.prototype.setImageSmoothingEnabled){
throw("[drawer].setImageSmoothingEnabled must be implemented by child class");
}
},
+
+ // Utility functions internal API
+
/**
+ * @private
+ * @inner
* Scale from OpenSeadragon viewer rectangle to drawer rectangle
* (ignoring rotation)
* @param {OpenSeadragon.Rect} rectangle - The rectangle in viewport coordinate system.
* @returns {OpenSeadragon.Rect} Rectangle in drawer coordinate system.
*/
- viewportToDrawerRectangle: function(rectangle) {
+ _viewportToDrawerRectangle: function(rectangle) {
var topLeft = this.viewport.pixelFromPointNoRotate(rectangle.getTopLeft(), true);
var size = this.viewport.deltaPixelsFromPointsNoRotate(rectangle.getSize(), true);
@@ -225,6 +232,8 @@ $.DrawerBase.prototype = {
},
/**
+ * @private
+ * @inner
* This function converts the given point from to the drawer coordinate by
* multiplying it with the pixel density.
* This function does not take rotation into account, thus assuming provided
@@ -232,7 +241,7 @@ $.DrawerBase.prototype = {
* @param {OpenSeadragon.Point} point - the pixel point to convert
* @returns {OpenSeadragon.Point} Point in drawer coordinate system.
*/
- viewportCoordToDrawerCoord: function(point) {
+ _viewportCoordToDrawerCoord: function(point) {
var vpPoint = this.viewport.pixelFromPointNoRotate(point, true);
return new $.Point(
vpPoint.x * $.pixelDensityRatio,
@@ -240,8 +249,13 @@ $.DrawerBase.prototype = {
);
},
-
- // private
+ /**
+ * @private
+ * @inner
+ * Calculate width and height of the canvas based on viewport dimensions
+ * and pixelDensityRatio
+ * @returns {Dictionary} {x, y} size of the canvas
+ */
_calculateCanvasSize: function() {
var pixelDensityRatio = $.pixelDensityRatio;
var viewportSize = this.viewport.getContainerSize();
@@ -252,86 +266,6 @@ $.DrawerBase.prototype = {
};
},
-
- /* Deprecated Functions */
-
- // deprecated
- addOverlay: function( element, location, placement, onDraw ) {
- $.console.error("drawer.addOverlay is deprecated. Use viewer.addOverlay instead.");
- this.viewer.addOverlay( element, location, placement, onDraw );
- return this;
- },
-
- // deprecated
- updateOverlay: function( element, location, placement ) {
- $.console.error("drawer.updateOverlay is deprecated. Use viewer.updateOverlay instead.");
- this.viewer.updateOverlay( element, location, placement );
- return this;
- },
-
- // deprecated
- removeOverlay: function( element ) {
- $.console.error("drawer.removeOverlay is deprecated. Use viewer.removeOverlay instead.");
- this.viewer.removeOverlay( element );
- return this;
- },
-
- // deprecated
- clearOverlays: function() {
- $.console.error("drawer.clearOverlays is deprecated. Use viewer.clearOverlays instead.");
- this.viewer.clearOverlays();
- return this;
- },
- // deprecated
- needsUpdate: function() {
- $.console.error( "[Drawer.needsUpdate] this function is deprecated. Use World.needsDraw instead." );
- return this.viewer.world.needsDraw();
- },
-
- // deprecated
- numTilesLoaded: function() {
- $.console.error( "[Drawer.numTilesLoaded] this function is deprecated. Use TileCache.numTilesLoaded instead." );
- return this.viewer.tileCache.numTilesLoaded();
- },
-
- // deprecated
- reset: function() {
- $.console.error( "[Drawer.reset] this function is deprecated. Use World.resetItems instead." );
- this.viewer.world.resetItems();
- return this;
- },
-
- // deprecated
- update: function() {
- $.console.error( "[Drawer.update] this function is deprecated. Use Drawer.clear and World.draw instead." );
- this.clear();
- this.viewer.world.draw();
- return this;
- },
-
- // deprecated
- setOpacity: function( opacity ) {
- $.console.error("drawer.setOpacity is deprecated. Use tiledImage.setOpacity instead.");
- var world = this.viewer.world;
- for (var i = 0; i < world.getItemCount(); i++) {
- world.getItemAt( i ).setOpacity( opacity );
- }
- return this;
- },
-
- // deprecated
- getOpacity: function() {
- $.console.error("drawer.getOpacity is deprecated. Use tiledImage.getOpacity instead.");
- var world = this.viewer.world;
- var maxOpacity = 0;
- for (var i = 0; i < world.getItemCount(); i++) {
- var opacity = world.getItemAt( i ).getOpacity();
- if ( opacity > maxOpacity ) {
- maxOpacity = opacity;
- }
- }
- return maxOpacity;
- },
};
Object.defineProperty($.DrawerBase.prototype, "isOpenSeadragonDrawer", {
diff --git a/src/navigator.js b/src/navigator.js
index 0665b58d..7b9d9a63 100644
--- a/src/navigator.js
+++ b/src/navigator.js
@@ -310,7 +310,6 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
this.viewport.resize( containerSize, true );
this.viewport.goHome(true);
this.oldContainerSize = containerSize;
- this.drawer.clear();
this.world.draw();
}
}
diff --git a/src/tiledimage.js b/src/tiledimage.js
index e18bc05f..ddb23aff 100644
--- a/src/tiledimage.js
+++ b/src/tiledimage.js
@@ -1238,6 +1238,10 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
};
},
+ /**
+ *
+ * @returns {Array} Array of Tiles within the viewport which should be drawn
+ */
getTileInfoForDrawing: function(){
return this._tilesToDraw;
},
@@ -1342,9 +1346,6 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
} else {
this._setFullyLoaded(this._tilesLoading === 0);
}
-
-
- // return bestTile;
},
/**
diff --git a/src/viewer.js b/src/viewer.js
index 587c7ccb..cbcd80db 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -3811,7 +3811,6 @@ function updateOnce( viewer ) {
function drawWorld( viewer ) {
viewer.imageLoader.clear();
- viewer.drawer.clear();
viewer.world.draw();
/**
diff --git a/src/world.js b/src/world.js
index 3763d237..c355d8e0 100644
--- a/src/world.js
+++ b/src/world.js
@@ -256,10 +256,7 @@ $.extend( $.World.prototype, $.EventSource.prototype, /** @lends OpenSeadragon.W
* Draws all items.
*/
draw: function() {
- for ( var i = 0; i < this._items.length; i++ ) {
- this.viewer.drawer.draw(this._items[i]);
- }
-
+ this.viewer.drawer.draw(this._items);
this._needsDraw = false;
},
diff --git a/test/demo/collections/main.js b/test/demo/collections/main.js
index 83563085..136c3417 100644
--- a/test/demo/collections/main.js
+++ b/test/demo/collections/main.js
@@ -131,8 +131,8 @@
var box = new OpenSeadragon.Rect(margins.left, margins.top,
$('#contentDiv').width() - (margins.left + margins.right),
$('#contentDiv').height() - (margins.top + margins.bottom));
-
- self.viewer.drawer.debugRect(box);
+ // if drawDebuggingRect is implemented, use it to show the box
+ self.viewer.drawer.drawDebuggingRect(box);
});
}
diff --git a/test/demo/threejsdrawer.js b/test/demo/threejsdrawer.js
index 32719110..6013d212 100644
--- a/test/demo/threejsdrawer.js
+++ b/test/demo/threejsdrawer.js
@@ -106,7 +106,9 @@ export class ThreeJSDrawer extends OpenSeadragon.DrawerBase{
}
// Public API required by all Drawer implementations
-
+ /**
+ * Clean up the renderer, removing all resources
+ */
destroy(){
// clear all resources used by the renderer, geometries, textures etc
@@ -123,26 +125,61 @@ export class ThreeJSDrawer extends OpenSeadragon.DrawerBase{
this._camera = null;
}
- clear(){
- //not needed by this implementation
- }
+
+ // Public API required by all Drawer implementations
+ /**
+ *
+ * @returns true if the drawer supports rotation
+ */
canRotate(){
return true;
}
- draw(tiledImage){
+
+ // Public API required by all Drawer implementations
+ /**
+ *
+ * @param {Array} tiledImages Array of TiledImage objects to draw
+ */
+ draw(tiledImages){
// actual drawing is handled by event listeneners
- // just mark this tiledImage as having been drawn (possibly unnecessary)
- tiledImage._needsDraw = false;
+ // just mark the tiledImages as having been drawn (possibly unnecessary)
+ tiledImages.forEach(tiledImage => tiledImage._needsDraw = false);
}
+
+ // Public API required by all Drawer implementations
+ /**
+ * Set the context2d imageSmoothingEnabled parameter
+ * @param {Boolean} enabled
+ */
setImageSmoothingEnabled(enabled){
this._clippingContext.imageSmoothingEnabled = enabled;
this._outputContext.imageSmoothingEnabled = enabled;
}
+ /**
+ * Draw a rect onto the output canvas for debugging purposes
+ * @param {OpenSeadragon.Rect} rect
+ */
+ drawDebuggingRect(rect){
+ let context = this._outputContext;
+ context.save();
+ context.lineWidth = 2 * OpenSeadragon.pixelDensityRatio;
+ context.strokeStyle = this.debugGridColor[0];
+ context.fillStyle = this.debugGridColor[0];
+
+ context.strokeRect(
+ rect.x * OpenSeadragon.pixelDensityRatio,
+ rect.y * OpenSeadragon.pixelDensityRatio,
+ rect.width * OpenSeadragon.pixelDensityRatio,
+ rect.height * OpenSeadragon.pixelDensityRatio
+ );
+
+ context.restore();
+ }
+
// Private methods
_setupRenderer(){
- //to do: test support for pages of sequence mode
let viewerBounds = this.viewer.viewport.getBoundsNoRotate();
this._camera = new THREE.OrthographicCamera(
@@ -171,13 +208,6 @@ export class ThreeJSDrawer extends OpenSeadragon.DrawerBase{
this.viewer.addHandler("viewport-change", () => this._viewportChangeHandler());
this.viewer.addHandler("home", () => this._viewportChangeHandler());
- // this.viewer.world.addHandler("item-index-change", () => this.renderFrame());
- // this.viewer.addHandler("crop-change", () => this.renderFrame());
- // this.viewer.addHandler("clip-change", () => this.renderFrame());
- // this.viewer.addHandler("opacity-change", () => this.renderFrame());
- // this.viewer.addHandler("composite-operation-change", () => this.renderFrame());
-
-
this.viewer.addHandler("update-viewport", () => this.renderFrame());
this._viewportChangeHandler();
@@ -476,7 +506,7 @@ export class ThreeJSDrawer extends OpenSeadragon.DrawerBase{
if(item._clip){
var box = item.imageToViewportRectangle(item._clip, true);
- var rect = this.viewportToDrawerRectangle(box);
+ var rect = this._viewportToDrawerRectangle(box);
this._clippingContext.beginPath();
this._clippingContext.rect(rect.x, rect.y, rect.width, rect.height);
this._clippingContext.clip();
@@ -486,7 +516,7 @@ export class ThreeJSDrawer extends OpenSeadragon.DrawerBase{
return polygon.map(function (coord) {
let point = item.imageToViewportCoordinates(coord.x, coord.y, true)
.rotate(_this.viewer.viewport.getRotation(true), _this.viewer.viewport.getCenter(true));
- let clipPoint = _this.viewportCoordToDrawerCoord(point);
+ let clipPoint = _this._viewportCoordToDrawerCoord(point);
return clipPoint;
});
});
@@ -625,6 +655,7 @@ export class ThreeJSDrawer extends OpenSeadragon.DrawerBase{
context.restore();
}
+ // private
_drawDebugInfo( tiledImage ) {
let scene = this._tiledImageMap[tiledImage[this._uuid]];
let level = scene.userData.currentLevel;
@@ -641,25 +672,6 @@ export class ThreeJSDrawer extends OpenSeadragon.DrawerBase{
}
}
- // private
- _debugRect(rect) {
- if ( this.useCanvas ) {
- var context = this._outputContext;
- context.save();
- context.lineWidth = 2 * OpenSeadragon.pixelDensityRatio;
- context.strokeStyle = this.debugGridColor[0];
- context.fillStyle = this.debugGridColor[0];
-
- context.strokeRect(
- rect.x * OpenSeadragon.pixelDensityRatio,
- rect.y * OpenSeadragon.pixelDensityRatio,
- rect.width * OpenSeadragon.pixelDensityRatio,
- rect.height * OpenSeadragon.pixelDensityRatio
- );
-
- context.restore();
- }
- }
// private
_restoreRotationChanges() {
diff --git a/test/demo/webgl.html b/test/demo/webgl.html
index f3aa1c78..6d184feb 100644
--- a/test/demo/webgl.html
+++ b/test/demo/webgl.html
@@ -111,7 +111,7 @@