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

Use automatically generated locations in WebGL tile layer renderer

Browse Source
This commit is contained in:
Tom Payne
2013-04-08 15:51:25 +02:00
parent aa5ce41cb5
commit f7f799be27
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/webgltilelayerrenderer.js
+3 -14
View File
@@ -46,10 +46,7 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
/** /**
* @private * @private
* @type {{a_position: number, * @type {ol.renderer.webgl.tilelayer.shader.Locations}
* a_texCoord: number,
* u_tileOffset: WebGLUniformLocation,
* u_texture: WebGLUniformLocation}|null}
*/ */
this.locations_ = null; this.locations_ = null;
@@ -175,16 +172,8 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
this.fragmentShader_, this.vertexShader_); this.fragmentShader_, this.vertexShader_);
gl.useProgram(program); gl.useProgram(program);
if (goog.isNull(this.locations_)) { if (goog.isNull(this.locations_)) {
this.locations_ = { this.locations_ =
a_position: gl.getAttribLocation( new ol.renderer.webgl.tilelayer.shader.Locations(gl, program);
program, ol.renderer.webgl.tilelayer.shader.attribute.a_position),
a_texCoord: gl.getAttribLocation(
program, ol.renderer.webgl.tilelayer.shader.attribute.a_texCoord),
u_tileOffset: gl.getUniformLocation(
program, ol.renderer.webgl.tilelayer.shader.uniform.u_tileOffset),
u_texture: gl.getUniformLocation(
program, ol.renderer.webgl.tilelayer.shader.uniform.u_texture)
};
} }
mapRenderer.bindBuffer(goog.webgl.ARRAY_BUFFER, this.arrayBuffer_); mapRenderer.bindBuffer(goog.webgl.ARRAY_BUFFER, this.arrayBuffer_);