Use ol.vec.Mat4.makeTransform2D in ol.renderer.dom.TileLayer

This commit is contained in:
Tom Payne
2013-12-01 21:23:03 +01:00
parent 432a8d2e19
commit 6b96cf4ed5
+7 -10
View File
@@ -21,6 +21,7 @@ goog.require('ol.extent');
goog.require('ol.layer.Tile'); goog.require('ol.layer.Tile');
goog.require('ol.renderer.dom.Layer'); goog.require('ol.renderer.dom.Layer');
goog.require('ol.tilegrid.TileGrid'); goog.require('ol.tilegrid.TileGrid');
goog.require('ol.vec.Mat4');
@@ -207,17 +208,13 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
} }
resolution = tileLayerZ.getResolution(); resolution = tileLayerZ.getResolution();
origin = tileLayerZ.getOrigin(); origin = tileLayerZ.getOrigin();
goog.vec.Mat4.makeIdentity(transform); ol.vec.Mat4.makeTransform2D(transform,
goog.vec.Mat4.translate( frameState.size[0] / 2, frameState.size[1] / 2,
transform, frameState.size[0] / 2, frameState.size[1] / 2, 0); resolution / view2DState.resolution,
goog.vec.Mat4.rotateZ(transform, view2DState.rotation); resolution / view2DState.resolution,
goog.vec.Mat4.scale(transform, resolution / view2DState.resolution, view2DState.rotation,
resolution / view2DState.resolution, 1);
goog.vec.Mat4.translate(
transform,
(origin[0] - center[0]) / resolution, (origin[0] - center[0]) / resolution,
(center[1] - origin[1]) / resolution, (center[1] - origin[1]) / resolution);
0);
tileLayerZ.setTransform(transform); tileLayerZ.setTransform(transform);
if (tileLayerZKey in newTileLayerZKeys) { if (tileLayerZKey in newTileLayerZKeys) {
for (j = tileLayerZKey - 1; j >= 0; --j) { for (j = tileLayerZKey - 1; j >= 0; --j) {