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

Avoid creating an ol.Size object

Browse Source
This commit is contained in:
Tom Payne
2013-04-19 20:48:45 +02:00
parent d964bbc605
commit 7979726327
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/webgltilelayerrenderer.js
+7 -10
View File
@@ -8,7 +8,6 @@ goog.require('goog.object');
goog.require('goog.vec.Mat4'); goog.require('goog.vec.Mat4');
goog.require('goog.vec.Vec4'); goog.require('goog.vec.Vec4');
goog.require('goog.webgl'); goog.require('goog.webgl');
goog.require('ol.Size');
goog.require('ol.Tile'); goog.require('ol.Tile');
goog.require('ol.TileRange'); goog.require('ol.TileRange');
goog.require('ol.TileState'); goog.require('ol.TileState');
@@ -150,15 +149,13 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
tileRangeSize.width * tileSize.width, tileRangeSize.width * tileSize.width,
tileRangeSize.height * tileSize.height); tileRangeSize.height * tileSize.height);
var framebufferDimension = ol.math.roundUpToPowerOfTwo(maxDimension); var framebufferDimension = ol.math.roundUpToPowerOfTwo(maxDimension);
var framebufferExtentSize = new ol.Size( var framebufferExtentDimension = tileResolution * framebufferDimension;
tileResolution * framebufferDimension,
tileResolution * framebufferDimension);
var origin = tileGrid.getOrigin(z); var origin = tileGrid.getOrigin(z);
var minX = origin[0] + tileRange.minX * tileSize.width * tileResolution; var minX = origin[0] + tileRange.minX * tileSize.width * tileResolution;
var minY = origin[1] + tileRange.minY * tileSize.height * tileResolution; var minY = origin[1] + tileRange.minY * tileSize.height * tileResolution;
framebufferExtent = [ framebufferExtent = [
minX, minX + framebufferExtentSize.width, minX, minX + framebufferExtentDimension,
minY, minY + framebufferExtentSize.height minY, minY + framebufferExtentDimension
]; ];
this.bindFramebuffer(frameState, framebufferDimension); this.bindFramebuffer(frameState, framebufferDimension);
@@ -242,12 +239,12 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
for (tileKey in tilesToDraw) { for (tileKey in tilesToDraw) {
tile = tilesToDraw[tileKey]; tile = tilesToDraw[tileKey];
tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent); tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent);
sx = 2 * (tileExtent[1] - tileExtent[0]) / framebufferExtentSize.width; sx = 2 * (tileExtent[1] - tileExtent[0]) / framebufferExtentDimension;
sy = 2 * (tileExtent[3] - tileExtent[2]) / framebufferExtentSize.height; sy = 2 * (tileExtent[3] - tileExtent[2]) / framebufferExtentDimension;
tx = 2 * (tileExtent[0] - framebufferExtent[0]) / tx = 2 * (tileExtent[0] - framebufferExtent[0]) /
framebufferExtentSize.width - 1; framebufferExtentDimension - 1;
ty = 2 * (tileExtent[2] - framebufferExtent[2]) / ty = 2 * (tileExtent[2] - framebufferExtent[2]) /
framebufferExtentSize.height - 1; framebufferExtentDimension - 1;
goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty); goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty);
gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset); 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);