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

Merged

Browse Source
This commit is contained in:
jdescottes
2013-12-18 23:22:25 +01:00
parent 8b6958bf0b b77f7057d7
commit e4cf2ac40b
26 changed files with 351 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/utils/serialization/Deserializer.js
View File

@ -23,7 +23,9 @@
ns.Deserializer.prototype.deserialize = function () {
var data = this.data_;
var piskelData = data.piskel;
this.piskel_ = new pskl.model.Piskel(piskelData.width, piskelData.height);
var descriptor = new pskl.model.piskel.Descriptor('Deserialized piskel', '');
this.piskel_ = new pskl.model.Piskel(piskelData.width, piskelData.height, descriptor);
this.layersToLoad_ = piskelData.layers.length;

3
js/utils/serialization/backward/Deserializer_v0.js
View File

@ -11,8 +11,9 @@
var frames = pixelGrids.map(function (grid) {
return pskl.model.Frame.fromPixelGrid(grid);
});
var descriptor = new pskl.model.piskel.Descriptor('Deserialized piskel', '');
var layer = pskl.model.Layer.fromFrames('Layer 1', frames);
this.callback_(pskl.model.Piskel.fromLayers([layer]));
this.callback_(pskl.model.Piskel.fromLayers([layer], descriptor));
};
})();

3
js/utils/serialization/backward/Deserializer_v1.js
View File

@ -8,7 +8,8 @@
ns.Deserializer_v1.prototype.deserialize = function () {
var piskelData = this.data_.piskel;
var piskel = new pskl.model.Piskel(piskelData.width, piskelData.height);
var descriptor = new pskl.model.piskel.Descriptor('Deserialized piskel', '');
var piskel = new pskl.model.Piskel(piskelData.width, piskelData.height, descriptor);
piskelData.layers.forEach(function (serializedLayer) {
var layer = this.deserializeLayer(serializedLayer);