Remove unused variables in renderers

This commit is contained in:
Tom Payne
2013-05-21 12:48:44 +02:00
parent 268c18988b
commit f64e35e8bb
6 changed files with 1 additions and 16 deletions

View File

@@ -270,7 +270,6 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource, var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource,
tilesToDrawByZ, getTileIfLoaded); tilesToDrawByZ, getTileIfLoaded);
var allTilesLoaded = true;
var tmpExtent = ol.extent.createEmpty(); var tmpExtent = ol.extent.createEmpty();
var tmpTileRange = new ol.TileRange(0, 0, 0, 0); var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
var childTileRange, fullyLoaded, tile, tileState, x, y; var childTileRange, fullyLoaded, tile, tileState, x, y;
@@ -286,7 +285,6 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
continue; continue;
} }
allTilesLoaded = false;
fullyLoaded = tileGrid.forEachTileCoordParentTileRange( fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent); tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent);
if (!fullyLoaded) { if (!fullyLoaded) {

View File

@@ -115,7 +115,6 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource, var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource,
tilesToDrawByZ, getTileIfLoaded); tilesToDrawByZ, getTileIfLoaded);
var allTilesLoaded = true;
var tmpExtent = ol.extent.createEmpty(); var tmpExtent = ol.extent.createEmpty();
var tmpTileRange = new ol.TileRange(0, 0, 0, 0); var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
var childTileRange, fullyLoaded, tile, tileState, x, y; var childTileRange, fullyLoaded, tile, tileState, x, y;
@@ -132,7 +131,6 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
continue; continue;
} }
allTilesLoaded = false;
fullyLoaded = tileGrid.forEachTileCoordParentTileRange( fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent); tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent);
if (!fullyLoaded) { if (!fullyLoaded) {

View File

@@ -22,12 +22,6 @@ ol.renderer.Map = function(container, map) {
goog.base(this); goog.base(this);
/**
* @private
* @type {Element}
*/
this.container_ = container;
/** /**
* @private * @private
* @type {ol.Map} * @type {ol.Map}

View File

@@ -109,7 +109,6 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer =
if (!goog.isDef(this.framebufferDimension) || if (!goog.isDef(this.framebufferDimension) ||
this.framebufferDimension != framebufferDimension) { this.framebufferDimension != framebufferDimension) {
var map = this.getMap();
frameState.postRenderFunctions.push( frameState.postRenderFunctions.push(
goog.partial(function(gl, framebuffer, texture) { goog.partial(function(gl, framebuffer, texture) {
if (!gl.isContextLost()) { if (!gl.isContextLost()) {

View File

@@ -165,7 +165,6 @@ ol.renderer.webgl.Map = function(container, map) {
* @return {number} Priority. * @return {number} Priority.
*/ */
goog.bind(function(element) { goog.bind(function(element) {
var tile = /** @type {ol.Tile} */ (element[0]);
var tileCenter = /** @type {ol.Coordinate} */ (element[1]); var tileCenter = /** @type {ol.Coordinate} */ (element[1]);
var tileResolution = /** @type {number} */ (element[2]); var tileResolution = /** @type {number} */ (element[2]);
var deltaX = tileCenter[0] - this.focus_[0]; var deltaX = tileCenter[0] - this.focus_[0];
@@ -312,7 +311,6 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
*/ */
ol.renderer.webgl.Map.prototype.deleteBuffer = function(buf) { ol.renderer.webgl.Map.prototype.deleteBuffer = function(buf) {
var gl = this.getGL(); var gl = this.getGL();
var arr = buf.getArray();
var bufferKey = goog.getUid(buf); var bufferKey = goog.getUid(buf);
goog.asserts.assert(bufferKey in this.bufferCache_); goog.asserts.assert(bufferKey in this.bufferCache_);
var bufferCacheEntry = this.bufferCache_[bufferKey]; var bufferCacheEntry = this.bufferCache_[bufferKey];
@@ -359,7 +357,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
*/ */
ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) { ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {
var gl = this.getGL(); var gl = this.getGL();
var key, textureCacheEntry; var textureCacheEntry;
while (this.textureCache_.getCount() - this.textureCacheFrameMarkerCount_ > while (this.textureCache_.getCount() - this.textureCacheFrameMarkerCount_ >
ol.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) { ol.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) {
textureCacheEntry = /** @type {?ol.renderer.webgl.TextureCacheEntry} */ textureCacheEntry = /** @type {?ol.renderer.webgl.TextureCacheEntry} */
@@ -546,7 +544,6 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
this.textureCache_.set((-frameState.index).toString(), null); this.textureCache_.set((-frameState.index).toString(), null);
++this.textureCacheFrameMarkerCount_; ++this.textureCacheFrameMarkerCount_;
var layerStates = frameState.layerStates;
var layersArray = frameState.layersArray; var layersArray = frameState.layersArray;
var i, ii, layer, layerRenderer, layerState; var i, ii, layer, layerRenderer, layerState;
for (i = 0, ii = layersArray.length; i < ii; ++i) { for (i = 0, ii = layersArray.length; i < ii; ++i) {

View File

@@ -6,7 +6,6 @@ describe('ol.renderer.webgl.ImageLayer', function() {
var renderer; var renderer;
var canvasWidth; var canvasWidth;
var canvasHeight; var canvasHeight;
var viewExtent;
var viewResolution; var viewResolution;
var viewRotation; var viewRotation;
var viewCenter; var viewCenter;