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

Fix overlay (#1082)

Browse Source 
* fix Overlay

Signed-off-by: tech4GT <varun.gupta1798@gmail.com>

* update canvas background color

Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
This commit is contained in:
Varun Gupta
2019-05-27 23:23:55 +05:30
committed by Jeffrey Warren
parent ca73a4115e
commit 641ffd7a1a
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/CanvasResize/Module.js
View File

@@ -21,7 +21,7 @@ module.exports = function canvasResize(options, UI) {
var step = this; var step = this;
function extraManipulation(pixels) { function extraManipulation(pixels) {
let newPixels = require('ndarray')(new Uint8Array(4 * options.width * options.height).fill(255), [options.width, options.height, 4]); let newPixels = require('ndarray')(new Uint8Array(4 * options.width * options.height).fill(0), [options.width, options.height, 4]);
let iMax = options.width - options.x, let iMax = options.width - options.x,
jMax = options.height - options.y; jMax = options.height - options.y;
for (let i = 0; i < iMax && i < pixels.shape[0]; i++) { for (let i = 0; i < iMax && i < pixels.shape[0]; i++) {

20
src/modules/Overlay/Module.js
View File

@@ -9,7 +9,7 @@ module.exports = function Dynamic(options, UI, util) {
// This function is called on every draw. // This function is called on every draw.
function draw(input, callback, progressObj) { function draw(input, callback, progressObj) {
options.offset = options.offset || -2; options.offset = parseInt(options.offset) || -2;
progressObj.stop(true); progressObj.stop(true);
progressObj.overrideFlag = true; progressObj.overrideFlag = true;
@@ -23,7 +23,7 @@ module.exports = function Dynamic(options, UI, util) {
src: input.src, src: input.src,
x: { valInp: options.x, type: 'horizontal' }, x: { valInp: options.x, type: 'horizontal' },
y: { valInp: options.y, type: 'vertical' }, y: { valInp: options.y, type: 'vertical' },
}, function (options, input) { }, function(options, input) {
options.x = parseInt(input.x.valInp); options.x = parseInt(input.x.valInp);
options.y = parseInt(input.y.valInp); options.y = parseInt(input.y.valInp);
}); });
@@ -34,7 +34,7 @@ module.exports = function Dynamic(options, UI, util) {
var getPixels = require('get-pixels'); var getPixels = require('get-pixels');
getPixels(input.src, function (err, pixels) { getPixels(input.src, function(err, pixels) {
options.secondImagePixels = pixels; options.secondImagePixels = pixels;
function changePixel(r1, g1, b1, a1, x, y) { function changePixel(r1, g1, b1, a1, x, y) {
@@ -42,14 +42,14 @@ module.exports = function Dynamic(options, UI, util) {
// overlay // overlay
var p = options.secondImagePixels; var p = options.secondImagePixels;
if (x >= options.x if (x >= options.x
&& x < p.shape[0] && x - options.x < p.shape[0]
&& y >= options.y && y >= options.y
&& y < p.shape[1]) && y - options.y < p.shape[1])
return [ return [
p.get(x, y, 0), p.get(x - options.x, y - options.y, 0),
p.get(x, y, 1), p.get(x - options.x, y - options.y, 1),
p.get(x, y, 2), p.get(x - options.x, y - options.y, 2),
p.get(x, y, 3) p.get(x - options.x, y - options.y, 3)
]; ];
else else
return [r1, g1, b1, a1]; return [r1, g1, b1, a1];