Re-order functions alphabetically

This commit is contained in:
Tom Payne
2012-08-16 17:54:22 +02:00
parent 4f2b6a0c22
commit 44cd3ceccb
15 changed files with 433 additions and 433 deletions

View File

@@ -26,12 +26,6 @@ ol.webgl.LayerRenderer.prototype.dispatchChangeEvent = function() {
};
/**
* @return {WebGLTexture} Texture.
*/
ol.webgl.LayerRenderer.prototype.getTexture = goog.abstractMethod;
/**
* @override
* @return {ol.MapRenderer} MapRenderer.
@@ -47,6 +41,12 @@ ol.webgl.LayerRenderer.prototype.getMapRenderer = function() {
ol.webgl.LayerRenderer.prototype.getMatrix = goog.abstractMethod;
/**
* @return {WebGLTexture} Texture.
*/
ol.webgl.LayerRenderer.prototype.getTexture = goog.abstractMethod;
/**
* @inheritDoc
*/

View File

@@ -514,6 +514,31 @@ ol.webgl.MapRenderer.prototype.isImageTextureLoaded = function(image) {
};
/**
* @inheritDoc
*/
ol.webgl.MapRenderer.prototype.removeLayer = function(layer) {
goog.base(this, 'removeLayer', layer);
if (layer.getVisible()) {
this.render();
}
};
/**
* @inheritDoc
*/
ol.webgl.MapRenderer.prototype.removeLayerRenderer = function(layer) {
var layerRenderer = goog.base(this, 'removeLayerRenderer', layer);
if (!goog.isNull(layerRenderer)) {
var layerKey = goog.getUid(layer);
goog.events.unlistenByKey(this.layerRendererChangeListenKeys_[layerKey]);
delete this.layerRendererChangeListenKeys_[layerKey];
}
return layerRenderer;
};
/**
* @inheritDoc
*/
@@ -592,31 +617,6 @@ ol.webgl.MapRenderer.prototype.render = function() {
};
/**
* @inheritDoc
*/
ol.webgl.MapRenderer.prototype.removeLayer = function(layer) {
goog.base(this, 'removeLayer', layer);
if (layer.getVisible()) {
this.render();
}
};
/**
* @inheritDoc
*/
ol.webgl.MapRenderer.prototype.removeLayerRenderer = function(layer) {
var layerRenderer = goog.base(this, 'removeLayerRenderer', layer);
if (!goog.isNull(layerRenderer)) {
var layerKey = goog.getUid(layer);
goog.events.unlistenByKey(this.layerRendererChangeListenKeys_[layerKey]);
delete this.layerRendererChangeListenKeys_[layerKey];
}
return layerRenderer;
};
/**
* @inheritDoc
*/

View File

@@ -145,21 +145,6 @@ ol.webgl.TileLayerRenderer = function(mapRenderer, tileLayer) {
goog.inherits(ol.webgl.TileLayerRenderer, ol.webgl.LayerRenderer);
/**
* @protected
*/
ol.webgl.TileLayerRenderer.prototype.disposeInternal = function() {
var mapRenderer = this.getMapRenderer();
var gl = mapRenderer.getGL();
if (!gl.isContextLost()) {
gl.deleteBuffer(this.arrayBuffer_);
gl.deleteFramebuffer(this.framebuffer_);
gl.deleteTexture(this.texture_);
}
goog.base(this, 'disposeInternal');
};
/**
* @param {number} framebufferDimension Framebuffer dimension.
* @private
@@ -202,6 +187,21 @@ ol.webgl.TileLayerRenderer.prototype.bindFramebuffer_ =
};
/**
* @protected
*/
ol.webgl.TileLayerRenderer.prototype.disposeInternal = function() {
var mapRenderer = this.getMapRenderer();
var gl = mapRenderer.getGL();
if (!gl.isContextLost()) {
gl.deleteBuffer(this.arrayBuffer_);
gl.deleteFramebuffer(this.framebuffer_);
gl.deleteTexture(this.texture_);
}
goog.base(this, 'disposeInternal');
};
/**
* @return {ol.TileLayer} Layer.
* @override