Unconditionally draw Replay's

This commit is contained in:
Éric Lemoine
2014-12-18 12:27:06 +01:00
parent cd0bed6291
commit ddc51ee267
14 changed files with 29 additions and 88 deletions
@@ -49,12 +49,11 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel =
function(coordinate, frameState, callback, thisArg) {
var layer = this.getLayer();
var source = layer.getSource();
var extent = frameState.extent;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var skippedFeatureUids = frameState.skippedFeatureUids;
return source.forEachFeatureAtPixel(
extent, resolution, rotation, coordinate, skippedFeatureUids,
resolution, rotation, coordinate, skippedFeatureUids,
/**
* @param {ol.Feature} feature Feature.
* @return {?} Callback result.
+1 -1
View File
@@ -123,7 +123,7 @@ ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ =
replayGroup.finish();
if (!replayGroup.isEmpty()) {
replayGroup.replay(context, extent, pixelRatio, this.transform_,
replayGroup.replay(context, pixelRatio, this.transform_,
rotation, {});
}
vectorContext.flush();
@@ -98,7 +98,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
var alpha = replayContext.globalAlpha;
replayContext.globalAlpha = layerState.opacity;
replayGroup.replay(
replayContext, frameState.extent, frameState.pixelRatio, transform,
replayContext, frameState.pixelRatio, transform,
frameState.viewState.rotation, frameState.skippedFeatureUids);
if (replayContext != context) {
@@ -121,13 +121,12 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
if (goog.isNull(this.replayGroup_)) {
return undefined;
} else {
var extent = frameState.extent;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var layer = this.getLayer();
/** @type {Object.<string, boolean>} */
var features = {};
return this.replayGroup_.forEachGeometryAtPixel(extent, resolution,
return this.replayGroup_.forEachGeometryAtPixel(resolution,
rotation, coordinate, frameState.skippedFeatureUids,
/**
* @param {ol.Feature} feature Feature.
+1 -2
View File
@@ -54,12 +54,11 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
function(coordinate, frameState, callback, thisArg) {
var layer = this.getLayer();
var source = layer.getSource();
var extent = frameState.extent;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var skippedFeatureUids = frameState.skippedFeatureUids;
return source.forEachFeatureAtPixel(
extent, resolution, rotation, coordinate, skippedFeatureUids,
resolution, rotation, coordinate, skippedFeatureUids,
/**
* @param {ol.Feature} feature Feature.
* @return {?} Callback result.
+1 -2
View File
@@ -160,8 +160,7 @@ ol.renderer.dom.Map.prototype.dispatchComposeEvent_ =
map.dispatchEvent(composeEvent);
replayGroup.finish();
if (!replayGroup.isEmpty()) {
replayGroup.replay(context, extent, pixelRatio, this.transform_,
rotation, {});
replayGroup.replay(context, pixelRatio, this.transform_, rotation, {});
}
vectorContext.flush();
this.replayGroup = replayGroup;
@@ -121,9 +121,8 @@ ol.renderer.dom.VectorLayer.prototype.composeFrame =
if (!goog.isNull(replayGroup) && !replayGroup.isEmpty()) {
context.globalAlpha = layerState.opacity;
replayGroup.replay(
context, frameState.extent, pixelRatio, transform,
viewRotation, frameState.skippedFeatureUids);
replayGroup.replay(context, pixelRatio, transform, viewRotation,
frameState.skippedFeatureUids);
this.dispatchEvent_(ol.render.EventType.RENDER, frameState, transform);
}
@@ -162,13 +161,12 @@ ol.renderer.dom.VectorLayer.prototype.forEachFeatureAtPixel =
if (goog.isNull(this.replayGroup_)) {
return undefined;
} else {
var extent = frameState.extent;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var layer = this.getLayer();
/** @type {Object.<string, boolean>} */
var features = {};
return this.replayGroup_.forEachGeometryAtPixel(extent, resolution,
return this.replayGroup_.forEachGeometryAtPixel(resolution,
rotation, coordinate, frameState.skippedFeatureUids,
/**
* @param {ol.Feature} feature Feature.
@@ -80,12 +80,11 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel =
function(coordinate, frameState, callback, thisArg) {
var layer = this.getLayer();
var source = layer.getSource();
var extent = frameState.extent;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var skippedFeatureUids = frameState.skippedFeatureUids;
return source.forEachFeatureAtPixel(
extent, resolution, rotation, coordinate, skippedFeatureUids,
resolution, rotation, coordinate, skippedFeatureUids,
/**
* @param {ol.Feature} feature Feature.
+1 -1
View File
@@ -299,7 +299,7 @@ ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ =
var contrast = 1;
var hue = 0;
var saturation = 1;
replayGroup.replay(context, center, resolution, rotation, size, extent,
replayGroup.replay(context, center, resolution, rotation, size,
pixelRatio, opacity, brightness, contrast, hue, saturation, {});
}
replayGroup.getDeleteResourcesFunction(context)();
@@ -72,9 +72,9 @@ ol.renderer.webgl.VectorLayer.prototype.composeFrame =
if (!goog.isNull(replayGroup) && !replayGroup.isEmpty()) {
replayGroup.replay(context,
viewState.center, viewState.resolution, viewState.rotation,
frameState.size, frameState.extent, frameState.pixelRatio,
layerState.opacity, layerState.brightness, layerState.contrast,
layerState.hue, layerState.saturation, frameState.skippedFeatureUids);
frameState.size, frameState.pixelRatio, layerState.opacity,
layerState.brightness, layerState.contrast, layerState.hue,
layerState.saturation, frameState.skippedFeatureUids);
}
};