Give each instance its own logger, instead of using a per-class logger

This commit is contained in:
Tom Payne
2012-08-21 18:32:18 +02:00
parent eae8860072
commit f92d975921
2 changed files with 24 additions and 26 deletions
+12 -12
View File
@@ -26,14 +26,6 @@ goog.require('ol.webgl.shader.Fragment');
goog.require('ol.webgl.shader.Vertex'); goog.require('ol.webgl.shader.Vertex');
if (goog.DEBUG) {
/**
* @type {goog.debug.Logger}
*/
ol.webgl.map.logger = goog.debug.Logger.getLogger('ol.webgl.map');
}
/** /**
* @typedef {{magFilter: number, minFilter: number, texture: WebGLTexture}} * @typedef {{magFilter: number, minFilter: number, texture: WebGLTexture}}
*/ */
@@ -142,6 +134,14 @@ ol.webgl.MapRenderer = function(container, map) {
goog.base(this, container, map); goog.base(this, container, map);
if (goog.DEBUG) {
/**
* @inheritDoc
*/
this.logger = goog.debug.Logger.getLogger(
'ol.webgl.maprenderer.' + goog.getUid(this));
}
/** /**
* @private * @private
* @type {Element} * @type {Element}
@@ -360,7 +360,7 @@ ol.webgl.MapRenderer.prototype.getProgram = function(
if (goog.DEBUG) { if (goog.DEBUG) {
if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) && if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) &&
!gl.isContextLost()) { !gl.isContextLost()) {
ol.webgl.map.logger.severe(gl.getProgramInfoLog(program)); this.logger.severe(gl.getProgramInfoLog(program));
goog.asserts.assert( goog.asserts.assert(
gl.getProgramParameter(program, goog.webgl.LINK_STATUS)); gl.getProgramParameter(program, goog.webgl.LINK_STATUS));
} }
@@ -387,7 +387,7 @@ ol.webgl.MapRenderer.prototype.getShader = function(shaderObject) {
if (goog.DEBUG) { if (goog.DEBUG) {
if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) && if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) &&
!gl.isContextLost()) { !gl.isContextLost()) {
ol.webgl.map.logger.severe(gl.getShaderInfoLog(shader)); this.logger.severe(gl.getShaderInfoLog(shader));
goog.asserts.assert( goog.asserts.assert(
gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS)); gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS));
} }
@@ -473,7 +473,7 @@ ol.webgl.MapRenderer.prototype.handleSizeChanged = function() {
*/ */
ol.webgl.MapRenderer.prototype.handleWebGLContextLost = function(event) { ol.webgl.MapRenderer.prototype.handleWebGLContextLost = function(event) {
if (goog.DEBUG) { if (goog.DEBUG) {
ol.webgl.map.logger.info('WebGLContextLost'); this.logger.info('WebGLContextLost');
} }
event.preventDefault(); event.preventDefault();
this.locations_ = null; this.locations_ = null;
@@ -492,7 +492,7 @@ ol.webgl.MapRenderer.prototype.handleWebGLContextLost = function(event) {
*/ */
ol.webgl.MapRenderer.prototype.handleWebGLContextRestored = function() { ol.webgl.MapRenderer.prototype.handleWebGLContextRestored = function() {
if (goog.DEBUG) { if (goog.DEBUG) {
ol.webgl.map.logger.info('WebGLContextRestored'); this.logger.info('WebGLContextRestored');
} }
this.initializeGL_(); this.initializeGL_();
this.getMap().render(); this.getMap().render();
+12 -14
View File
@@ -24,15 +24,6 @@ goog.require('ol.webgl.shader.Fragment');
goog.require('ol.webgl.shader.Vertex'); goog.require('ol.webgl.shader.Vertex');
if (goog.DEBUG) {
/**
* @type {goog.debug.Logger}
*/
ol.webgl.tilelayerrenderer.logger =
goog.debug.Logger.getLogger('ol.webgl.tilelayerrenderer');
}
/** /**
* @constructor * @constructor
@@ -94,6 +85,14 @@ ol.webgl.TileLayerRenderer = function(mapRenderer, tileLayer) {
goog.base(this, mapRenderer, tileLayer); goog.base(this, mapRenderer, tileLayer);
if (goog.DEBUG) {
/**
* @inheritDoc
*/
this.logger = goog.debug.Logger.getLogger(
'ol.webgl.tilelayerrenderer.' + goog.getUid(this));
}
/** /**
* @private * @private
* @type {ol.webgl.shader.Fragment} * @type {ol.webgl.shader.Fragment}
@@ -170,12 +169,12 @@ ol.webgl.TileLayerRenderer.prototype.bindFramebuffer_ =
this.framebufferDimension_ != framebufferDimension) { this.framebufferDimension_ != framebufferDimension) {
if (goog.DEBUG) { if (goog.DEBUG) {
ol.webgl.tilelayerrenderer.logger.info('re-sizing framebuffer'); this.logger.info('re-sizing framebuffer');
} }
if (ol.webgl.FREE_RESOURCES_IMMEDIATELY) { if (ol.webgl.FREE_RESOURCES_IMMEDIATELY) {
if (goog.DEBUG) { if (goog.DEBUG) {
ol.webgl.tilelayerrenderer.logger.info('freeing WebGL resources'); this.logger.info('freeing WebGL resources');
} }
if (!gl.isContextLost()) { if (!gl.isContextLost()) {
gl.deleteFramebuffer(this.framebuffer_); gl.deleteFramebuffer(this.framebuffer_);
@@ -188,8 +187,7 @@ ol.webgl.TileLayerRenderer.prototype.bindFramebuffer_ =
ol.MapEventType.POST_RENDER, ol.MapEventType.POST_RENDER,
goog.partial(function(gl, framebuffer, texture) { goog.partial(function(gl, framebuffer, texture) {
if (goog.DEBUG) { if (goog.DEBUG) {
ol.webgl.tilelayerrenderer.logger.info( this.logger.info('freeing WebGL resources on postrender');
'freeing WebGL resources on postrender');
} }
if (!gl.isContextLost()) { if (!gl.isContextLost()) {
gl.deleteFramebuffer(framebuffer); gl.deleteFramebuffer(framebuffer);
@@ -480,7 +478,7 @@ ol.webgl.TileLayerRenderer.prototype.render = function() {
ol.MapEventType.POST_RENDER, ol.MapEventType.POST_RENDER,
goog.partial(function(mapRenderer, imagesToLoad) { goog.partial(function(mapRenderer, imagesToLoad) {
if (goog.DEBUG) { if (goog.DEBUG) {
ol.webgl.tilelayerrenderer.logger.info('uploading textures'); this.logger.info('uploading textures');
} }
goog.array.forEach(imagesToLoad, function(image) { goog.array.forEach(imagesToLoad, function(image) {
mapRenderer.bindImageTexture( mapRenderer.bindImageTexture(