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

Split anchor ImageReplay property into anchorX and anchorY

Browse Source
This commit is contained in:
Frederic Junod
2013-11-21 14:30:55 +01:00
parent db8f476098
commit 76a908d00c
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,15 +127,16 @@ ol.render.canvas.Replay.prototype.draw = function(context, transform) {
++i; ++i;
} else if (type == ol.render.canvas.Instruction.DRAW_IMAGE) { } else if (type == ol.render.canvas.Instruction.DRAW_IMAGE) {
dd = /** @type {number} */ (instruction[1]); dd = /** @type {number} */ (instruction[1]);
var anchor = /** @type {ol.Pixel} */ (instruction[2]); var anchorX = /** @type {number} */ (instruction[2]);
var width = /** @type {number} */ (instruction[3]); var anchorY = /** @type {number} */ (instruction[3]);
var height = /** @type {number} */ (instruction[4]); var width = /** @type {number} */ (instruction[4]);
var height = /** @type {number} */ (instruction[5]);
var image = /** @type {HTMLCanvasElement|HTMLVideoElement|Image} */ var image = /** @type {HTMLCanvasElement|HTMLVideoElement|Image} */
(instruction[5]); (instruction[6]);
var snapToPixel = /** @type {boolean|undefined} */ (instruction[6]); var snapToPixel = /** @type {boolean|undefined} */ (instruction[7]);
for (; d < dd; d += 2) { for (; d < dd; d += 2) {
var x = pixelCoordinates[d] - anchor[0]; var x = pixelCoordinates[d] - anchorX;
var y = pixelCoordinates[d + 1] - anchor[1]; var y = pixelCoordinates[d + 1] - anchorY;
if (snapToPixel) { if (snapToPixel) {
x = (x + 0.5) | 0; x = (x + 0.5) | 0;
y = (y + 0.5) | 0; y = (y + 0.5) | 0;
@@ -267,9 +268,15 @@ ol.render.canvas.ImageReplay = function() {
/** /**
* @private * @private
* @type {ol.Pixel} * @type {number}
*/ */
this.anchor_ = null; this.anchorX_ = undefined;
/**
* @private
* @type {number}
*/
this.anchorY_ = undefined;
/** /**
* @private * @private
@@ -322,7 +329,8 @@ ol.render.canvas.ImageReplay.prototype.drawPointGeometry =
if (goog.isNull(this.image_)) { if (goog.isNull(this.image_)) {
return; return;
} }
goog.asserts.assert(!goog.isNull(this.anchor_)); goog.asserts.assert(goog.isDef(this.anchorX_));
goog.asserts.assert(goog.isDef(this.anchorY_));
goog.asserts.assert(goog.isDef(this.height_)); goog.asserts.assert(goog.isDef(this.height_));
goog.asserts.assert(goog.isDef(this.width_)); goog.asserts.assert(goog.isDef(this.width_));
ol.extent.extend(this.extent_, pointGeometry.getExtent()); ol.extent.extend(this.extent_, pointGeometry.getExtent());
@@ -332,7 +340,7 @@ ol.render.canvas.ImageReplay.prototype.drawPointGeometry =
flatCoordinates, 0, flatCoordinates.length, stride); flatCoordinates, 0, flatCoordinates.length, stride);
this.instructions.push([ this.instructions.push([
ol.render.canvas.Instruction.DRAW_IMAGE, myEnd, ol.render.canvas.Instruction.DRAW_IMAGE, myEnd,
this.anchor_, this.width_, this.height_, this.anchorX_, this.anchorY_, this.width_, this.height_,
this.image_, this.snapToPixel_ this.image_, this.snapToPixel_
]); ]);
}; };
@@ -346,7 +354,8 @@ ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry =
if (goog.isNull(this.image_)) { if (goog.isNull(this.image_)) {
return; return;
} }
goog.asserts.assert(!goog.isNull(this.anchor_)); goog.asserts.assert(goog.isDef(this.anchorX_));
goog.asserts.assert(goog.isDef(this.anchorY_));
goog.asserts.assert(goog.isDef(this.height_)); goog.asserts.assert(goog.isDef(this.height_));
goog.asserts.assert(goog.isDef(this.width_)); goog.asserts.assert(goog.isDef(this.width_));
ol.extent.extend(this.extent_, multiPointGeometry.getExtent()); ol.extent.extend(this.extent_, multiPointGeometry.getExtent());
@@ -356,7 +365,7 @@ ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry =
flatCoordinates, 0, flatCoordinates.length, stride); flatCoordinates, 0, flatCoordinates.length, stride);
this.instructions.push([ this.instructions.push([
ol.render.canvas.Instruction.DRAW_IMAGE, myEnd, ol.render.canvas.Instruction.DRAW_IMAGE, myEnd,
this.anchor_, this.width_, this.height_, this.anchorX_, this.anchorY_, this.width_, this.height_,
this.image_, this.snapToPixel_ this.image_, this.snapToPixel_
]); ]);
}; };
@@ -367,7 +376,8 @@ ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry =
*/ */
ol.render.canvas.ImageReplay.prototype.finish = function() { 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.anchor_ = null; this.anchorX_ = undefined;
this.anchorY_ = undefined;
this.image_ = null; this.image_ = null;
this.height_ = undefined; this.height_ = undefined;
this.width_ = undefined; this.width_ = undefined;
@@ -383,7 +393,8 @@ 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));
goog.asserts.assert(!goog.isNull(imageStyle.image)); goog.asserts.assert(!goog.isNull(imageStyle.image));
this.anchor_ = imageStyle.anchor; this.anchorX_ = imageStyle.anchor[0];
this.anchorY_ = imageStyle.anchor[1];
this.image_ = imageStyle.image; this.image_ = imageStyle.image;
this.width_ = imageStyle.size[0]; this.width_ = imageStyle.size[0];
this.height_ = imageStyle.size[1]; this.height_ = imageStyle.size[1];