From bc1a019c740bd367bf7195cfc00a4e7c0ffe6757 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 11 Jan 2018 14:28:01 +0100 Subject: [PATCH] Rename _ol_renderer_webgl_Layer_ to WebGLLayerRenderer --- src/ol/renderer/webgl/ImageLayer.js | 6 +++--- src/ol/renderer/webgl/Layer.js | 24 ++++++++++++------------ src/ol/renderer/webgl/TileLayer.js | 10 +++++----- src/ol/renderer/webgl/VectorLayer.js | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index 701d92fd9d..46ee8e5b28 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -9,7 +9,7 @@ import {createCanvasContext2D} from '../../dom.js'; import {getIntersection, isEmpty} from '../../extent.js'; import {TRUE} from '../../functions.js'; import RendererType from '../Type.js'; -import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js'; +import WebGLLayerRenderer from '../webgl/Layer.js'; import _ol_transform_ from '../../transform.js'; import _ol_webgl_ from '../../webgl.js'; import _ol_webgl_Context_ from '../../webgl/Context.js'; @@ -23,7 +23,7 @@ import _ol_webgl_Context_ from '../../webgl/Context.js'; */ var WebGLImageLayerRenderer = function(mapRenderer, imageLayer) { - _ol_renderer_webgl_Layer_.call(this, mapRenderer, imageLayer); + WebGLLayerRenderer.call(this, mapRenderer, imageLayer); /** * The last rendered image. @@ -46,7 +46,7 @@ var WebGLImageLayerRenderer = function(mapRenderer, imageLayer) { }; -inherits(WebGLImageLayerRenderer, _ol_renderer_webgl_Layer_); +inherits(WebGLImageLayerRenderer, WebGLLayerRenderer); /** diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index baf2100a99..639af5b1ad 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -21,7 +21,7 @@ import _ol_webgl_Context_ from '../../webgl/Context.js'; * @param {ol.renderer.webgl.Map} mapRenderer Map renderer. * @param {ol.layer.Layer} layer Layer. */ -var _ol_renderer_webgl_Layer_ = function(mapRenderer, layer) { +var WebGLLayerRenderer = function(mapRenderer, layer) { LayerRenderer.call(this, layer); @@ -86,7 +86,7 @@ var _ol_renderer_webgl_Layer_ = function(mapRenderer, layer) { }; -inherits(_ol_renderer_webgl_Layer_, LayerRenderer); +inherits(WebGLLayerRenderer, LayerRenderer); /** @@ -94,7 +94,7 @@ inherits(_ol_renderer_webgl_Layer_, LayerRenderer); * @param {number} framebufferDimension Framebuffer dimension. * @protected */ -_ol_renderer_webgl_Layer_.prototype.bindFramebuffer = function(frameState, framebufferDimension) { +WebGLLayerRenderer.prototype.bindFramebuffer = function(frameState, framebufferDimension) { var gl = this.mapRenderer.getGL(); @@ -140,7 +140,7 @@ _ol_renderer_webgl_Layer_.prototype.bindFramebuffer = function(frameState, frame * @param {ol.LayerState} layerState Layer state. * @param {ol.webgl.Context} context Context. */ -_ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerState, context) { +WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, context) { this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, context, frameState); @@ -189,7 +189,7 @@ _ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerSta * @param {olx.FrameState} frameState Frame state. * @private */ -_ol_renderer_webgl_Layer_.prototype.dispatchComposeEvent_ = function(type, context, frameState) { +WebGLLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, frameState) { var layer = this.getLayer(); if (layer.hasListener(type)) { var viewState = frameState.viewState; @@ -212,7 +212,7 @@ _ol_renderer_webgl_Layer_.prototype.dispatchComposeEvent_ = function(type, conte /** * @return {!ol.Transform} Matrix. */ -_ol_renderer_webgl_Layer_.prototype.getTexCoordMatrix = function() { +WebGLLayerRenderer.prototype.getTexCoordMatrix = function() { return this.texCoordMatrix; }; @@ -220,7 +220,7 @@ _ol_renderer_webgl_Layer_.prototype.getTexCoordMatrix = function() { /** * @return {WebGLTexture} Texture. */ -_ol_renderer_webgl_Layer_.prototype.getTexture = function() { +WebGLLayerRenderer.prototype.getTexture = function() { return this.texture; }; @@ -228,7 +228,7 @@ _ol_renderer_webgl_Layer_.prototype.getTexture = function() { /** * @return {!ol.Transform} Matrix. */ -_ol_renderer_webgl_Layer_.prototype.getProjectionMatrix = function() { +WebGLLayerRenderer.prototype.getProjectionMatrix = function() { return this.projectionMatrix; }; @@ -236,7 +236,7 @@ _ol_renderer_webgl_Layer_.prototype.getProjectionMatrix = function() { /** * Handle webglcontextlost. */ -_ol_renderer_webgl_Layer_.prototype.handleWebGLContextLost = function() { +WebGLLayerRenderer.prototype.handleWebGLContextLost = function() { this.texture = null; this.framebuffer = null; this.framebufferDimension = undefined; @@ -250,7 +250,7 @@ _ol_renderer_webgl_Layer_.prototype.handleWebGLContextLost = function() { * @param {ol.webgl.Context} context Context. * @return {boolean} whether composeFrame should be called. */ -_ol_renderer_webgl_Layer_.prototype.prepareFrame = function(frameState, layerState, context) {}; +WebGLLayerRenderer.prototype.prepareFrame = function(frameState, layerState, context) {}; /** @@ -263,5 +263,5 @@ _ol_renderer_webgl_Layer_.prototype.prepareFrame = function(frameState, layerSta * @return {T|undefined} Callback result. * @template S,T,U */ -_ol_renderer_webgl_Layer_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {}; -export default _ol_renderer_webgl_Layer_; +WebGLLayerRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {}; +export default WebGLLayerRenderer; diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index cc1317ea9f..826ac6b56a 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -12,7 +12,7 @@ import {numberSafeCompareFunction} from '../../array.js'; import {createEmpty, intersects} from '../../extent.js'; import {roundUpToPowerOfTwo} from '../../math.js'; import RendererType from '../Type.js'; -import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js'; +import WebGLLayerRenderer from '../webgl/Layer.js'; import _ol_renderer_webgl_tilelayershader_ from '../webgl/tilelayershader.js'; import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayershader/Locations.js'; import _ol_size_ from '../../size.js'; @@ -29,7 +29,7 @@ import _ol_webgl_Buffer_ from '../../webgl/Buffer.js'; */ var WebGLTileLayerRenderer = function(mapRenderer, tileLayer) { - _ol_renderer_webgl_Layer_.call(this, mapRenderer, tileLayer); + WebGLLayerRenderer.call(this, mapRenderer, tileLayer); /** * @private @@ -86,7 +86,7 @@ var WebGLTileLayerRenderer = function(mapRenderer, tileLayer) { }; -inherits(WebGLTileLayerRenderer, _ol_renderer_webgl_Layer_); +inherits(WebGLTileLayerRenderer, WebGLLayerRenderer); /** @@ -120,7 +120,7 @@ WebGLTileLayerRenderer['create'] = function(mapRenderer, layer) { WebGLTileLayerRenderer.prototype.disposeInternal = function() { var context = this.mapRenderer.getContext(); context.deleteBuffer(this.renderArrayBuffer_); - _ol_renderer_webgl_Layer_.prototype.disposeInternal.call(this); + WebGLLayerRenderer.prototype.disposeInternal.call(this); }; @@ -156,7 +156,7 @@ WebGLTileLayerRenderer.prototype.createLoadedTileFinder = function(source, proje * @inheritDoc */ WebGLTileLayerRenderer.prototype.handleWebGLContextLost = function() { - _ol_renderer_webgl_Layer_.prototype.handleWebGLContextLost.call(this); + WebGLLayerRenderer.prototype.handleWebGLContextLost.call(this); this.locations_ = null; }; diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index a13c2eac19..44a8a6052d 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -8,7 +8,7 @@ import {buffer, containsExtent, createEmpty} from '../../extent.js'; import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js'; import RendererType from '../Type.js'; import _ol_renderer_vector_ from '../vector.js'; -import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js'; +import WebGLLayerRenderer from '../webgl/Layer.js'; import _ol_transform_ from '../../transform.js'; /** @@ -20,7 +20,7 @@ import _ol_transform_ from '../../transform.js'; */ var WebGLVectorLayerRenderer = function(mapRenderer, vectorLayer) { - _ol_renderer_webgl_Layer_.call(this, mapRenderer, vectorLayer); + WebGLLayerRenderer.call(this, mapRenderer, vectorLayer); /** * @private @@ -67,7 +67,7 @@ var WebGLVectorLayerRenderer = function(mapRenderer, vectorLayer) { }; -inherits(WebGLVectorLayerRenderer, _ol_renderer_webgl_Layer_); +inherits(WebGLVectorLayerRenderer, WebGLLayerRenderer); /** @@ -128,7 +128,7 @@ WebGLVectorLayerRenderer.prototype.disposeInternal = function() { replayGroup.getDeleteResourcesFunction(context)(); this.replayGroup_ = null; } - _ol_renderer_webgl_Layer_.prototype.disposeInternal.call(this); + WebGLLayerRenderer.prototype.disposeInternal.call(this); };