From 20bd020c13df3b406fc11a01b61a61d15434f2b5 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Sun, 1 Dec 2013 21:23:23 +0100
Subject: [PATCH] Use ol.vec.Mat4.makeTransform2D in ol.renderer.Map

---
 src/ol/renderer/maprenderer.js | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js
index c6d96d5dc4..49ec3edb5c 100644
--- a/src/ol/renderer/maprenderer.js
+++ b/src/ol/renderer/maprenderer.js
@@ -8,6 +8,7 @@ goog.require('goog.vec.Mat4');
 goog.require('ol.FrameState');
 goog.require('ol.layer.Layer');
 goog.require('ol.renderer.Layer');
+goog.require('ol.vec.Mat4');
 
 
 
@@ -42,30 +43,17 @@ goog.inherits(ol.renderer.Map, goog.Disposable);
  * @protected
  */
 ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
-
   var view2DState = frameState.view2DState;
   var coordinateToPixelMatrix = frameState.coordinateToPixelMatrix;
-
-  goog.vec.Mat4.makeIdentity(coordinateToPixelMatrix);
-  goog.vec.Mat4.translate(coordinateToPixelMatrix,
-      frameState.size[0] / 2,
-      frameState.size[1] / 2,
-      0);
-  goog.vec.Mat4.scale(coordinateToPixelMatrix,
-      1 / view2DState.resolution,
-      -1 / view2DState.resolution,
-      1);
-  goog.vec.Mat4.rotateZ(coordinateToPixelMatrix,
-      -view2DState.rotation);
-  goog.vec.Mat4.translate(coordinateToPixelMatrix,
-      -view2DState.center[0],
-      -view2DState.center[1],
-      0);
-
+  goog.asserts.assert(!goog.isNull(coordinateToPixelMatrix));
+  ol.vec.Mat4.makeTransform2D(coordinateToPixelMatrix,
+      frameState.size[0] / 2, frameState.size[1] / 2,
+      1 / view2DState.resolution, -1 / view2DState.resolution,
+      -view2DState.rotation,
+      -view2DState.center[0], -view2DState.center[1]);
   var inverted = goog.vec.Mat4.invert(
       coordinateToPixelMatrix, frameState.pixelToCoordinateMatrix);
   goog.asserts.assert(inverted);
-
 };