wbrawner/piskel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix loading of v2 models

Browse source
This commit is contained in:
juliandescottes 2016-10-10 01:47:26 +02:00
parent 91f637d2fd
commit 85336f9b9a
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/js/app.js
View file

@ -160,7 +160,7 @@
var piskelData = this.getPiskelInitData_();
if (piskelData && piskelData.piskel) {
this.loadPiskel_(piskelData.piskel, piskelData.descriptor, piskelData.fps);
this.loadPiskel_(piskelData);
}
if (pskl.devtools) {
@ -175,10 +175,17 @@
}
},
loadPiskel_ : function (serializedPiskel) {
loadPiskel_ : function (piskelData) {
var serializedPiskel = piskelData.piskel;
pskl.utils.serialization.Deserializer.deserialize(serializedPiskel, function (piskel, extra) {
var fps = extra.fps;
if (piskelData.descriptor) {
// Backward compatibility for v2 or older
piskel.setDescriptor(piskelData.descriptor);
fps = piskelData.fps;
}
pskl.app.piskelController.setPiskel(piskel);
pskl.app.previewController.setFPS(extra.fps);
pskl.app.previewController.setFPS(fps);
});
},

2
src/js/utils/serialization/Deserializer.js
View file

@ -46,7 +46,7 @@
deserializer.deserialize();
};
ns.Deserializer.prototype.deserialize = function (name) {
ns.Deserializer.prototype.deserialize = function () {
var i;
var j;
var buffer = this.data_;

4
src/js/utils/serialization/backward/Deserializer_v2.js
View file

@ -9,10 +9,10 @@
this.layers_ = [];
};
ns.Deserializer_v2.prototype.deserialize = function (name) {
ns.Deserializer_v2.prototype.deserialize = function () {
var data = this.data_;
var piskelData = data.piskel;
name = piskelData.name || 'Deserialized piskel';
var name = piskelData.name || 'Deserialized piskel';
var description = piskelData.description || '';
var descriptor = new pskl.model.piskel.Descriptor(name, description);