Rename ol.renderer.Layer#renderFrame to prepareFrame
This commit is contained in:
@@ -67,7 +67,7 @@ ol.renderer.canvas.ImageLayer.prototype.getTransform = function() {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
ol.renderer.canvas.ImageLayer.prototype.renderFrame =
|
ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
|
||||||
function(frameState, layerState) {
|
function(frameState, layerState) {
|
||||||
|
|
||||||
var view2DState = frameState.view2DState;
|
var view2DState = frameState.view2DState;
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
|
|||||||
viewResolution < layerState.minResolution) {
|
viewResolution < layerState.minResolution) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
layerRenderer.renderFrame(frameState, layerState);
|
layerRenderer.prepareFrame(frameState, layerState);
|
||||||
|
|
||||||
image = layerRenderer.getImage();
|
image = layerRenderer.getImage();
|
||||||
if (!goog.isNull(image)) {
|
if (!goog.isNull(image)) {
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ ol.renderer.canvas.TileLayer.prototype.getTransform = function() {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
ol.renderer.canvas.TileLayer.prototype.renderFrame =
|
ol.renderer.canvas.TileLayer.prototype.prepareFrame =
|
||||||
function(frameState, layerState) {
|
function(frameState, layerState) {
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -137,12 +137,12 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
|
|||||||
// or (3) the canvas tile range doesn't contain the required tile
|
// or (3) the canvas tile range doesn't contain the required tile
|
||||||
// range. This canvas tile range invalidation thing is related to
|
// range. This canvas tile range invalidation thing is related to
|
||||||
// an optimization where we attempt to redraw as few pixels as
|
// an optimization where we attempt to redraw as few pixels as
|
||||||
// possible on each renderFrame call.
|
// possible on each prepareFrame call.
|
||||||
//
|
//
|
||||||
// - If the canvas tile range has been invalidated we reset
|
// - If the canvas tile range has been invalidated we reset
|
||||||
// renderedCanvasTileRange_ and reset the renderedTiles_ array.
|
// renderedCanvasTileRange_ and reset the renderedTiles_ array.
|
||||||
// The renderedTiles_ array is the structure used to determine
|
// The renderedTiles_ array is the structure used to determine
|
||||||
// the canvas pixels that need not be redrawn from one renderFrame
|
// the canvas pixels that need not be redrawn from one prepareFrame
|
||||||
// call to another. It records while tile has been rendered at
|
// call to another. It records while tile has been rendered at
|
||||||
// which position in the canvas.
|
// which position in the canvas.
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -340,7 +340,7 @@ ol.renderer.canvas.VectorLayer.prototype.handleLayerChange_ = function(event) {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
ol.renderer.canvas.VectorLayer.prototype.renderFrame =
|
ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
|
||||||
function(frameState, layerState) {
|
function(frameState, layerState) {
|
||||||
|
|
||||||
// TODO: consider bailing out here if rendered center and resolution
|
// TODO: consider bailing out here if rendered center and resolution
|
||||||
@@ -378,8 +378,8 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (goog.isNull(tileGrid)) {
|
if (goog.isNull(tileGrid)) {
|
||||||
// We should only get here when the first call to renderFrame happens during
|
// We should only get here when the first call to prepareFrame happens
|
||||||
// an animation. Try again in the next renderFrame call.
|
// during an animation. Try again in the next prepareFrame call.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ ol.renderer.dom.ImageLayer.prototype.getImageLayer = function() {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
ol.renderer.dom.ImageLayer.prototype.renderFrame =
|
ol.renderer.dom.ImageLayer.prototype.prepareFrame =
|
||||||
function(frameState, layerState) {
|
function(frameState, layerState) {
|
||||||
|
|
||||||
var view2DState = frameState.view2DState;
|
var view2DState = frameState.view2DState;
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
|
|||||||
layerRenderer = this.getLayerRenderer(layer);
|
layerRenderer = this.getLayerRenderer(layer);
|
||||||
layerState = frameState.layerStates[goog.getUid(layer)];
|
layerState = frameState.layerStates[goog.getUid(layer)];
|
||||||
if (layerState.sourceState == ol.source.State.READY) {
|
if (layerState.sourceState == ol.source.State.READY) {
|
||||||
layerRenderer.renderFrame(frameState, layerState);
|
layerRenderer.prepareFrame(frameState, layerState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ ol.renderer.dom.TileLayer.prototype.getTileLayer = function() {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
ol.renderer.dom.TileLayer.prototype.renderFrame =
|
ol.renderer.dom.TileLayer.prototype.prepareFrame =
|
||||||
function(frameState, layerState) {
|
function(frameState, layerState) {
|
||||||
|
|
||||||
if (!layerState.visible) {
|
if (!layerState.visible) {
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ ol.renderer.Layer.prototype.handleImageChange = function(event) {
|
|||||||
* @param {ol.FrameState} frameState Frame state.
|
* @param {ol.FrameState} frameState Frame state.
|
||||||
* @param {ol.layer.LayerState} layerState Layer state.
|
* @param {ol.layer.LayerState} layerState Layer state.
|
||||||
*/
|
*/
|
||||||
ol.renderer.Layer.prototype.renderFrame = goog.abstractMethod;
|
ol.renderer.Layer.prototype.prepareFrame = goog.abstractMethod;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
ol.renderer.webgl.ImageLayer.prototype.renderFrame =
|
ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
|
||||||
function(frameState, layerState) {
|
function(frameState, layerState) {
|
||||||
|
|
||||||
var gl = this.getWebGLMapRenderer().getGL();
|
var gl = this.getWebGLMapRenderer().getGL();
|
||||||
|
|||||||
@@ -406,7 +406,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
|
|||||||
layerState.sourceState == ol.source.State.READY &&
|
layerState.sourceState == ol.source.State.READY &&
|
||||||
viewResolution < layerState.maxResolution &&
|
viewResolution < layerState.maxResolution &&
|
||||||
viewResolution >= layerState.minResolution) {
|
viewResolution >= layerState.minResolution) {
|
||||||
layerRenderer.renderFrame(frameState, layerState);
|
layerRenderer.prepareFrame(frameState, layerState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
ol.renderer.webgl.TileLayer.prototype.renderFrame =
|
ol.renderer.webgl.TileLayer.prototype.prepareFrame =
|
||||||
function(frameState, layerState) {
|
function(frameState, layerState) {
|
||||||
|
|
||||||
var mapRenderer = this.getWebGLMapRenderer();
|
var mapRenderer = this.getWebGLMapRenderer();
|
||||||
|
|||||||
Reference in New Issue
Block a user