lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2026-01-22 03:11:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove brightness from filter

Browse Source 
#79
This commit is contained in:
Gleb Pospelov
2015-07-30 03:36:30 +03:00
parent ddde211204
commit 3262b3aa34
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
konva.js
View File

@@ -3,7 +3,7 @@
* Konva JavaScript Framework v0.9.9
* http://konvajs.github.io/
* Licensed under the MIT or GPL Version 2 licenses.
* Date: Tue Jun 09 2015
* Date: Thu Jul 30 2015
*
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva)
@@ -5139,16 +5139,14 @@ var Konva = {};
green = this.green(),
blue = this.blue(),
alpha = this.alpha(),
i, brightness, ab, iab;
i, brightness, ia;
for (i = 0; i < nPixels; i += 4) {
brightness = (0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2])/255;
ab = alpha * brightness;
iab = (1 - alpha) * brightness;
ia = (1 - alpha);
data[i] = red * ab + data[i] * iab; // r
data[i + 1] = green * ab + data[i + 1] * iab; // g
data[i + 2] = blue * ab + data[i + 2] * iab; // b
data[i] = red * alpha + data[i] * ia; // r
data[i + 1] = green * alpha + data[i + 1] * ia; // g
data[i + 2] = blue * alpha + data[i + 2] * ia; // b
}
};
@@ -5204,7 +5202,7 @@ var Konva = {};
* @returns {Integer}
*/
Konva.Factory.addGetterSetter(Konva.Node, 'alpha', 0, function(val) {
Konva.Factory.addGetterSetter(Konva.Node, 'alpha', 1, function(val) {
this._filterUpToDate = false;
if (val > 1) {
return 1;

4
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
src/filters/RGBA.js
View File

@@ -20,16 +20,14 @@
green = this.green(),
blue = this.blue(),
alpha = this.alpha(),
i, brightness, ab, ia;
i, ia;
for (i = 0; i < nPixels; i += 4) {
brightness = (0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2])/255;
ab = alpha * brightness;
ia = (1 - alpha);
ia = 1 - alpha;
data[i] = red * ab + data[i] * ia; // r
data[i + 1] = green * ab + data[i + 1] * ia; // g
data[i + 2] = blue * ab + data[i + 2] * ia; // b
data[i] = red * alpha + data[i] * ia; // r
data[i + 1] = green * alpha + data[i + 1] * ia; // g
data[i + 2] = blue * alpha + data[i + 2] * ia; // b
}
};