Rename _ol_webgl_Buffer_ to WebGLBuffer

src/ol/render/webgl/CircleReplay.js

@@ -12,7 +12,7 @@ import _ol_render_webgl_circlereplay_defaultshader_Locations_ from '../webgl/cir
 import WebGLReplay from '../webgl/Replay.js';
 import _ol_render_webgl_ from '../webgl.js';
 import _ol_webgl_ from '../../webgl.js';
-import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
+import WebGLBuffer from '../../webgl/Buffer.js';
 
 /**
  * @constructor
@@ -157,10 +157,10 @@ WebGLCircleReplay.prototype.drawCircle = function(circleGeometry, feature) {
  **/
 WebGLCircleReplay.prototype.finish = function(context) {
   // create, bind, and populate the vertices buffer
-  this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
+  this.verticesBuffer = new WebGLBuffer(this.vertices);
 
   // create, bind, and populate the indices buffer
-  this.indicesBuffer = new _ol_webgl_Buffer_(this.indices);
+  this.indicesBuffer = new WebGLBuffer(this.indices);
 
   this.startIndices.push(this.indices.length);
 

src/ol/render/webgl/ImageReplay.js

@@ -3,7 +3,7 @@
  */
 import {getUid, inherits} from '../../index.js';
 import WebGLTextureReplay from '../webgl/TextureReplay.js';
-import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
+import WebGLBuffer from '../../webgl/Buffer.js';
 
 /**
  * @constructor
@@ -80,12 +80,12 @@ WebGLImageReplay.prototype.finish = function(context) {
   this.hitDetectionGroupIndices.push(this.indices.length);
 
   // create, bind, and populate the vertices buffer
-  this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
+  this.verticesBuffer = new WebGLBuffer(this.vertices);
 
   const indices = this.indices;
 
   // create, bind, and populate the indices buffer
-  this.indicesBuffer = new _ol_webgl_Buffer_(indices);
+  this.indicesBuffer = new WebGLBuffer(indices);
 
   // create textures
   /** @type {Object.<string, WebGLTexture>} */

src/ol/render/webgl/LineStringReplay.js

@@ -14,7 +14,7 @@ import WebGLReplay from '../webgl/Replay.js';
 import _ol_render_webgl_linestringreplay_defaultshader_ from '../webgl/linestringreplay/defaultshader.js';
 import _ol_render_webgl_linestringreplay_defaultshader_Locations_ from '../webgl/linestringreplay/defaultshader/Locations.js';
 import _ol_webgl_ from '../../webgl.js';
-import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
+import WebGLBuffer from '../../webgl/Buffer.js';
 
 /**
  * @constructor
@@ -404,10 +404,10 @@ WebGLLineStringReplay.prototype.getCurrentIndex = function() {
  **/
 WebGLLineStringReplay.prototype.finish = function(context) {
   // create, bind, and populate the vertices buffer
-  this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
+  this.verticesBuffer = new WebGLBuffer(this.vertices);
 
   // create, bind, and populate the indices buffer
-  this.indicesBuffer = new _ol_webgl_Buffer_(this.indices);
+  this.indicesBuffer = new WebGLBuffer(this.indices);
 
   this.startIndices.push(this.indices.length);
 

src/ol/render/webgl/PolygonReplay.js

@@ -18,7 +18,7 @@ import Stroke from '../../style/Stroke.js';
 import LinkedList from '../../structs/LinkedList.js';
 import RBush from '../../structs/RBush.js';
 import _ol_webgl_ from '../../webgl.js';
-import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
+import WebGLBuffer from '../../webgl/Buffer.js';
 
 /**
  * @constructor
@@ -834,10 +834,10 @@ WebGLPolygonReplay.prototype.drawPolygon = function(polygonGeometry, feature) {
  **/
 WebGLPolygonReplay.prototype.finish = function(context) {
   // create, bind, and populate the vertices buffer
-  this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
+  this.verticesBuffer = new WebGLBuffer(this.vertices);
 
   // create, bind, and populate the indices buffer
-  this.indicesBuffer = new _ol_webgl_Buffer_(this.indices);
+  this.indicesBuffer = new WebGLBuffer(this.indices);
 
   this.startIndices.push(this.indices.length);
 

src/ol/render/webgl/TextReplay.js

@@ -10,7 +10,7 @@ import _ol_render_replay_ from '../replay.js';
 import _ol_render_webgl_ from '../webgl.js';
 import WebGLTextureReplay from '../webgl/TextureReplay.js';
 import AtlasManager from '../../style/AtlasManager.js';
-import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
+import WebGLBuffer from '../../webgl/Buffer.js';
 
 /**
  * @constructor
@@ -306,10 +306,10 @@ WebGLTextReplay.prototype.finish = function(context) {
   this.hitDetectionGroupIndices = this.groupIndices;
 
   // create, bind, and populate the vertices buffer
-  this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
+  this.verticesBuffer = new WebGLBuffer(this.vertices);
 
   // create, bind, and populate the indices buffer
-  this.indicesBuffer = new _ol_webgl_Buffer_(this.indices);
+  this.indicesBuffer = new WebGLBuffer(this.indices);
 
   // create textures
   /** @type {Object.<string, WebGLTexture>} */

src/ol/renderer/webgl/Layer.js

@@ -11,7 +11,7 @@ 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 WebGLBuffer from '../../webgl/Buffer.js';
 import WebGLContext from '../../webgl/Context.js';
 
 /**
@@ -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,

src/ol/renderer/webgl/TileLayer.js

@@ -18,7 +18,7 @@ import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayersha
 import _ol_size_ 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,

src/ol/webgl/Buffer.js

@@ -3,13 +3,22 @@
  */
 import _ol_webgl_ from '../webgl.js';
 
+/**
+ * @enum {number}
+ */
+const BufferUsage = {
+  STATIC_DRAW: _ol_webgl_.STATIC_DRAW,
+  STREAM_DRAW: _ol_webgl_.STREAM_DRAW,
+  DYNAMIC_DRAW: _ol_webgl_.DYNAMIC_DRAW
+};
+
 /**
  * @constructor
  * @param {Array.<number>=} opt_arr Array.
  * @param {number=} opt_usage Usage.
  * @struct
  */
-const _ol_webgl_Buffer_ = function(opt_arr, opt_usage) {
+const WebGLBuffer = function(opt_arr, opt_usage) {
 
   /**
    * @private
@@ -21,8 +30,7 @@ const _ol_webgl_Buffer_ = function(opt_arr, opt_usage) {
    * @private
    * @type {number}
    */
-  this.usage_ = opt_usage !== undefined ?
+  this.usage_ = opt_usage !== undefined ? opt_usage : BufferUsage;
-    opt_usage : _ol_webgl_Buffer_.Usage_.STATIC_DRAW;
 
 };
 
@@ -30,7 +38,7 @@ const _ol_webgl_Buffer_ = function(opt_arr, opt_usage) {
 /**
  * @return {Array.<number>} Array.
  */
-_ol_webgl_Buffer_.prototype.getArray = function() {
+WebGLBuffer.prototype.getArray = function() {
   return this.arr_;
 };
 
@@ -38,18 +46,8 @@ _ol_webgl_Buffer_.prototype.getArray = function() {
 /**
  * @return {number} Usage.
  */
-_ol_webgl_Buffer_.prototype.getUsage = function() {
+WebGLBuffer.prototype.getUsage = function() {
   return this.usage_;
 };
 
-
+export default WebGLBuffer;
-/**
- * @enum {number}
- * @private
- */
-_ol_webgl_Buffer_.Usage_ = {
-  STATIC_DRAW: _ol_webgl_.STATIC_DRAW,
-  STREAM_DRAW: _ol_webgl_.STREAM_DRAW,
-  DYNAMIC_DRAW: _ol_webgl_.DYNAMIC_DRAW
-};
-export default _ol_webgl_Buffer_;