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

Merge pull request #562 from twpayne/renderer-fixes

Browse Source 
Renderer fixes
This commit is contained in:
Tom Payne
2013-04-18 05:09:58 -07:00
parent 77841bb8eb 2f5797bc16
commit 1c4d2956ac
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) {
var layerRenderer = this.getLayerRenderer(layer);
var layerState = frameState.layerStates[goog.getUid(layer)];
if (!layerState.visible) {
return;
} else if (!layerState.ready) {
frameState.animate = true;
if (!layerState.visible || !layerState.ready) {
return;
}
var layerRenderer = this.getLayerRenderer(layer);
layerRenderer.renderFrame(frameState, layerState);
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) {
var layerState = frameState.layerStates[goog.getUid(layer)];
if (!layerState.ready) {
return;
}
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);
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_;
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);
layerRenderer.renderFrame(frameState, layerState);
var layerState = frameState.layerStates[goog.getUid(layer)];
if (layerState.visible && layerState.ready) {
layerRenderer.renderFrame(frameState, layerState);
}
}, this);
var size = frameState.size;