Pass time to render functions and rename them to renderFrame_

This commit is contained in:
Tom Payne
2012-10-04 12:03:52 +02:00
parent 783dfe0618
commit 756792b8db
8 changed files with 16 additions and 12 deletions

View File

@@ -690,7 +690,7 @@ ol.Map.prototype.render = function() {
/**
* Request that render be called some time in the future.
* Request that renderFrame_ be called some time in the future.
*/
ol.Map.prototype.requestRenderFrame = function() {
if (this.freezeRenderingCount_ === 0) {
@@ -714,7 +714,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
if (goog.DEBUG) {
this.logger.info('renderFrame_');
}
this.renderer_.render();
this.renderer_.renderFrame(time);
this.dirty_ = false;
if (goog.DEBUG) {
this.logger.info('postrender');

View File

@@ -71,8 +71,9 @@ ol.renderer.dom.Layer.prototype.handleLayerVisibleChange = function() {
/**
* Render.
* @param {number} time Time.
*/
ol.renderer.dom.Layer.prototype.render = goog.abstractMethod;
ol.renderer.dom.Layer.prototype.renderFrame = goog.abstractMethod;
/**

View File

@@ -184,8 +184,9 @@ ol.renderer.dom.Map.prototype.handleSizeChanged = function() {
/**
* Render the map. Sets up the layers pane on first render and adjusts its
* position as needed on subsequent calls.
* @inheritDoc
*/
ol.renderer.dom.Map.prototype.render = function() {
ol.renderer.dom.Map.prototype.renderFrame = function(time) {
var map = this.getMap();
if (!map.isDef()) {
return;
@@ -228,7 +229,7 @@ ol.renderer.dom.Map.prototype.render = function() {
var animate = false;
this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
if (layerRenderer.render()) {
if (layerRenderer.renderFrame(time)) {
animate = true;
}
});

View File

@@ -108,7 +108,7 @@ ol.renderer.dom.TileLayer.prototype.handleTileChange_ = function(event) {
/**
* @inheritDoc
*/
ol.renderer.dom.TileLayer.prototype.render = function() {
ol.renderer.dom.TileLayer.prototype.renderFrame = function(time) {
var map = this.getMap();
if (!map.isDef()) {

View File

@@ -310,8 +310,9 @@ ol.renderer.Map.prototype.removeLayerRenderer = function(layer) {
/**
* Render.
* @param {number} time Time.
*/
ol.renderer.Map.prototype.render = goog.functions.FALSE;
ol.renderer.Map.prototype.renderFrame = goog.functions.FALSE;
/**

View File

@@ -112,6 +112,7 @@ ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = goog.nullFunction;
/**
* Render.
* @param {number} time Time.
* @return {boolean} Request render frame.
*/
ol.renderer.webgl.Layer.prototype.render = goog.abstractMethod;
ol.renderer.webgl.Layer.prototype.renderFrame = goog.abstractMethod;

View File

@@ -601,7 +601,7 @@ ol.renderer.webgl.Map.prototype.removeLayerRenderer = function(layer) {
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.render = function() {
ol.renderer.webgl.Map.prototype.renderFrame = function(time) {
if (!this.getMap().isDef()) {
return;
@@ -610,7 +610,7 @@ ol.renderer.webgl.Map.prototype.render = function() {
var requestRenderFrame = false;
this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
if (layerRenderer.render()) {
if (layerRenderer.renderFrame(time)) {
requestRenderFrame = true;
}
});
@@ -624,7 +624,7 @@ ol.renderer.webgl.Map.prototype.render = function() {
var animate = false;
this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
if (layerRenderer.render()) {
if (layerRenderer.renderFrame(time)) {
animate = true;
}
});

View File

@@ -285,7 +285,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.render = function() {
ol.renderer.webgl.TileLayer.prototype.renderFrame = function(time) {
var requestRenderFrame = false;