ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed WebGLBuffer to WebGLArrayBuffer to avoid conflicts

Browse Source 
In the future this should be reworked to have a clearer API in general.
This commit is contained in:
Olivier Guyot
2018-11-16 11:33:59 +01:00
parent a84559d1fb
commit 66a74ac019
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/renderer/webgl-new/PointsLayer.js
View File

@@ -2,7 +2,7 @@
* @module ol/renderer/webgl-new/PointsLayer
*/
import LayerRenderer from '../Layer';
import WebGLBuffer from '../../webgl/Buffer';
import WebGLArrayBuffer from '../../webgl/Buffer';
import {DYNAMIC_DRAW, ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, FLOAT} from '../../webgl';
import WebGLHelper, {DefaultAttrib, DefaultUniform} from '../../webgl/Helper';
import WebGLVertex from '../../webgl/Vertex';
@@ -143,8 +143,8 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
this.sourceRevision_ = -1;
this.verticesBuffer_ = new WebGLBuffer([], DYNAMIC_DRAW);
this.indicesBuffer_ = new WebGLBuffer([], DYNAMIC_DRAW);
this.verticesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW);
this.indicesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW);
const vertexShader = new WebGLVertex(options.vertexShader || VERTEX_SHADER);
const fragmentShader = new WebGLFragment(options.fragmentShader || FRAGMENT_SHADER);

4
src/ol/webgl/Buffer.js
View File

@@ -13,7 +13,7 @@ const BufferUsage = {
};
class WebGLBuffer {
class WebGLArrayBuffer {
/**
* @param {Array<number>=} opt_arr Array.
@@ -50,4 +50,4 @@ class WebGLBuffer {
}
}
export default WebGLBuffer;
export default WebGLArrayBuffer;

7
src/ol/webgl/Helper.js
View File

@@ -17,7 +17,6 @@ import {
translate as translateTransform
} from '../transform';
import {create, fromTransform} from '../vec/mat4';
import WebGLBuffer from './Buffer';
import WebGLPostProcessingPass from './PostProcessingPass';
@@ -142,15 +141,15 @@ export const DefaultAttrib = {
*
* ### Binding WebGL buffers and flushing data into them:
*
* Data that must be passed to the GPU has to be transferred using `WebGLBuffer` objects.
* Data that must be passed to the GPU has to be transferred using `WebGLArrayBuffer` objects.
* A buffer has to be created only once, but must be bound everytime the data it holds is changed. Using `WebGLHelper.bindBuffer`
* will bind the buffer and flush the new data to the GPU.
*
* For now, the `WebGLHelper` class expects {@link module:ol/webgl/Buffer~WebGLArrayBuffer} objects.
* ```js
* // at initialization phase
* this.verticesBuffer = new WebGLBuffer([], DYNAMIC_DRAW);
* this.indicesBuffer = new WebGLBuffer([], DYNAMIC_DRAW);
* this.verticesBuffer = new WebGLArrayBuffer([], DYNAMIC_DRAW);
* this.indicesBuffer = new WebGLArrayBuffer([], DYNAMIC_DRAW);
*
* // at rendering phase
* this.context.bindBuffer(ARRAY_BUFFER, this.verticesBuffer);