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

Remove use of goog.vec.*

Browse Source
This commit is contained in:
Andreas Hocevar
2016-06-22 09:14:53 +02:00
parent 55edf4003f
commit cf7ff841a7
36 changed files with 511 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js
View File

@@ -23,11 +23,11 @@ describe('ol.renderer.canvas.Layer', function() {
},
size: [10, 10],
pixelRatio: 1,
coordinateToPixelMatrix: goog.vec.Mat4.createNumber(),
pixelToCoordinateMatrix: goog.vec.Mat4.createNumber()
coordinateToPixelMatrix: ol.matrix.create(),
pixelToCoordinateMatrix: ol.matrix.create()
};
renderer.getImageTransform = function() {
return goog.vec.Mat4.createNumberIdentity();
return ol.matrix.create();
};
ol.renderer.Map.prototype.calculateMatrices2D(frameState);
var layerState = layer.getLayerState();
@@ -62,7 +62,7 @@ describe('ol.renderer.canvas.Layer', function() {
goog.require('ol.render.canvas');
goog.require('goog.vec.Mat4');
goog.require('ol.matrix');
goog.require('ol.layer.Image');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.Layer');

21
test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js
View File

@@ -49,39 +49,32 @@ describe('ol.renderer.webgl.ImageLayer', function() {
pixelRatio, viewCenter, viewResolution, viewRotation, imageExtent);
var matrix = renderer.getProjectionMatrix();
var input;
var output = goog.vec.Vec4.createNumber();
var output = ol.matrix.create();
input = goog.vec.Vec4.createFromValues(-1, -1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
ol.matrix.multVec2(matrix, [-1, -1], output);
expect(output[0]).to.eql(-6);
expect(output[1]).to.eql(-6);
input = goog.vec.Vec4.createFromValues(1, -1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
ol.matrix.multVec2(matrix, [1, -1], output);
expect(output[0]).to.eql(2);
expect(output[1]).to.eql(-6);
input = goog.vec.Vec4.createFromValues(-1, 1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
ol.matrix.multVec2(matrix, [-1, 1], output);
expect(output[0]).to.eql(-6);
expect(output[1]).to.eql(6);
input = goog.vec.Vec4.createFromValues(1, 1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
ol.matrix.multVec2(matrix, [1, 1], output);
expect(output[0]).to.eql(2);
expect(output[1]).to.eql(6);
input = goog.vec.Vec4.createFromValues(0, 0, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
ol.matrix.multVec2(matrix, [0, 0], output);
expect(output[0]).to.eql(-2);
expect(output[1]).to.eql(0);
});
});
});
goog.require('goog.vec.Mat4');
goog.require('goog.vec.Vec4');
goog.require('ol.matrix');
goog.require('ol.Map');
goog.require('ol.proj.common');
goog.require('ol.layer.Image');