diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 8c3f672bb5..803b556708 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -91,8 +91,8 @@ ol.render.canvas.Batch.prototype.appendFlatCoordinates = * @param {goog.vec.Mat4.AnyType} transform Transform. */ ol.render.canvas.Batch.prototype.draw = function(context, transform) { - var pixelCoordinates = ol.render.transformCoordinates( - this.coordinates, transform, this.pixelCoordinates_); + var pixelCoordinates = ol.render.transformFlatCoordinates( + this.coordinates, 2, transform, this.pixelCoordinates_); this.pixelCoordinates_ = pixelCoordinates; // FIXME ? var instructions = this.instructions; var i = 0; diff --git a/src/ol/render/render.js b/src/ol/render/render.js index 64829288ac..5d0aed06a5 100644 --- a/src/ol/render/render.js +++ b/src/ol/render/render.js @@ -4,35 +4,31 @@ goog.require('goog.vec.Mat4'); /** - * @param {Array.} coordinates Coordinates. + * @param {Array.} flatCoordinates Flat coordinates. + * @param {number} stride Stride. * @param {goog.vec.Mat4.AnyType} transform Transform. * @param {Array.=} opt_dest Destination. * @return {Array.} Transformed coordinates. */ -ol.render.transformCoordinates = function(coordinates, transform, opt_dest) { +ol.render.transformFlatCoordinates = + function(flatCoordinates, stride, transform, opt_dest) { var m00 = goog.vec.Mat4.getElement(transform, 0, 0); var m10 = goog.vec.Mat4.getElement(transform, 1, 0); var m01 = goog.vec.Mat4.getElement(transform, 0, 1); var m11 = goog.vec.Mat4.getElement(transform, 1, 1); var m03 = goog.vec.Mat4.getElement(transform, 0, 3); var m13 = goog.vec.Mat4.getElement(transform, 1, 3); - var n = coordinates.length; - var result; - if (goog.isDef(opt_dest)) { - result = opt_dest; - } else { - result = []; + var dest = goog.isDef(opt_dest) ? opt_dest : []; + var i = 0; + var j, jj; + for (j = 0, jj = flatCoordinates.length; j < jj; j += stride) { + var x = flatCoordinates[j]; + var y = flatCoordinates[j + 1]; + dest[i++] = m00 * x + m01 * y + m03; + dest[i++] = m10 * x + m11 * y + m13; } - var j = 0; - var i, x, y; - for (i = 0; i < n; ) { - x = coordinates[i++]; - y = coordinates[i++]; - result[j++] = m00 * x + m01 * y + m03; - result[j++] = m10 * x + m11 * y + m13; + if (goog.isDef(opt_dest) && dest.length != i) { + dest.length = i; } - if (goog.isDef(opt_dest) && result.length != j) { - result.length = j; - } - return result; + return dest; };