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

Add and use ol.renderer.canvas.Layer#composeFrame

Browse Source
This commit is contained in:
Tom Payne
2013-10-31 19:50:01 +01:00
parent b403c25646
commit 3a2133c130
2 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/ol/renderer/canvas/canvasmaprenderer.js
View File

@@ -107,9 +107,8 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
var layerStates = frameState.layerStates;
var layersArray = frameState.layersArray;
var viewResolution = frameState.view2DState.resolution;
var i, ii, image, layer, layerRenderer, layerState, transform;
var i, ii, layer, layerRenderer, layerState;
for (i = 0, ii = layersArray.length; i < ii; ++i) {
layer = layersArray[i];
layerRenderer =
/** @type {ol.renderer.canvas.Layer} */ (this.getLayerRenderer(layer));
@@ -121,37 +120,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
continue;
}
layerRenderer.prepareFrame(frameState, layerState);
image = layerRenderer.getImage();
if (!goog.isNull(image)) {
transform = layerRenderer.getTransform();
context.globalAlpha = layerState.opacity;
// for performance reasons, context.setTransform is only used
// when the view is rotated. see http://jsperf.com/canvas-transform
if (frameState.view2DState.rotation === 0) {
var dx = goog.vec.Mat4.getElement(transform, 0, 3);
var dy = goog.vec.Mat4.getElement(transform, 1, 3);
var dw = image.width * goog.vec.Mat4.getElement(transform, 0, 0);
var dh = image.height * goog.vec.Mat4.getElement(transform, 1, 1);
goog.asserts.assert(goog.isNumber(image.width));
goog.asserts.assert(goog.isNumber(image.height));
context.drawImage(image, 0, 0, image.width, image.height,
Math.round(dx), Math.round(dy), Math.round(dw), Math.round(dh));
} else {
context.setTransform(
goog.vec.Mat4.getElement(transform, 0, 0),
goog.vec.Mat4.getElement(transform, 1, 0),
goog.vec.Mat4.getElement(transform, 0, 1),
goog.vec.Mat4.getElement(transform, 1, 1),
goog.vec.Mat4.getElement(transform, 0, 3),
goog.vec.Mat4.getElement(transform, 1, 3));
context.drawImage(image, 0, 0);
context.setTransform(1, 0, 0, 1, 0, 0);
}
}
layerRenderer.composeFrame(frameState, layerState, context);
}
if (!this.renderedVisible_) {