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

Add support for transparent image in overlay module (#1606)

Browse Source 
* add support for transparent image overlay

* replaced var for const/let

Co-authored-by: Harsh Khandeparkar <34770591+HarshKhandeparkar@users.noreply.github.com>
Co-authored-by: Jeffrey Warren <jeff@unterbahn.com>
This commit is contained in:
Rishabh Shukla
2020-11-01 22:06:13 +05:30
committed by GitHub
parent 67e11edcd8
commit 0622a0c21a
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,17 @@
module.exports = function Dynamic(options, UI, util) { module.exports = function Dynamic(options, UI, util) {
var defaults = require('./../../util/getDefaults.js')(require('./info.json')); const defaults = require('./../../util/getDefaults.js')(require('./info.json'));
options.x = options.x || defaults.x; options.x = options.x || defaults.x;
options.y = options.y || defaults.y; options.y = options.y || defaults.y;
if(options.step.inBrowser && !options.noUI && sequencer.getSteps().length < 2) if(options.step.inBrowser && !options.noUI && sequencer.getSteps().length < 2)
options.offset = -1; options.offset = -1;
if (options.step.inBrowser && !options.noUI) var ui = require('./Ui.js')(options.step, UI); let ui;
var output; if (options.step.inBrowser && !options.noUI) ui = require('./Ui.js')(options.step, UI);
let output;
// This function is called on every draw. // This function is called on every draw.
function draw(input, callback, progressObj) { function draw(input, callback, progressObj) {
@@ -19,15 +21,15 @@ module.exports = function Dynamic(options, UI, util) {
progressObj.stop(true); progressObj.stop(true);
progressObj.overrideFlag = true; progressObj.overrideFlag = true;
var step = this; const step = this;
var parseCornerCoordinateInputs = require('../../util/ParseInputCoordinates'); const parseCornerCoordinateInputs = require('../../util/ParseInputCoordinates');
// save the pixels of the base image // save the pixels of the base image
var baseStepImage = this.getStep(options.offset).image; const baseStepImage = this.getStep(options.offset).image;
var baseStepOutput = this.getOutput(options.offset); const baseStepOutput = this.getOutput(options.offset);
var getPixels = require('get-pixels'); const getPixels = require('get-pixels');
getPixels(input.src, function(err, pixels) { getPixels(input.src, function(err, pixels) {
// parse the inputs // parse the inputs
@@ -47,20 +49,29 @@ module.exports = function Dynamic(options, UI, util) {
function changePixel(r1, g1, b1, a1, x, y) { function changePixel(r1, g1, b1, a1, x, y) {
const firstImagePixels = [r1, g1, b1, a1];
// overlay // overlay
var p = options.secondImagePixels; const p = options.secondImagePixels;
if (x >= options.x if (x >= options.x
&& x - options.x < p.shape[0] && x - options.x < p.shape[0]
&& y >= options.y && y >= options.y
&& y - options.y < p.shape[1]) && y - options.y < p.shape[1]){
return [
const secondImagePixels = [
p.get(x - options.x, y - options.y, 0), p.get(x - options.x, y - options.y, 0),
p.get(x - options.x, y - options.y, 1), p.get(x - options.x, y - options.y, 1),
p.get(x - options.x, y - options.y, 2), p.get(x - options.x, y - options.y, 2),
p.get(x - options.x, y - options.y, 3) p.get(x - options.x, y - options.y, 3)
]; ];
if(secondImagePixels[3] === 0)
return firstImagePixels;
else else
return [r1, g1, b1, a1]; return secondImagePixels;
}
else
return firstImagePixels;
} }
function output(image, datauri, mimetype, wasmSuccess) { function output(image, datauri, mimetype, wasmSuccess) {