Issue #414: part2: serialize and deserialize layer opacity

This commit is contained in:
Julian Descottes
2016-03-05 20:42:21 +01:00
committed by juliandescottes
parent 7660119b50
commit 6546b520b3
3 changed files with 53 additions and 6 deletions

View File

@ -6,6 +6,7 @@
this.data_ = data;
this.callback_ = callback;
this.piskel_ = null;
this.layers_ = [];
};
ns.Deserializer.deserialize = function (data, callback) {
@ -36,9 +37,10 @@
}
};
ns.Deserializer.prototype.deserializeLayer = function (layerString) {
ns.Deserializer.prototype.deserializeLayer = function (layerString, index) {
var layerData = JSON.parse(layerString);
var layer = new pskl.model.Layer(layerData.name);
layer.setOpacity(layerData.opacity);
// 1 - create an image to load the base64PNG representing the layer
var base64PNG = layerData.base64PNG;
@ -49,7 +51,7 @@
// 5 - extract the frames from the loaded image
var frames = pskl.utils.LayerUtils.createLayerFromSpritesheet(image, layerData.frameCount);
// 6 - add each image to the layer
this.addFramesToLayer(frames, layer);
this.addFramesToLayer(frames, layer, index);
}.bind(this);
// 3 - set the source of the image
@ -59,27 +61,30 @@
return layer;
};
ns.Deserializer.prototype.loadExpandedLayer = function (layerData) {
ns.Deserializer.prototype.loadExpandedLayer = function (layerData, index) {
var layer = new pskl.model.Layer(layerData.name);
var frames = layerData.grids.map(function (grid) {
return pskl.model.Frame.fromPixelGrid(grid);
});
this.addFramesToLayer(frames, layer);
this.addFramesToLayer(frames, layer, index);
// 4 - return a pointer to the new layer instance
return layer;
};
ns.Deserializer.prototype.addFramesToLayer = function (frames, layer) {
ns.Deserializer.prototype.addFramesToLayer = function (frames, layer, index) {
frames.forEach(layer.addFrame.bind(layer));
this.piskel_.addLayer(layer);
this.layers_[index] = layer;
this.onLayerLoaded_();
};
ns.Deserializer.prototype.onLayerLoaded_ = function () {
this.layersToLoad_ = this.layersToLoad_ - 1;
if (this.layersToLoad_ === 0) {
this.layers_.forEach(function (layer) {
this.piskel_.addLayer(layer);
}.bind(this));
this.callback_(this.piskel_);
}
};