Webgl / linting & test fixes

This commit is contained in:
Olivier Guyot
2019-09-25 12:44:55 +02:00
parent 610a846149
commit 9e55a8b2f0
8 changed files with 34 additions and 33 deletions

View File

@@ -33,7 +33,7 @@ describe('ol.renderer.webgl.Layer', function() {
});
describe('writePointFeatureToBuffers', function() {
let vertexBuffer, indexBuffer, instructions, elementIndex;
let vertexBuffer, indexBuffer, instructions;
beforeEach(function() {
vertexBuffer = new Float32Array(100);

View File

@@ -108,7 +108,9 @@ describe('ol.renderer.webgl.PointsLayer', function() {
});
renderer = new WebGLPointsLayerRenderer(layer, {
vertexShader: simpleVertexShader,
fragmentShader: simpleFragmentShader
fragmentShader: simpleFragmentShader,
hitVertexShader: hitVertexShader,
hitFragmentShader: hitFragmentShader
});
frameState = Object.assign({
size: [2, 2],

View File

@@ -1,8 +1,9 @@
import WebGLHelper, {AttributeType, computeAttributesStride} from '../../../../src/ol/webgl/Helper.js';
import WebGLHelper from '../../../../src/ol/webgl/Helper.js';
import {
create as createTransform,
rotate as rotateTransform,
scale as scaleTransform, translate as translateTransform
scale as scaleTransform,
translate as translateTransform
} from '../../../../src/ol/transform.js';
import {FLOAT} from '../../../../src/ol/webgl.js';

View File

@@ -1,6 +1,5 @@
import {create} from '../../../../src/ol/worker/webgl.js';
import {
POINT_INSTRUCTIONS_COUNT,
WebGLWorkerMessageType
} from '../../../../src/ol/renderer/webgl/Layer.js';
@@ -22,7 +21,9 @@ describe('ol/worker/webgl', function() {
describe('messaging', function() {
describe('GENERATE_BUFFERS', function() {
it('responds with buffer data', function(done) {
worker.addEventListener('error', done);
worker.addEventListener('error', function(error) {
expect().fail(error.message);
});
worker.addEventListener('message', function(event) {
expect(event.data.type).to.eql(WebGLWorkerMessageType.GENERATE_BUFFERS);
@@ -34,11 +35,12 @@ describe('ol/worker/webgl', function() {
done();
});
const instructions = new Float32Array(POINT_INSTRUCTIONS_COUNT);
const instructions = new Float32Array(10);
const message = {
type: WebGLWorkerMessageType.GENERATE_BUFFERS,
renderInstructions: instructions,
customAttributesCount: 0,
testInt: 101,
testString: 'abcd'
};