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

Merge pull request #3896 from ahocevar/webgl-precompose

Browse Source 
Fire WebGL precompose event in same sequence as other renderers
This commit is contained in:
Andreas Hocevar
2015-07-12 10:05:45 +02:00
parent c89fb3ccfe ac8e62818f
commit 7094f65ef7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/webglmaprenderer.js
+2 -2
View File
@@ -467,6 +467,8 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
this.textureCache_.set((-frameState.index).toString(), null); this.textureCache_.set((-frameState.index).toString(), null);
++this.textureCacheFrameMarkerCount_; ++this.textureCacheFrameMarkerCount_;
this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState);
/** @type {Array.<ol.layer.LayerState>} */ /** @type {Array.<ol.layer.LayerState>} */
var layerStatesToDraw = []; var layerStatesToDraw = [];
var layerStatesArray = frameState.layerStatesArray; var layerStatesArray = frameState.layerStatesArray;
@@ -499,8 +501,6 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
gl.enable(goog.webgl.BLEND); gl.enable(goog.webgl.BLEND);
gl.viewport(0, 0, this.canvas_.width, this.canvas_.height); gl.viewport(0, 0, this.canvas_.width, this.canvas_.height);
this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState);
for (i = 0, ii = layerStatesToDraw.length; i < ii; ++i) { for (i = 0, ii = layerStatesToDraw.length; i < ii; ++i) {
layerState = layerStatesToDraw[i]; layerState = layerStatesToDraw[i];
layerRenderer = this.getLayerRenderer(layerState.layer); layerRenderer = this.getLayerRenderer(layerState.layer);