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

Fix type errors in ol.renderer.webgl.Map

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 17:22:40 +01:00
parent fd733eca82
commit 2bcfa9ee00
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ goog.require('ol.layer.Image');
goog.require('ol.layer.Tile'); goog.require('ol.layer.Tile');
goog.require('ol.renderer.Map'); goog.require('ol.renderer.Map');
goog.require('ol.renderer.webgl.ImageLayer'); goog.require('ol.renderer.webgl.ImageLayer');
goog.require('ol.renderer.webgl.Layer');
goog.require('ol.renderer.webgl.TileLayer'); goog.require('ol.renderer.webgl.TileLayer');
goog.require('ol.renderer.webgl.map.shader.Color'); goog.require('ol.renderer.webgl.map.shader.Color');
goog.require('ol.renderer.webgl.map.shader.Default'); goog.require('ol.renderer.webgl.map.shader.Default');
@@ -520,6 +521,7 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
this.textureCache_.clear(); this.textureCache_.clear();
this.textureCacheFrameMarkerCount_ = 0; this.textureCacheFrameMarkerCount_ = 0;
goog.object.forEach(this.getLayerRenderers(), function(layerRenderer) { goog.object.forEach(this.getLayerRenderers(), function(layerRenderer) {
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer);
layerRenderer.handleWebGLContextLost(); layerRenderer.handleWebGLContextLost();
}); });
}; };
@@ -596,6 +598,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
for (i = 0, ii = layersArray.length; i < ii; ++i) { for (i = 0, ii = layersArray.length; i < ii; ++i) {
layer = layersArray[i]; layer = layersArray[i];
layerRenderer = this.getLayerRenderer(layer); layerRenderer = this.getLayerRenderer(layer);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer);
layerState = frameState.layerStates[goog.getUid(layer)]; layerState = frameState.layerStates[goog.getUid(layer)];
if (layerState.visible && if (layerState.visible &&
layerState.sourceState == ol.source.State.READY && layerState.sourceState == ol.source.State.READY &&
@@ -682,6 +685,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
} }
layerRenderer = this.getLayerRenderer(layer); layerRenderer = this.getLayerRenderer(layer);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer);
gl.uniformMatrix4fv( gl.uniformMatrix4fv(
locations.u_texCoordMatrix, false, layerRenderer.getTexCoordMatrix()); locations.u_texCoordMatrix, false, layerRenderer.getTexCoordMatrix());
gl.uniformMatrix4fv(locations.u_projectionMatrix, false, gl.uniformMatrix4fv(locations.u_projectionMatrix, false,