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

Webgl renderer / rename function to avoid confusion

Browse Source 
`getBlankTexture` was too close to `WebGLHelper#createTexture`
This commit is contained in:
Olivier Guyot
2019-05-19 17:15:49 +02:00
parent f25a16d90c
commit 1257ade199
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/renderer/webgl/Layer.js
View File

@@ -231,7 +231,7 @@ export function writePointFeatureToBuffers(instructions, elementIndex, vertexBuf
* @private * @private
* @return {ImageData} Image data. * @return {ImageData} Image data.
*/ */
export function getBlankTexture() { export function getBlankImageData() {
const canvas = document.createElement('canvas'); const canvas = document.createElement('canvas');
const image = canvas.getContext('2d').createImageData(1, 1); const image = canvas.getContext('2d').createImageData(1, 1);
image.data[0] = image.data[1] = image.data[2] = image.data[3] = 255; image.data[0] = image.data[1] = image.data[2] = image.data[3] = 255;

4
src/ol/renderer/webgl/PointsLayer.js
View File

@@ -7,7 +7,7 @@ import {DefaultAttrib, DefaultUniform} from '../../webgl/Helper.js';
import GeometryType from '../../geom/GeometryType.js'; import GeometryType from '../../geom/GeometryType.js';
import WebGLLayerRenderer, { import WebGLLayerRenderer, {
colorEncodeId, colorEncodeId,
getBlankTexture, getBlankImageData,
POINT_INSTRUCTIONS_COUNT, POINT_VERTEX_STRIDE, WebGLWorkerMessageType, POINT_INSTRUCTIONS_COUNT, POINT_VERTEX_STRIDE, WebGLWorkerMessageType,
writePointFeatureInstructions writePointFeatureInstructions
} from './Layer.js'; } from './Layer.js';
@@ -222,7 +222,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
const options = opt_options || {}; const options = opt_options || {};
const uniforms = options.uniforms || {}; const uniforms = options.uniforms || {};
uniforms.u_texture = options.texture || getBlankTexture(); uniforms.u_texture = options.texture || getBlankImageData();
const projectionMatrixTransform = createTransform(); const projectionMatrixTransform = createTransform();
uniforms[DefaultUniform.PROJECTION_MATRIX] = projectionMatrixTransform; uniforms[DefaultUniform.PROJECTION_MATRIX] = projectionMatrixTransform;

6
test/spec/ol/renderer/webgl/layer.test.js
View File

@@ -1,7 +1,7 @@
import WebGLLayerRenderer, { import WebGLLayerRenderer, {
colorDecodeId, colorDecodeId,
colorEncodeId, colorEncodeId,
getBlankTexture, POINT_INSTRUCTIONS_COUNT, POINT_VERTEX_STRIDE, getBlankImageData, POINT_INSTRUCTIONS_COUNT, POINT_VERTEX_STRIDE,
writePointFeatureInstructions, writePointFeatureToBuffers writePointFeatureInstructions, writePointFeatureToBuffers
} from '../../../../../src/ol/renderer/webgl/Layer.js'; } from '../../../../../src/ol/renderer/webgl/Layer.js';
import Layer from '../../../../../src/ol/layer/Layer.js'; import Layer from '../../../../../src/ol/layer/Layer.js';
@@ -239,9 +239,9 @@ describe('ol.renderer.webgl.Layer', function() {
}); });
describe('getBlankTexture', function() { describe('getBlankImageData', function() {
it('creates a 1x1 white texture', function() { it('creates a 1x1 white texture', function() {
const texture = getBlankTexture(); const texture = getBlankImageData();
expect(texture.height).to.eql(1); expect(texture.height).to.eql(1);
expect(texture.width).to.eql(1); expect(texture.width).to.eql(1);
expect(texture.data[0]).to.eql(255); expect(texture.data[0]).to.eql(255);