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

Merge branch 'master' of github.com:openlayers/ol3 into vector

Browse Source
This commit is contained in:
ahocevar
2013-01-30 15:54:24 +01:00
parent 65b3bb70a1 a64e4ae579
commit 1ecbc36a39
19 changed files with 368 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,17 +123,20 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
var layerRenderer = this.getLayerRenderer(layer);
layerRenderer.renderFrame(frameState, layerState);
var transform = layerRenderer.getTransform();
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));
var image = layerRenderer.getImage();
if (!goog.isNull(image)) {
var transform = layerRenderer.getTransform();
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.globalAlpha = layerState.opacity;
context.drawImage(layerRenderer.getImage(), 0, 0);
context.globalAlpha = layerState.opacity;
context.drawImage(image, 0, 0);
}
}, this);