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

Always create layer renderer, even when layer is invisible or not ready

Browse Source 
This is necessary because it is the layer renderer that is responsible
for triggering a render when a layer loads or becomes visible.
This commit is contained in:
Tom Payne
2013-04-18 12:52:43 +02:00
parent 77841bb8eb
commit 2f5797bc16
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,14 +121,11 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
goog.array.forEach(frameState.layersArray, function(layer) { goog.array.forEach(frameState.layersArray, function(layer) {
var layerRenderer = this.getLayerRenderer(layer);
var layerState = frameState.layerStates[goog.getUid(layer)]; var layerState = frameState.layerStates[goog.getUid(layer)];
if (!layerState.visible) { if (!layerState.visible || !layerState.ready) {
return;
} else if (!layerState.ready) {
frameState.animate = true;
return; return;
} }
var layerRenderer = this.getLayerRenderer(layer);
layerRenderer.renderFrame(frameState, layerState); layerRenderer.renderFrame(frameState, layerState);
var image = layerRenderer.getImage(); var image = layerRenderer.getImage();

9
src/ol/renderer/dom/dommaprenderer.js
View File

@@ -79,12 +79,11 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
} }
goog.array.forEach(frameState.layersArray, function(layer) { goog.array.forEach(frameState.layersArray, function(layer) {
var layerState = frameState.layerStates[goog.getUid(layer)];
if (!layerState.ready) {
return;
}
var layerRenderer = this.getLayerRenderer(layer); var layerRenderer = this.getLayerRenderer(layer);
layerRenderer.renderFrame(frameState, layerState); var layerState = frameState.layerStates[goog.getUid(layer)];
if (layerState.visible && layerState.ready) {
layerRenderer.renderFrame(frameState, layerState);
}
}, this); }, this);
if (!this.renderedVisible_) { if (!this.renderedVisible_) {

9
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -525,12 +525,11 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
++this.textureCacheFrameMarkerCount_; ++this.textureCacheFrameMarkerCount_;
goog.array.forEach(frameState.layersArray, function(layer) { goog.array.forEach(frameState.layersArray, function(layer) {
var layerState = frameState.layerStates[goog.getUid(layer)];
if (!layerState.visible || !layerState.ready) {
return;
}
var layerRenderer = this.getLayerRenderer(layer); var layerRenderer = this.getLayerRenderer(layer);
layerRenderer.renderFrame(frameState, layerState); var layerState = frameState.layerStates[goog.getUid(layer)];
if (layerState.visible && layerState.ready) {
layerRenderer.renderFrame(frameState, layerState);
}
}, this); }, this);
var size = frameState.size; var size = frameState.size;