diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index 308be68529..c17dfbb56d 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -61,7 +61,7 @@ class WebGLLayerRenderer extends LayerRenderer { /** - * Pushes vertices and indices in the given buffers using the geometry coordinates and the following properties + * Pushes vertices and indices to the given buffers using the geometry coordinates and the following properties * from the feature: * - `color` * - `opacity` @@ -79,13 +79,13 @@ class WebGLLayerRenderer extends LayerRenderer { * feature and pushed in the buffer in the given order. Note: attributes can only be numerical! Any other type or * NaN will result in `0` being pushed in the buffer. */ -export function pushFeatureInBuffer(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes) { +export function pushFeatureToBuffer(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes) { if (!geojsonFeature.geometry) { return; } switch (geojsonFeature.geometry.type) { case 'Point': - pushPointGeomInBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes); + pushPointFeatureToBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes); return; default: return; @@ -102,7 +102,7 @@ const tmpArray_ = []; * @param {Array} [opt_attributes] Custom attributes * @private */ -function pushPointGeomInBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes) { +function pushPointFeatureToBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes) { const stride = 12 + (opt_attributes !== undefined ? opt_attributes.length : 0); const x = geojsonFeature.geometry.coordinates[0]; diff --git a/src/ol/renderer/webgl/PointsLayer.js b/src/ol/renderer/webgl/PointsLayer.js index 55c795e6e4..77b4e5f623 100644 --- a/src/ol/renderer/webgl/PointsLayer.js +++ b/src/ol/renderer/webgl/PointsLayer.js @@ -5,7 +5,7 @@ import WebGLArrayBuffer from '../../webgl/Buffer'; import {DYNAMIC_DRAW, ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, FLOAT} from '../../webgl'; import {DefaultAttrib, DefaultUniform} from '../../webgl/Helper'; import GeometryType from '../../geom/GeometryType'; -import WebGLLayerRenderer, {getBlankTexture, pushFeatureInBuffer} from './Layer'; +import WebGLLayerRenderer, {getBlankTexture, pushFeatureToBuffer} from './Layer'; import GeoJSON from '../../format/GeoJSON'; import {getUid} from '../../util'; import ViewHint from '../../ViewHint'; @@ -391,7 +391,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer { geojsonFeature.properties.opacity = this.opacityCallback_(feature); geojsonFeature.properties.rotateWithView = this.rotateWithViewCallback_(feature) ? 1 : 0; - pushFeatureInBuffer(this.verticesBuffer_, this.indicesBuffer_, geojsonFeature); + pushFeatureToBuffer(this.verticesBuffer_, this.indicesBuffer_, geojsonFeature); } this.helper_.flushBufferData(ARRAY_BUFFER, this.verticesBuffer_); diff --git a/test/spec/ol/renderer/webgl/layer.test.js b/test/spec/ol/renderer/webgl/layer.test.js index 427c7d56e1..83c24a6704 100644 --- a/test/spec/ol/renderer/webgl/layer.test.js +++ b/test/spec/ol/renderer/webgl/layer.test.js @@ -1,4 +1,4 @@ -import WebGLLayerRenderer, {getBlankTexture, pushFeatureInBuffer} from '../../../../../src/ol/renderer/webgl/Layer'; +import WebGLLayerRenderer, {getBlankTexture, pushFeatureToBuffer} from '../../../../../src/ol/renderer/webgl/Layer'; import WebGLArrayBuffer from '../../../../../src/ol/webgl/Buffer'; import Layer from '../../../../../src/ol/layer/Layer'; @@ -28,7 +28,7 @@ describe('ol.renderer.webgl.Layer', function() { }); - describe('pushFeatureInBuffer', function() { + describe('pushFeatureToBuffer', function() { let vertexBuffer, indexBuffer; beforeEach(function() { @@ -46,7 +46,7 @@ describe('ol.renderer.webgl.Layer', function() { }, geometry: null }; - pushFeatureInBuffer(vertexBuffer, indexBuffer, feature); + pushFeatureToBuffer(vertexBuffer, indexBuffer, feature); expect(vertexBuffer.getArray().length).to.eql(0); expect(indexBuffer.getArray().length).to.eql(0); }); @@ -65,7 +65,7 @@ describe('ol.renderer.webgl.Layer', function() { } }; const attributePerVertex = 12; - pushFeatureInBuffer(vertexBuffer, indexBuffer, feature); + pushFeatureToBuffer(vertexBuffer, indexBuffer, feature); expect(vertexBuffer.getArray().length).to.eql(attributePerVertex * 4); expect(indexBuffer.getArray().length).to.eql(6); }); @@ -84,8 +84,8 @@ describe('ol.renderer.webgl.Layer', function() { } }; const attributePerVertex = 12; - pushFeatureInBuffer(vertexBuffer, indexBuffer, feature); - pushFeatureInBuffer(vertexBuffer, indexBuffer, feature); + pushFeatureToBuffer(vertexBuffer, indexBuffer, feature); + pushFeatureToBuffer(vertexBuffer, indexBuffer, feature); expect(vertexBuffer.getArray()[0]).to.eql(-75); expect(vertexBuffer.getArray()[1]).to.eql(47); expect(vertexBuffer.getArray()[0 + attributePerVertex]).to.eql(-75); @@ -125,7 +125,7 @@ describe('ol.renderer.webgl.Layer', function() { } }; const attributePerVertex = 16; - pushFeatureInBuffer(vertexBuffer, indexBuffer, feature, ['custom', 'custom2', 'customString', 'customString2']); + pushFeatureToBuffer(vertexBuffer, indexBuffer, feature, ['custom', 'custom2', 'customString', 'customString2']); expect(vertexBuffer.getArray().length).to.eql(attributePerVertex * 4); expect(indexBuffer.getArray().length).to.eql(6); expect(vertexBuffer.getArray()[12]).to.eql(4);