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

WebGL renderer updates for new extent structure

Browse Source
This commit is contained in:
Tim Schaub
2013-09-03 17:53:36 -06:00
parent 1a7e99f67e
commit e84e0e1233
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,8 +161,8 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
var minX = origin[0] + tileRange.minX * tileSize[0] * tileResolution;
var minY = origin[1] + tileRange.minY * tileSize[1] * tileResolution;
framebufferExtent = [
minX, minX + framebufferExtentDimension,
minY, minY + framebufferExtentDimension
[minX, minY],
[minX + framebufferExtentDimension, minY + framebufferExtentDimension]
];
this.bindFramebuffer(frameState, framebufferDimension);
@@ -246,11 +246,13 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
for (tileKey in tilesToDraw) {
tile = tilesToDraw[tileKey];
tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent);
sx = 2 * (tileExtent[1] - tileExtent[0]) / framebufferExtentDimension;
sy = 2 * (tileExtent[3] - tileExtent[2]) / framebufferExtentDimension;
tx = 2 * (tileExtent[0] - framebufferExtent[0]) /
sx = 2 * (tileExtent[1][0] - tileExtent[0][0]) /
framebufferExtentDimension;
sy = 2 * (tileExtent[1][1] - tileExtent[0][1]) /
framebufferExtentDimension;
tx = 2 * (tileExtent[0][0] - framebufferExtent[0][0]) /
framebufferExtentDimension - 1;
ty = 2 * (tileExtent[2] - framebufferExtent[2]) /
ty = 2 * (tileExtent[0][1] - framebufferExtent[0][1]) /
framebufferExtentDimension - 1;
goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty);
gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset);
@@ -294,17 +296,17 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
var texCoordMatrix = this.texCoordMatrix;
goog.vec.Mat4.makeIdentity(texCoordMatrix);
goog.vec.Mat4.translate(texCoordMatrix,
(center[0] - framebufferExtent[0]) /
(framebufferExtent[1] - framebufferExtent[0]),
(center[1] - framebufferExtent[2]) /
(framebufferExtent[3] - framebufferExtent[2]),
(center[0] - framebufferExtent[0][0]) /
(framebufferExtent[1][0] - framebufferExtent[0][0]),
(center[1] - framebufferExtent[0][1]) /
(framebufferExtent[1][1] - framebufferExtent[0][1]),
0);
goog.vec.Mat4.rotateZ(texCoordMatrix, view2DState.rotation);
goog.vec.Mat4.scale(texCoordMatrix,
frameState.size[0] * view2DState.resolution /
(framebufferExtent[1] - framebufferExtent[0]),
(framebufferExtent[1][0] - framebufferExtent[0][0]),
frameState.size[1] * view2DState.resolution /
(framebufferExtent[3] - framebufferExtent[2]),
(framebufferExtent[1][1] - framebufferExtent[0][1]),
1);
goog.vec.Mat4.translate(texCoordMatrix,
-0.5,