From 36fee8013a8702bc2f7d315c1c9bf0a06e6ab09f Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sun, 1 Dec 2013 21:21:22 +0100 Subject: [PATCH] Use ol.vec.Mat4.makeTransform2D in ol.renderer.canvas.ImageLayer --- .../canvas/canvasimagelayerrenderer.js | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index bd367c102d..7707b9650f 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -9,6 +9,7 @@ goog.require('ol.ViewHint'); goog.require('ol.layer.Image'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.Layer'); +goog.require('ol.vec.Mat4'); @@ -98,26 +99,16 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame = if (!goog.isNull(this.image_)) { image = this.image_; - var imageExtent = image.getExtent(); var imageResolution = image.getResolution(); - var imageTransform = this.imageTransform_; - goog.vec.Mat4.makeIdentity(imageTransform); - goog.vec.Mat4.translate(imageTransform, - frameState.size[0] / 2, frameState.size[1] / 2, 0); - goog.vec.Mat4.rotateZ(imageTransform, viewRotation); - goog.vec.Mat4.scale( - imageTransform, - imageResolution / viewResolution, - imageResolution / viewResolution, - 1); - goog.vec.Mat4.translate( - imageTransform, + ol.vec.Mat4.makeTransform2D(this.imageTransform_, + frameState.size[0] / 2, frameState.size[1] / 2, + imageResolution / viewResolution, imageResolution / viewResolution, + viewRotation, (imageExtent[0] - viewCenter[0]) / imageResolution, - (viewCenter[1] - imageExtent[3]) / imageResolution, - 0); - + (viewCenter[1] - imageExtent[3]) / imageResolution); this.updateAttributions(frameState.attributions, image.getAttributions()); this.updateLogos(frameState, imageSource); } + };