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

Rename shader variables to match CSS specification

Browse Source
This commit is contained in:
Tom Payne
2013-03-22 18:02:31 +01:00
parent b7184641b0
commit 876fea2fb7
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -33,12 +33,12 @@ ol.renderer.webgl.tilelayer.shader.Fragment = function() {
goog.base(this, [ goog.base(this, [
'precision mediump float;', 'precision mediump float;',
'', '',
'uniform sampler2D uTexture;', 'uniform sampler2D u_texture;',
'', '',
'varying vec2 vTexCoord;', 'varying vec2 v_texCoord;',
'', '',
'void main(void) {', 'void main(void) {',
' gl_FragColor = texture2D(uTexture, vTexCoord);', ' gl_FragColor = texture2D(u_texture, v_texCoord);',
'}' '}'
].join('\n')); ].join('\n'));
}; };
@@ -55,18 +55,18 @@ goog.addSingletonGetter(ol.renderer.webgl.tilelayer.shader.Fragment);
*/ */
ol.renderer.webgl.tilelayer.shader.Vertex = function() { ol.renderer.webgl.tilelayer.shader.Vertex = function() {
goog.base(this, [ goog.base(this, [
'attribute vec2 aPosition;', 'attribute vec2 a_position;',
'attribute vec2 aTexCoord;', 'attribute vec2 a_texCoord;',
'', '',
'varying vec2 vTexCoord;', 'varying vec2 v_texCoord;',
'', '',
'uniform vec4 uTileOffset;', 'uniform vec4 u_tileOffset;',
'', '',
'void main(void) {', 'void main(void) {',
' gl_Position.xy = aPosition * uTileOffset.xy + uTileOffset.zw;', ' gl_Position.xy = a_position * u_tileOffset.xy + u_tileOffset.zw;',
' gl_Position.z = 0.;', ' gl_Position.z = 0.;',
' gl_Position.w = 1.;', ' gl_Position.w = 1.;',
' vTexCoord = aTexCoord;', ' v_texCoord = a_texCoord;',
'}' '}'
].join('\n')); ].join('\n'));
}; };
@@ -102,10 +102,10 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
/** /**
* @private * @private
* @type {{aPosition: number, * @type {{a_position: number,
* aTexCoord: number, * a_texCoord: number,
* uTileOffset: WebGLUniformLocation, * u_tileOffset: WebGLUniformLocation,
* uTexture: WebGLUniformLocation}|null} * u_texture: WebGLUniformLocation}|null}
*/ */
this.locations_ = null; this.locations_ = null;
@@ -233,21 +233,21 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
gl.useProgram(program); gl.useProgram(program);
if (goog.isNull(this.locations_)) { if (goog.isNull(this.locations_)) {
this.locations_ = { this.locations_ = {
aPosition: gl.getAttribLocation(program, 'aPosition'), a_position: gl.getAttribLocation(program, 'a_position'),
aTexCoord: gl.getAttribLocation(program, 'aTexCoord'), a_texCoord: gl.getAttribLocation(program, 'a_texCoord'),
uTileOffset: gl.getUniformLocation(program, 'uTileOffset'), u_tileOffset: gl.getUniformLocation(program, 'u_tileOffset'),
uTexture: gl.getUniformLocation(program, 'uTexture') u_texture: gl.getUniformLocation(program, 'u_texture')
}; };
} }
mapRenderer.bindBuffer(goog.webgl.ARRAY_BUFFER, this.arrayBuffer_); mapRenderer.bindBuffer(goog.webgl.ARRAY_BUFFER, this.arrayBuffer_);
gl.enableVertexAttribArray(this.locations_.aPosition); gl.enableVertexAttribArray(this.locations_.a_position);
gl.vertexAttribPointer( gl.vertexAttribPointer(
this.locations_.aPosition, 2, goog.webgl.FLOAT, false, 16, 0); this.locations_.a_position, 2, goog.webgl.FLOAT, false, 16, 0);
gl.enableVertexAttribArray(this.locations_.aTexCoord); gl.enableVertexAttribArray(this.locations_.a_texCoord);
gl.vertexAttribPointer( gl.vertexAttribPointer(
this.locations_.aTexCoord, 2, goog.webgl.FLOAT, false, 16, 8); this.locations_.a_texCoord, 2, goog.webgl.FLOAT, false, 16, 8);
gl.uniform1i(this.locations_.uTexture, 0); gl.uniform1i(this.locations_.u_texture, 0);
/** /**
* @type {Object.<number, Object.<string, ol.Tile>>} * @type {Object.<number, Object.<string, ol.Tile>>}
@@ -302,7 +302,7 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
/** @type {Array.<number>} */ /** @type {Array.<number>} */
var zs = goog.array.map(goog.object.getKeys(tilesToDrawByZ), Number); var zs = goog.array.map(goog.object.getKeys(tilesToDrawByZ), Number);
goog.array.sort(zs); goog.array.sort(zs);
var uTileOffset = goog.vec.Vec4.createFloat32(); var u_tileOffset = goog.vec.Vec4.createFloat32();
goog.array.forEach(zs, function(z) { goog.array.forEach(zs, function(z) {
goog.object.forEach(tilesToDrawByZ[z], function(tile) { goog.object.forEach(tilesToDrawByZ[z], function(tile) {
var tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord); var tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord);
@@ -312,8 +312,8 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
framebufferExtentSize.width - 1; framebufferExtentSize.width - 1;
var ty = 2 * (tileExtent.minY - framebufferExtent.minY) / var ty = 2 * (tileExtent.minY - framebufferExtent.minY) /
framebufferExtentSize.height - 1; framebufferExtentSize.height - 1;
goog.vec.Vec4.setFromValues(uTileOffset, sx, sy, tx, ty); goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty);
gl.uniform4fv(this.locations_.uTileOffset, uTileOffset); gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset);
mapRenderer.bindTileTexture(tile, goog.webgl.LINEAR, goog.webgl.LINEAR); mapRenderer.bindTileTexture(tile, goog.webgl.LINEAR, goog.webgl.LINEAR);
gl.drawArrays(goog.webgl.TRIANGLE_STRIP, 0, 4); gl.drawArrays(goog.webgl.TRIANGLE_STRIP, 0, 4);
}, this); }, this);