From ecd5158012e95e1ed156e653f49fb57db7a4a508 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 21 Mar 2013 00:02:15 +0100 Subject: [PATCH] Add ol.renderer.webgl.Layer.getWebGLMapRenderer This improves the type checking. --- src/ol/renderer/webgl/webglimagelayerrenderer.js | 6 +++--- src/ol/renderer/webgl/webgllayerrenderer.js | 12 +++++------- src/ol/renderer/webgl/webgltilelayerrenderer.js | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 8ee70879ad..e09dd3a070 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -56,7 +56,7 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) { // http://learningwebgl.com/blog/?p=2101 var imageElement = image.getImageElement(this); - var gl = this.getMapRenderer().getGL(); + var gl = this.getWebGLMapRenderer().getGL(); var texture = gl.createTexture(); @@ -109,7 +109,7 @@ ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() { ol.renderer.webgl.ImageLayer.prototype.renderFrame = function(frameState, layerState) { - var gl = this.getMapRenderer().getGL(); + var gl = this.getWebGLMapRenderer().getGL(); var view2DState = frameState.view2DState; var viewCenter = view2DState.center; @@ -150,7 +150,7 @@ ol.renderer.webgl.ImageLayer.prototype.renderFrame = if (!goog.isNull(image)) { goog.asserts.assert(!goog.isNull(texture)); - var canvas = this.getMapRenderer().getCanvas(); + var canvas = this.getWebGLMapRenderer().getCanvas(); this.updateProjectionMatrix_(canvas.width, canvas.height, viewCenter, viewResolution, viewRotation, image.getExtent()); diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js index a6df24c308..e639e6199b 100644 --- a/src/ol/renderer/webgl/webgllayerrenderer.js +++ b/src/ol/renderer/webgl/webgllayerrenderer.js @@ -91,7 +91,7 @@ goog.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer); ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebufferDimension) { - var mapRenderer = this.getMapRenderer(); + var mapRenderer = this.getWebGLMapRenderer(); var gl = mapRenderer.getGL(); if (!goog.isDef(this.framebufferDimension) || @@ -136,7 +136,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = * @inheritDoc */ ol.renderer.webgl.Layer.prototype.disposeInternal = function() { - var mapRenderer = this.getMapRenderer(); + var mapRenderer = this.getWebGLMapRenderer(); var gl = mapRenderer.getGL(); if (!gl.isContextLost()) { gl.deleteBuffer(this.arrayBuffer_); @@ -157,12 +157,10 @@ ol.renderer.webgl.Layer.prototype.getColorMatrix = function() { /** - * @inheritDoc - * @return {ol.renderer.Map} MapRenderer. + * @return {ol.renderer.webgl.Map} MapRenderer. */ -ol.renderer.webgl.Layer.prototype.getMapRenderer = function() { - return /** @type {ol.renderer.webgl.Map} */ (goog.base( - this, 'getMapRenderer')); +ol.renderer.webgl.Layer.prototype.getWebGLMapRenderer = function() { + return /** @type {ol.renderer.webgl.Map} */ (this.getMapRenderer()); }; diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index caf3e1d48e..99419f4447 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -149,7 +149,7 @@ goog.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer); * @inheritDoc */ ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() { - var mapRenderer = this.getMapRenderer(); + var mapRenderer = this.getWebGLMapRenderer(); var gl = mapRenderer.getGL(); if (!gl.isContextLost()) { gl.deleteBuffer(this.arrayBuffer_); @@ -198,7 +198,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() { ol.renderer.webgl.TileLayer.prototype.renderFrame = function(frameState, layerState) { - var mapRenderer = this.getMapRenderer(); + var mapRenderer = this.getWebGLMapRenderer(); var gl = mapRenderer.getGL(); var view2DState = frameState.view2DState;