ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Factor out getTransform

Browse Source
This commit is contained in:
Tom Payne
2013-11-11 09:32:20 +01:00
parent a83b0768b2
commit 36f85f9afd
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -20,12 +20,6 @@ ol.renderer.canvas.VectorLayer = function(mapRenderer, vectorLayer) {
goog.base(this, mapRenderer, vectorLayer);
/**
* @private
* @type {!goog.vec.Mat4.Number}
*/
this.transform_ = goog.vec.Mat4.createNumber();
/**
* @private
* @type {number}
@@ -60,26 +54,9 @@ goog.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer);
ol.renderer.canvas.VectorLayer.prototype.composeFrame =
function(frameState, layerState, context) {
var view2DState = frameState.view2DState;
var viewCenter = view2DState.center;
var viewResolution = view2DState.resolution;
var viewRotation = view2DState.rotation;
var transform = this.transform_;
goog.vec.Mat4.makeIdentity(transform);
goog.vec.Mat4.translate(transform,
frameState.size[0] / 2,
frameState.size[1] / 2,
0);
goog.vec.Mat4.scale(transform,
1 / viewResolution,
-1 / viewResolution,
1);
goog.vec.Mat4.rotateZ(transform, -viewRotation);
goog.vec.Mat4.translate(transform,
-viewCenter[0],
-viewCenter[1],
0);
// FIXME should be able to avoid call to getTransform here if no postcompose
// FIXME listeners or replay group
var transform = this.getTransform(frameState);
var replayGroup = this.replayGroup_;
if (!goog.isNull(replayGroup)) {