From 29f23eaf97650cc21869b339c7fbc30ae8c3bae8 Mon Sep 17 00:00:00 2001 From: Robert Fleischmann Date: Tue, 21 Feb 2017 00:44:12 -0800 Subject: [PATCH] migrate enhance curves to new file and delete old presets file --- examples/example.js | 11 ++++- examples/vintage.js | 13 +++++- vintage.presets.js | 104 -------------------------------------------- 3 files changed, 20 insertions(+), 108 deletions(-) delete mode 100644 vintage.presets.js diff --git a/examples/example.js b/examples/example.js index 7550e3e..4bf0354 100644 --- a/examples/example.js +++ b/examples/example.js @@ -15,18 +15,25 @@ const r = c => const g = c => (-0.001045244139166791) * c * c + 1.2665372554875318 * c; const b = c => 0.57254902 * c + 53; -const curves = { +const curves1 = { r: idArr.map(compose(r, rgb)), g: idArr.map(compose(g, rgb)), b: idArr.map(compose(b, rgb)), }; +const rgb2 = c => (-12) * Math.sin(c * 2 * Math.PI / 255) + c; +const curves2 = { + r: idArr.map(rgb2), + g: idArr.map(rgb2), + b: idArr.map(rgb2), +}; + vintagejs(img, { vignette: 0.3, lighten: 0.2, brightness: -0.1, contrast: 0.15, - curves, + curves: curves1, screen: { r: 227, g: 12, diff --git a/examples/vintage.js b/examples/vintage.js index b80d52f..22daf99 100644 --- a/examples/vintage.js +++ b/examples/vintage.js @@ -32,18 +32,27 @@ var b = function b(c) { return 0.57254902 * c + 53; }; -var curves = { +var curves1 = { r: idArr.map(compose(r, rgb)), g: idArr.map(compose(g, rgb)), b: idArr.map(compose(b, rgb)) }; +var rgb2 = function rgb2(c) { + return -12 * Math.sin(c * 2 * Math.PI / 255) + c; +}; +var curves2 = { + r: idArr.map(rgb2), + g: idArr.map(rgb2), + b: idArr.map(rgb2) +}; + (0, _index2.default)(img, { vignette: 0.3, lighten: 0.2, brightness: -0.1, contrast: 0.15, - curves: curves, + curves: curves1, screen: { r: 227, g: 12, diff --git a/vintage.presets.js b/vintage.presets.js deleted file mode 100644 index 14bc9a8..0000000 --- a/vintage.presets.js +++ /dev/null @@ -1,104 +0,0 @@ -var vintagePresets = { - /** - * Basic vintage effect - */ - vintage: { - curves: (function() { - var rgb = function (x) { - return -12 * Math.sin( x * 2 * Math.PI / 255 ) + x; - }, - r = function(x) { - return -0.2 * Math.pow(255 * x, 0.5) * Math.sin(Math.PI * (-0.0000195 * Math.pow(x, 2) + 0.0125 * x ) ) + x; - }, - g = function(x) { - return -0.001045244139166791 * Math.pow(x,2) + 1.2665372554875318 * x; - }, - b = function(x) { - return 0.57254902 * x + 53; - }, - c = {r:[],g:[],b:[]}; - for(var i=0;i<=255;++i) { - c.r[i] = r( rgb(i) ); - c.g[i] = g( rgb(i) ); - c.b[i] = b( rgb(i) ); - } - return c; - })(), - screen: { - r: 227, - g: 12, - b: 169, - a: 0.15 - }, - vignette: 0.7, - viewFinder: false // or path to image 'img/viewfinder.jpg' - }, - /** - * Sepia effect - */ - sepia: { - curves: (function() { - var rgb = function (x) { - return -12 * Math.sin( x * 2 * Math.PI / 255 ) + x; - }, - c = {r:[],g:[],b:[]}; - for(var i=0;i<=255;++i) { - c.r[i] = rgb(i); - c.g[i] = rgb(i); - c.b[i] = rgb(i); - } - return c; - })(), - sepia: true - }, - /** - * Greenish effect - */ - greenish: { - curves: (function() { - var rgb = function (x) { - return -12 * Math.sin( x * 2 * Math.PI / 255 ) + x; - }, - c = {r:[],g:[],b:[]}; - for(var i=0;i<=255;++i) { - c.r[i] = rgb(i); - c.g[i] = rgb(i); - c.b[i] = rgb(i); - } - return c; - })(), - vignette: 0.6, - lighten: 0.1, - screen: { - r: 255, - g: 255, - b: 0, - a: 0.15 - } - }, - /** - * Reddish effect - */ - reddish: { - curves: (function() { - var rgb = function (x) { - return -12 * Math.sin( x * 2 * Math.PI / 255 ) + x; - }, - c = {r:[],g:[],b:[]}; - for(var i=0;i<=255;++i) { - c.r[i] = rgb(i); - c.g[i] = rgb(i); - c.b[i] = rgb(i); - } - return c; - })(), - vignette: 0.6, - lighten: 0.1, - screen: { - r: 255, - g: 0, - b: 0, - a: 0.15 - } - } -};