From 6b96cf4ed58594815c5b6395576b7c903679bb5b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sun, 1 Dec 2013 21:23:03 +0100 Subject: [PATCH] Use ol.vec.Mat4.makeTransform2D in ol.renderer.dom.TileLayer --- src/ol/renderer/dom/domtilelayerrenderer.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index bb37352bd8..ed81826fe0 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -21,6 +21,7 @@ goog.require('ol.extent'); goog.require('ol.layer.Tile'); goog.require('ol.renderer.dom.Layer'); goog.require('ol.tilegrid.TileGrid'); +goog.require('ol.vec.Mat4'); @@ -207,17 +208,13 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = } resolution = tileLayerZ.getResolution(); origin = tileLayerZ.getOrigin(); - goog.vec.Mat4.makeIdentity(transform); - goog.vec.Mat4.translate( - transform, frameState.size[0] / 2, frameState.size[1] / 2, 0); - goog.vec.Mat4.rotateZ(transform, view2DState.rotation); - goog.vec.Mat4.scale(transform, resolution / view2DState.resolution, - resolution / view2DState.resolution, 1); - goog.vec.Mat4.translate( - transform, + ol.vec.Mat4.makeTransform2D(transform, + frameState.size[0] / 2, frameState.size[1] / 2, + resolution / view2DState.resolution, + resolution / view2DState.resolution, + view2DState.rotation, (origin[0] - center[0]) / resolution, - (center[1] - origin[1]) / resolution, - 0); + (center[1] - origin[1]) / resolution); tileLayerZ.setTransform(transform); if (tileLayerZKey in newTileLayerZKeys) { for (j = tileLayerZKey - 1; j >= 0; --j) {