mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Issue #258 : Simplify Lighten & update test

Browse Source
This commit is contained in:
jdescottes 2015-11-26 00:04:03 +01:00
parent 12ac85f0f6
commit 27061291a3
2 changed files with 292 additions and 1205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/js/tools/drawing/Lighten.js
View File

@ -19,26 +19,10 @@
{key : 'ctrl', description : 'Darken'}, {key : 'ctrl', description : 'Darken'},
{key : 'shift', description : 'Apply only once per pixel'} {key : 'shift', description : 'Apply only once per pixel'}
]; ];
this.usedPixels_ = {
darken : {},
lighten : {}
};
}; };
pskl.utils.inherit(ns.Lighten, ns.SimplePen); pskl.utils.inherit(ns.Lighten, ns.SimplePen);
/**
* @Override
*/
ns.Lighten.prototype.resetUsedPixels_ = function() {
this.usedPixels_ = {
darken : {},
lighten : {}
};
this.superclass.resetUsedPixels_.call(this);
};
/** /**
* @Override * @Override
*/ */
@ -54,29 +38,32 @@
}; };
ns.Lighten.prototype.getModifiedColor_ = function(col, row, frame, overlay, event) { ns.Lighten.prototype.getModifiedColor_ = function(col, row, frame, overlay, event) {
// get colors in overlay and in frame
var overlayColor = overlay.getPixel(col, row); var overlayColor = overlay.getPixel(col, row);
var frameColor = frame.getPixel(col, row); var frameColor = frame.getPixel(col, row);
var pixelColor = overlayColor === Constants.TRANSPARENT_COLOR ? frameColor : overlayColor;
var isDarken = pskl.utils.UserAgent.isMac ? event.metaKey : event.ctrlKey;
var isTransparent = pixelColor === Constants.TRANSPARENT_COLOR;
var isSinglePass = event.shiftKey;
var usedPixels = isDarken ? this.usedPixels_.darken : this.usedPixels_.lighten; var isPixelModified = overlayColor !== Constants.TRANSPARENT_COLOR;
var key = col + '-' + row; var pixelColor = isPixelModified ? overlayColor : frameColor;
var doNotModify = isTransparent || (isSinglePass && usedPixels[key]);
var isTransparent = pixelColor === Constants.TRANSPARENT_COLOR;
if (isTransparent) {
return Constants.TRANSPARENT_COLOR;
}
var oncePerPixel = event.shiftKey;
if (oncePerPixel && isPixelModified) {
return pixelColor;
}
var step = oncePerPixel ? DEFAULT_STEP * 2 : DEFAULT_STEP;
var isDarken = pskl.utils.UserAgent.isMac ? event.metaKey : event.ctrlKey;
var color; var color;
if (doNotModify) { if (isDarken) {
color = window.tinycolor(pixelColor); color = window.tinycolor.darken(pixelColor, step);
} else { } else {
var step = isSinglePass ? DEFAULT_STEP * 2 : DEFAULT_STEP; color = window.tinycolor.lighten(pixelColor, step);
if (isDarken) {
color = window.tinycolor.darken(pixelColor, step);
} else {
color = window.tinycolor.lighten(pixelColor, step);
}
} }
usedPixels[key] = true;
// Convert tinycolor color to string format. // Convert tinycolor color to string format.
return color.toHexString(); return color.toHexString();

1446
test/drawing/tests/lighten.darken.json
View File

File diff suppressed because it is too large Load Diff