Merge pull request #7787 from fredj/rename

More renaming

src/ol/renderer/webgl/ImageLayer.js

@@ -12,7 +12,7 @@ import RendererType from '../Type.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';
+import WebGLContext from '../../webgl/Context.js';
 
 /**
  * @constructor
@@ -88,7 +88,7 @@ WebGLImageLayerRenderer.prototype.createTexture_ = function(image) {
   const imageElement = image.getImage();
   const gl = this.mapRenderer.getGL();
 
-  return _ol_webgl_Context_.createTexture(
+  return WebGLContext.createTexture(
     gl, imageElement, _ol_webgl_.CLAMP_TO_EDGE, _ol_webgl_.CLAMP_TO_EDGE);
 };
 

src/ol/renderer/webgl/Layer.js

@@ -11,8 +11,8 @@ import _ol_renderer_webgl_defaultmapshader_Locations_ from '../webgl/defaultmaps
 import _ol_transform_ from '../../transform.js';
 import {create, fromTransform} from '../../vec/mat4.js';
 import _ol_webgl_ from '../../webgl.js';
-import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
-import _ol_webgl_Context_ from '../../webgl/Context.js';
+import WebGLBuffer from '../../webgl/Buffer.js';
+import WebGLContext from '../../webgl/Context.js';
 
 /**
  * @constructor
@@ -35,7 +35,7 @@ const WebGLLayerRenderer = function(mapRenderer, layer) {
    * @private
    * @type {ol.webgl.Buffer}
    */
-  this.arrayBuffer_ = new _ol_webgl_Buffer_([
+  this.arrayBuffer_ = new WebGLBuffer([
     -1, -1, 0, 0,
     1, -1, 1, 0,
     -1, 1, 0, 1,
@@ -116,7 +116,7 @@ WebGLLayerRenderer.prototype.bindFramebuffer = function(frameState, framebufferD
       /** @type {ol.PostRenderFunction} */ (postRenderFunction)
     );
 
-    const texture = _ol_webgl_Context_.createEmptyTexture(
+    const texture = WebGLContext.createEmptyTexture(
       gl, framebufferDimension, framebufferDimension);
 
     const framebuffer = gl.createFramebuffer();

src/ol/renderer/webgl/Map.js

@@ -18,7 +18,7 @@ import SourceState from '../../source/State.js';
 import LRUCache from '../../structs/LRUCache.js';
 import PriorityQueue from '../../structs/PriorityQueue.js';
 import _ol_webgl_ from '../../webgl.js';
-import _ol_webgl_Context_ from '../../webgl/Context.js';
+import WebGLContext from '../../webgl/Context.js';
 import ContextEventType from '../../webgl/ContextEventType.js';
 
 
@@ -90,7 +90,7 @@ const WebGLMapRenderer = function(container, map) {
    * @private
    * @type {ol.webgl.Context}
    */
-  this.context_ = new _ol_webgl_Context_(this.canvas_, this.gl_);
+  this.context_ = new WebGLContext(this.canvas_, this.gl_);
 
   listen(this.canvas_, ContextEventType.LOST,
     this.handleWebGLContextLost, this);

src/ol/renderer/webgl/TileLayer.js

@@ -18,7 +18,7 @@ import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayersha
 import {toSize} from '../../size.js';
 import _ol_transform_ from '../../transform.js';
 import _ol_webgl_ from '../../webgl.js';
-import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
+import WebGLBuffer from '../../webgl/Buffer.js';
 
 /**
  * @constructor
@@ -53,7 +53,7 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
    * @private
    * @type {ol.webgl.Buffer}
    */
-  this.renderArrayBuffer_ = new _ol_webgl_Buffer_([
+  this.renderArrayBuffer_ = new WebGLBuffer([
     0, 0, 0, 1,
     1, 0, 1, 1,
     0, 1, 0, 0,