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

Merge remote-tracking branch 'upstream/master' into vector-api

Browse Source 
Conflicts:
	src/objectliterals.jsdoc
	src/ol/attribution.js
	src/ol/geom/geometry.js
	src/ol/geom/geometrycollection.js
	src/ol/geom/linestring.js
	src/ol/layer/vectorlayer.exports
	src/ol/layer/vectorlayer.js
	src/ol/map.js
	src/ol/proj/proj.js
	src/ol/renderer/canvas/canvasvectorlayerrenderer.js
	src/ol/source/imagewmssource.js
	src/ol/source/tilewmssource.js
	src/ol/source/vectorsource.exports
	src/ol/source/vectorsource.js
	src/ol/source/wmssource.js
	src/ol/style/style.js
	src/ol/tilegrid/tilegrid.js
	src/ol/tilegrid/wmtstilegrid.js
	src/ol/tilegrid/xyztilegrid.js
This commit is contained in:
Éric Lemoine
2013-12-13 12:46:55 +01:00
parent cbc71686df 93e605b119
commit 35d5158454
167 changed files with 678 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,6 +132,10 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
}
var z = tileGrid.getZForResolution(view2DState.resolution);
var tileResolution = tileGrid.getResolution(z);
var tileSize = tileGrid.getTileSize(z);
var tileGutter = tileSource.getGutter();
var center = view2DState.center;
var extent;
if (tileResolution == view2DState.resolution) {
@@ -152,7 +156,6 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
} else {
var tileRangeSize = tileRange.getSize();
var tileSize = tileGrid.getTileSize(z);
var maxDimension = Math.max(
tileRangeSize[0] * tileSize[0],
@@ -257,7 +260,9 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
framebufferExtentDimension - 1;
goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty);
gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset);
mapRenderer.bindTileTexture(tile, goog.webgl.LINEAR, goog.webgl.LINEAR);
mapRenderer.bindTileTexture(tile,
tileSize[0], tileSize[1], tileGutter,
goog.webgl.LINEAR, goog.webgl.LINEAR);
gl.drawArrays(goog.webgl.TRIANGLE_STRIP, 0, 4);
}
}
@@ -290,7 +295,8 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
tileTextureQueue.enqueue([
tile,
tileGrid.getTileCoordCenter(tile.tileCoord),
tileGrid.getResolution(tile.tileCoord.z)
tileGrid.getResolution(tile.tileCoord.z),
tileSize[0], tileSize[1], tileGutter
]);
}
}, this);