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

remove extra caching from CurrentColorsService

Browse Source
This commit is contained in:
juliandescottes 2017-01-25 14:59:09 +01:00
parent ac08ff8b82
commit dc149f88d6
1 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,52 +70,26 @@
return result; return result;
}; };
var frameCache = {};
ns.CurrentColorsService.prototype.updateCurrentColors_ = function () { ns.CurrentColorsService.prototype.updateCurrentColors_ = function () {
var layers = this.piskelController.getLayers(); var layers = this.piskelController.getLayers();
var frames = layers.map(function (l) {return l.getFrames();}).reduce(function (p, n) {return p.concat(n);});
var job = function (frame) { // Concatenate all frames in a single array.
var frames = layers.map(function (l) {
return l.getFrames();
}).reduce(function (p, n) {
return p.concat(n);
});
batchAll(frames, function (frame) {
return this.cachedFrameProcessor.get(frame); return this.cachedFrameProcessor.get(frame);
}.bind(this); }.bind(this))
.then(function (results) {
var colors = {}; var colors = {};
var framesToBatch = [];
var removeColorsIfNotInCurrent = function(hash, color) {
if (!frameCache[hash][color]) {
delete colors[color];
}
};
for (var i = 0, length = frames.length; i < length; ++i) {
var frame = frames[i];
var hash = frame.getHash();
if (frameCache[hash]) {
colors = Object.assign(colors, frameCache[hash]);
var hashParts = hash.split('-');
var hashVersion = parseInt(hashParts.pop());
if (hashVersion > 0) {
var lastColors = frameCache[hashParts.join('-') + '-' + (hashVersion - 1)];
if (lastColors) {
Object.keys(lastColors).forEach(removeColorsIfNotInCurrent.bind(this, hash));
}
}
} else {
framesToBatch.push(frame);
}
}
var batchAllThen = function (colors, results) {
results.forEach(function (result) { results.forEach(function (result) {
Object.keys(result).forEach(function (color) { Object.keys(result).forEach(function (color) {
colors[color] = true; colors[color] = true;
}); });
}); });
// Remove transparent color from used colors // Remove transparent color from used colors
delete colors[pskl.utils.colorToInt(Constants.TRANSPARENT_COLOR)]; delete colors[pskl.utils.colorToInt(Constants.TRANSPARENT_COLOR)];
@ -123,13 +97,7 @@
return pskl.utils.intToHex(color); return pskl.utils.intToHex(color);
}); });
this.setCurrentColors(hexColors); this.setCurrentColors(hexColors);
}.bind(this, colors); }.bind(this));
if (framesToBatch.length === 0) {
batchAllThen([colors]);
} else {
batchAll(framesToBatch, job).then(batchAllThen);
}
}; };
ns.CurrentColorsService.prototype.isCurrentColorsPaletteSelected_ = function () { ns.CurrentColorsService.prototype.isCurrentColorsPaletteSelected_ = function () {
@ -150,7 +118,6 @@
ns.CurrentColorsService.prototype.getFrameColors_ = function (frame, processorCallback) { ns.CurrentColorsService.prototype.getFrameColors_ = function (frame, processorCallback) {
var frameColorsWorker = new pskl.worker.framecolors.FrameColors(frame, var frameColorsWorker = new pskl.worker.framecolors.FrameColors(frame,
function (event) { function (event) {
frameCache[frame.getHash()] = event.data.colors;
processorCallback(event.data.colors); processorCallback(event.data.colors);
}, },
function () {}, function () {},