ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support hit detection on tainted canvas

Browse Source
This commit is contained in:
Éric Lemoine
2013-12-19 09:10:09 +01:00
parent 2bd0f8ae3e
commit fe7b614f22
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ol/render/canvas/canvasreplay.js
View File

@@ -466,6 +466,12 @@ ol.render.canvas.ImageReplay = function(pixelRatio, tolerance) {
*/ */
this.anchorY_ = undefined; this.anchorY_ = undefined;
/**
* @private
* @type {HTMLCanvasElement|HTMLVideoElement|Image}
*/
this.hitDetectionImage_ = null;
/** /**
* @private * @private
* @type {HTMLCanvasElement|HTMLVideoElement|Image} * @type {HTMLCanvasElement|HTMLVideoElement|Image}
@@ -528,13 +534,16 @@ ol.render.canvas.ImageReplay.prototype.drawPointGeometry =
var myBegin = this.coordinates.length; var myBegin = this.coordinates.length;
var myEnd = this.drawCoordinates_( var myEnd = this.drawCoordinates_(
flatCoordinates, 0, flatCoordinates.length, stride); flatCoordinates, 0, flatCoordinates.length, stride);
var drawImageInstruction = [ this.instructions.push([
ol.render.canvas.Instruction.DRAW_IMAGE, myBegin, myEnd, ol.render.canvas.Instruction.DRAW_IMAGE, myBegin, myEnd,
this.anchorX_, this.anchorY_, this.width_, this.height_, this.anchorX_, this.anchorY_, this.width_, this.height_,
this.image_, this.snapToPixel_ this.image_, this.snapToPixel_
]; ]);
this.instructions.push(drawImageInstruction); this.hitDetectionInstructions.push([
this.hitDetectionInstructions.push(drawImageInstruction); ol.render.canvas.Instruction.DRAW_IMAGE, myBegin, myEnd,
this.anchorX_, this.anchorY_, this.width_, this.height_,
this.hitDetectionImage_, this.snapToPixel_
]);
this.endGeometry(pointGeometry, data); this.endGeometry(pointGeometry, data);
}; };
@@ -558,13 +567,16 @@ ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry =
var myBegin = this.coordinates.length; var myBegin = this.coordinates.length;
var myEnd = this.drawCoordinates_( var myEnd = this.drawCoordinates_(
flatCoordinates, 0, flatCoordinates.length, stride); flatCoordinates, 0, flatCoordinates.length, stride);
var drawImageInstruction = [ this.instructions.push([
ol.render.canvas.Instruction.DRAW_IMAGE, myBegin, myEnd, ol.render.canvas.Instruction.DRAW_IMAGE, myBegin, myEnd,
this.anchorX_, this.anchorY_, this.width_, this.height_, this.anchorX_, this.anchorY_, this.width_, this.height_,
this.image_, this.snapToPixel_ this.image_, this.snapToPixel_
]; ]);
this.instructions.push(drawImageInstruction); this.hitDetectionInstructions.push([
this.hitDetectionInstructions.push(drawImageInstruction); ol.render.canvas.Instruction.DRAW_IMAGE, myBegin, myEnd,
this.anchorX_, this.anchorY_, this.width_, this.height_,
this.hitDetectionImage_, this.snapToPixel_
]);
this.endGeometry(multiPointGeometry, data); this.endGeometry(multiPointGeometry, data);
}; };
@@ -577,6 +589,7 @@ ol.render.canvas.ImageReplay.prototype.finish = function() {
// FIXME this doesn't really protect us against further calls to draw*Geometry // FIXME this doesn't really protect us against further calls to draw*Geometry
this.anchorX_ = undefined; this.anchorX_ = undefined;
this.anchorY_ = undefined; this.anchorY_ = undefined;
this.hitDetectionImage_ = null;
this.image_ = null; this.image_ = null;
this.height_ = undefined; this.height_ = undefined;
this.width_ = undefined; this.width_ = undefined;
@@ -592,10 +605,13 @@ ol.render.canvas.ImageReplay.prototype.setImageStyle = function(imageStyle) {
goog.asserts.assert(!goog.isNull(imageStyle.anchor)); goog.asserts.assert(!goog.isNull(imageStyle.anchor));
goog.asserts.assert(goog.isDef(imageStyle.size)); goog.asserts.assert(goog.isDef(imageStyle.size));
// FIXME pixel ratio // FIXME pixel ratio
var hitDetectionImage = imageStyle.getHitDetectionImage(1);
goog.asserts.assert(!goog.isNull(hitDetectionImage));
var image = imageStyle.getImage(1); var image = imageStyle.getImage(1);
goog.asserts.assert(!goog.isNull(image)); goog.asserts.assert(!goog.isNull(image));
this.anchorX_ = imageStyle.anchor[0]; this.anchorX_ = imageStyle.anchor[0];
this.anchorY_ = imageStyle.anchor[1]; this.anchorY_ = imageStyle.anchor[1];
this.hitDetectionImage_ = hitDetectionImage;
this.image_ = image; this.image_ = image;
this.width_ = imageStyle.size[0]; this.width_ = imageStyle.size[0];
this.height_ = imageStyle.size[1]; this.height_ = imageStyle.size[1];