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

improved current colors sort algorithm

Browse Source
This commit is contained in:
jdescottes 2014-09-24 08:15:18 +02:00
parent e3e6730b45
commit 258d13371d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/lib/gif/libgif.js
View File

@ -624,6 +624,7 @@ var SuperGif = function ( opts ) {
}; };
var load_callback = false; var load_callback = false;
var step_callback = false;
var error_callback = false; var error_callback = false;
var tmpCanvas = document.createElement('canvas'); var tmpCanvas = document.createElement('canvas');
@ -632,6 +633,7 @@ var SuperGif = function ( opts ) {
load: function (callback) { load: function (callback) {
load_callback = callback.success; load_callback = callback.success;
step_callback = callback.step;
error_callback = callback.error; error_callback = callback.error;
loading = true; loading = true;

9
src/js/service/CurrentColorsService.js
View File

@ -60,14 +60,19 @@
$.publish(Events.CURRENT_COLORS_UPDATED); $.publish(Events.CURRENT_COLORS_UPDATED);
}; };
var LOW_SAT = 0.1;
var LOW_LUM = 0.1;
var HI_LUM = 0.9;
ns.CurrentColorsService.prototype.sortColors_ = function (c1, c2) { ns.CurrentColorsService.prototype.sortColors_ = function (c1, c2) {
var hsl1 = this.colorsHslMap[c1]; var hsl1 = this.colorsHslMap[c1];
var hsl2 = this.colorsHslMap[c2]; var hsl2 = this.colorsHslMap[c2];
if (hsl1.l < 0.1 || hsl2.l < 0.1) { if (hsl1.l < LOW_LUM || hsl2.l < LOW_LUM) {
return this.compareValues_(hsl1.l, hsl2.l); return this.compareValues_(hsl1.l, hsl2.l);
} else if (hsl1.l > 0.9 || hsl2.l > 0.9) { } else if (hsl1.l > HI_LUM || hsl2.l > HI_LUM) {
return this.compareValues_(hsl2.l, hsl1.l); return this.compareValues_(hsl2.l, hsl1.l);
} else if (hsl1.s < LOW_SAT || hsl2.s < LOW_SAT) {
return this.compareValues_(hsl1.s, hsl2.s);
} else { } else {
var hDiff = Math.abs(hsl1.h - hsl2.h); var hDiff = Math.abs(hsl1.h - hsl2.h);
var sDiff = Math.abs(hsl1.s - hsl2.s); var sDiff = Math.abs(hsl1.s - hsl2.s);