No need to continue rendering when we need to defer

This commit is contained in:
ahocevar
2013-03-07 17:59:39 +01:00
parent 5752a69d6b
commit 5af71a488a

View File

@@ -116,7 +116,6 @@ ol.renderer.canvas.VectorLayer = function(mapRenderer, layer) {
*/ */
this.dirty_ = false; this.dirty_ = false;
/** /**
* @private * @private
* @type {boolean} * @type {boolean}
@@ -309,11 +308,11 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
// render features by geometry type // render features by geometry type
var filters = this.geometryFilters_, var filters = this.geometryFilters_,
numFilters = filters.length, numFilters = filters.length,
deferred = false,
i, geomFilter, tileExtent, extentFilter, type, i, geomFilter, tileExtent, extentFilter, type,
groups, group, j, numGroups, deferred; groups, group, j, numGroups;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) { for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
for (y = tileRange.minY; y <= tileRange.maxY; ++y) { for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
deferred = false;
tileCoord = new ol.TileCoord(z, x, y); tileCoord = new ol.TileCoord(z, x, y);
key = tileCoord.toString(); key = tileCoord.toString();
if (this.tileCache_.containsKey(key)) { if (this.tileCache_.containsKey(key)) {
@@ -347,7 +346,10 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
group = groups[j]; group = groups[j];
deferred = sketchCanvasRenderer.renderFeaturesByGeometryType( deferred = sketchCanvasRenderer.renderFeaturesByGeometryType(
/** @type {ol.geom.GeometryType} */ (type), /** @type {ol.geom.GeometryType} */ (type),
group[0], group[1]) || deferred; group[0], group[1]);
if (deferred) {
break;
}
} }
if (!deferred) { if (!deferred) {
goog.object.extend(tilesToRender, tilesOnSketchCanvas); goog.object.extend(tilesToRender, tilesOnSketchCanvas);