eessppeelllloo/image-sequencer
1
0
Fork 0
mirror of https://github.com/publiclab/image-sequencer.git synced 2025-12-14 04:10:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix webgl-distort (#1074)

Browse Source 
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
This commit is contained in:
Varun Gupta
2019-05-24 00:10:55 +05:30
committed by Jeffrey Warren
parent c784de0c19
commit 8751211967
1 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/modules/WebglDistort/Module.js
View File

@@ -54,51 +54,51 @@ module.exports = function DoNothing(options, UI) {
var texture = canvas.texture(image); var texture = canvas.texture(image);
var bbox1 = { // var bbox1 = {
nw: { // nw: {
x: matrix1[0], // x: matrix1[0],
y: matrix1[1] // y: matrix1[1]
}, // },
ne: { // ne: {
x: matrix1[2], // x: matrix1[2],
y: matrix1[3] // y: matrix1[3]
}, // },
se: { // se: {
x: matrix1[4], // x: matrix1[4],
y: matrix1[5] // y: matrix1[5]
}, // },
sw: { // sw: {
x: matrix1[6], // x: matrix1[6],
y: matrix1[7] // y: matrix1[7]
} // }
}, // },
bbox2 = { // bbox2 = {
nw: { // nw: {
x: matrix2[0], // x: matrix2[0],
y: matrix2[1] // y: matrix2[1]
}, // },
ne: { // ne: {
x: matrix2[2], // x: matrix2[2],
y: matrix2[3] // y: matrix2[3]
}, // },
se: { // se: {
x: matrix2[4], // x: matrix2[4],
y: matrix2[5] // y: matrix2[5]
}, // },
sw: { // sw: {
x: matrix2[6], // x: matrix2[6],
y: matrix2[7] // y: matrix2[7]
} // }
}; // };
var matrix1Xs = [], var matrix1Xs = [],
matrix1Ys = []; matrix1Ys = [];
for (var i = 0; i < matrix1.length; i += 2) { for (let i = 0; i < matrix1.length; i += 2) {
matrix1Xs.push(matrix1[i]); matrix1Xs.push(matrix1[i]);
} }
for (var i = 1; i < matrix1.length; i += 2) { for (let i = 1; i < matrix1.length; i += 2) {
matrix1Ys.push(matrix1[i]); matrix1Ys.push(matrix1[i]);
} }
@@ -110,11 +110,11 @@ module.exports = function DoNothing(options, UI) {
var matrix2Xs = [], var matrix2Xs = [],
matrix2Ys = []; matrix2Ys = [];
for (var i = 0; i < matrix2.length; i += 2) { for (let i = 0; i < matrix2.length; i += 2) {
matrix2Xs.push(matrix2[i]); matrix2Xs.push(matrix2[i]);
} }
for (var i = 1; i < matrix2.length; i += 2) { for (let i = 1; i < matrix2.length; i += 2) {
matrix2Ys.push(matrix2[i]); matrix2Ys.push(matrix2[i]);
} }
@@ -132,10 +132,10 @@ module.exports = function DoNothing(options, UI) {
); );
var ratioY = (matrix2southmost - matrix2northmost) var ratioY = (matrix2southmost - matrix2northmost)
/ (matrix1southmost - matrix1northmost); / (matrix1southmost - matrix1northmost);
var ratioX = (matrix2eastmost - matrix2westmost) var ratioX = (matrix2eastmost - matrix2westmost)
/ (matrix1eastmost - matrix1westmost); / (matrix1eastmost - matrix1westmost);
var ratio = Math.max(ratioX, ratioY); var ratio = Math.max(ratioX, ratioY);
@@ -146,7 +146,7 @@ module.exports = function DoNothing(options, UI) {
} }
// stretch output matrix y to fix: // stretch output matrix y to fix:
for (var i = 1; i < matrix2.length; i += 2) { for (let i = 1; i < matrix2.length; i += 2) {
matrix2[i] -= offsetY; matrix2[i] -= offsetY;
matrix2[i] /= ratio; matrix2[i] /= ratio;
} }
@@ -200,7 +200,7 @@ module.exports = function DoNothing(options, UI) {
image.onload = () => { image.onload = () => {
warpWebGl( warpWebGl(
'img', 'img',
[0, 0, 1023, 0, 1023, 767, 0, 767], // matrix 1 (before) corner coordinates, NW, NE, SE, SW [0, 0, image.naturalWidth, 0, image.naturalWidth, image.naturalHeight, 0, image.naturalHeight], // matrix 1 (before) corner coordinates, NW, NE, SE, SW
// [0, 100, 1023, -50, 1223, 867, 100, 767] // matrix 2 (after) corner coordinates // [0, 100, 1023, -50, 1223, 867, 100, 767] // matrix 2 (after) corner coordinates
cornerCoordinates cornerCoordinates
); );