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

Merge remote-tracking branch 'openlayers/master' into vector-api

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 20:22:06 +01:00
parent 12c96510c1 b242756f03
commit b59eec7a83
39 changed files with 555 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,17 +363,6 @@ ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
};
/**
* @param {ol.layer.Layer} layer Layer.
* @return {ol.renderer.webgl.Layer} WebGL layer renderer.
*/
ol.renderer.webgl.Map.prototype.getWebGLLayerRenderer = function(layer) {
var layerRenderer = this.getLayerRenderer(layer);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer);
return /** @type {ol.renderer.webgl.Layer} */ (layerRenderer);
};
/**
* @param {goog.events.Event} event Event.
* @protected
@@ -482,7 +471,8 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
for (i = 0, ii = layersToDraw.length; i < ii; ++i) {
layer = layersToDraw[i];
layerRenderer = this.getWebGLLayerRenderer(layer);
layerRenderer = this.getLayerRenderer(layer);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer);
layerState = frameState.layerStates[goog.getUid(layer)];
layerRenderer.prepareFrame(frameState, layerState);
}
@@ -505,7 +495,8 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
for (i = 0, ii = layersToDraw.length; i < ii; ++i) {
layer = layersToDraw[i];
layerState = frameState.layerStates[goog.getUid(layer)];
layerRenderer = this.getWebGLLayerRenderer(layer);
layerRenderer = this.getLayerRenderer(layer);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer);
layerRenderer.composeFrame(frameState, layerState, context);
}