Rename ol.renderer.Layer#renderFrame to prepareFrame

This commit is contained in:
Tom Payne
2013-10-31 19:13:40 +01:00
parent 26fa8d9d53
commit 2b2e7bf786
11 changed files with 15 additions and 15 deletions

View File

@@ -67,7 +67,7 @@ ol.renderer.canvas.ImageLayer.prototype.getTransform = function() {
/**
* @inheritDoc
*/
ol.renderer.canvas.ImageLayer.prototype.renderFrame =
ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
function(frameState, layerState) {
var view2DState = frameState.view2DState;

View File

@@ -120,7 +120,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
viewResolution < layerState.minResolution) {
continue;
}
layerRenderer.renderFrame(frameState, layerState);
layerRenderer.prepareFrame(frameState, layerState);
image = layerRenderer.getImage();
if (!goog.isNull(image)) {

View File

@@ -105,7 +105,7 @@ ol.renderer.canvas.TileLayer.prototype.getTransform = function() {
/**
* @inheritDoc
*/
ol.renderer.canvas.TileLayer.prototype.renderFrame =
ol.renderer.canvas.TileLayer.prototype.prepareFrame =
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
// range. This canvas tile range invalidation thing is related to
// 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
// renderedCanvasTileRange_ and reset the renderedTiles_ array.
// 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
// which position in the canvas.
//

View File

@@ -340,7 +340,7 @@ ol.renderer.canvas.VectorLayer.prototype.handleLayerChange_ = function(event) {
/**
* @inheritDoc
*/
ol.renderer.canvas.VectorLayer.prototype.renderFrame =
ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
function(frameState, layerState) {
// TODO: consider bailing out here if rendered center and resolution
@@ -378,8 +378,8 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
}
if (goog.isNull(tileGrid)) {
// We should only get here when the first call to renderFrame happens during
// an animation. Try again in the next renderFrame call.
// We should only get here when the first call to prepareFrame happens
// during an animation. Try again in the next prepareFrame call.
return;
}

View File

@@ -55,7 +55,7 @@ ol.renderer.dom.ImageLayer.prototype.getImageLayer = function() {
/**
* @inheritDoc
*/
ol.renderer.dom.ImageLayer.prototype.renderFrame =
ol.renderer.dom.ImageLayer.prototype.prepareFrame =
function(frameState, layerState) {
var view2DState = frameState.view2DState;

View File

@@ -86,7 +86,7 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
layerRenderer = this.getLayerRenderer(layer);
layerState = frameState.layerStates[goog.getUid(layer)];
if (layerState.sourceState == ol.source.State.READY) {
layerRenderer.renderFrame(frameState, layerState);
layerRenderer.prepareFrame(frameState, layerState);
}
}

View File

@@ -77,7 +77,7 @@ ol.renderer.dom.TileLayer.prototype.getTileLayer = function() {
/**
* @inheritDoc
*/
ol.renderer.dom.TileLayer.prototype.renderFrame =
ol.renderer.dom.TileLayer.prototype.prepareFrame =
function(frameState, layerState) {
if (!layerState.visible) {

View File

@@ -106,7 +106,7 @@ ol.renderer.Layer.prototype.handleImageChange = function(event) {
* @param {ol.FrameState} frameState Frame state.
* @param {ol.layer.LayerState} layerState Layer state.
*/
ol.renderer.Layer.prototype.renderFrame = goog.abstractMethod;
ol.renderer.Layer.prototype.prepareFrame = goog.abstractMethod;
/**

View File

@@ -83,7 +83,7 @@ ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() {
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.renderFrame =
ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
function(frameState, layerState) {
var gl = this.getWebGLMapRenderer().getGL();

View File

@@ -406,7 +406,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
layerState.sourceState == ol.source.State.READY &&
viewResolution < layerState.maxResolution &&
viewResolution >= layerState.minResolution) {
layerRenderer.renderFrame(frameState, layerState);
layerRenderer.prepareFrame(frameState, layerState);
}
}

View File

@@ -114,7 +114,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.renderFrame =
ol.renderer.webgl.TileLayer.prototype.prepareFrame =
function(frameState, layerState) {
var mapRenderer = this.getWebGLMapRenderer();