mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
fix : reduce piskel model size
- Initial implementation : working but ... - MODEL_VERSION has been bumped to 2 - The loading process is now theoretically asynchronous (loading images to read the content of the layers), but for now, the asynchronous behaviour is hidden behind a nasty hack, which is somehow similar to lazy loading. When loading the piskel, a Piskel is created synchronously, with fake empty frames, and as the images will get loaded, the fake frames will be replaced by the actual frames. I really don't like this, and the asynchronous nature of the loading should be clearly expressed - There is no backward compatible deserializer for the previous version of the model (1) - The Serializer utils is just badly designed. Serialization and deserialization should be splitted into two different classes - Saving & loading are still done in app.js and should be moved to services BUT : the size of the piskels is now pretty small. A piskel which was using 890kB previously is now using only 10kB. Although it should be noted, that after gzip there is no significant difference between this version and the existing one. The only gains we can really expect with this are : less disk space used on appengine, ability to reuse the layers' pngs directly on piskel-website (but to be honest I can't see any valid use case for this)
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
(function () {
|
||||
var ns = $.namespace('pskl.utils');
|
||||
|
||||
var layersToLoad = 0;
|
||||
|
||||
ns.Serializer = {
|
||||
serializePiskel : function (piskel) {
|
||||
var serializedLayers = piskel.getLayers().map(function (l) {
|
||||
@@ -16,47 +19,82 @@
|
||||
},
|
||||
|
||||
serializeLayer : function (layer) {
|
||||
var serializedFrames = layer.getFrames().map(function (f) {
|
||||
return f.serialize();
|
||||
});
|
||||
var frames = layer.getFrames();
|
||||
var renderer = new pskl.rendering.FramesheetRenderer(frames);
|
||||
var base64PNG = renderer.renderAsCanvas().toDataURL();
|
||||
|
||||
return JSON.stringify({
|
||||
name : layer.getName(),
|
||||
frames : serializedFrames
|
||||
base64PNG : base64PNG,
|
||||
frameCount : frames.length
|
||||
});
|
||||
},
|
||||
|
||||
deserializePiskel : function (piskelString) {
|
||||
var piskelData = JSON.parse(piskelString);
|
||||
return this.createPiskelFromData(piskelData);
|
||||
var data = JSON.parse(piskelString);
|
||||
return this.createPiskel(data);
|
||||
},
|
||||
|
||||
/**
|
||||
* Similar to deserializePiskel, but dealing directly with a parsed piskel
|
||||
* @param {Object} piskelData JSON.parse of a serialized piskel
|
||||
* @param {Object} data JSON.parse of a serialized piskel
|
||||
* @return {pskl.model.Piskel} a piskel
|
||||
*/
|
||||
createPiskel : function (piskelData) {
|
||||
createPiskel : function (data) {
|
||||
var piskel = null;
|
||||
if (piskelData.modelVersion == Constants.MODEL_VERSION) {
|
||||
var pData = piskelData.piskel;
|
||||
piskel = new pskl.model.Piskel(pData.width, pData.height);
|
||||
|
||||
pData.layers.forEach(function (serializedLayer) {
|
||||
if (data.modelVersion == Constants.MODEL_VERSION) {
|
||||
var piskelData = data.piskel;
|
||||
piskel = new pskl.model.Piskel(piskelData.width, piskelData.height);
|
||||
layersToLoad = piskelData.layers;
|
||||
piskelData.layers.forEach(function (serializedLayer) {
|
||||
var layer = pskl.utils.Serializer.deserializeLayer(serializedLayer);
|
||||
piskel.addLayer(layer);
|
||||
});
|
||||
} else if (data.modelVersion == 1) {
|
||||
throw 'No backward compatible adapter for modelVersion 1';
|
||||
} else {
|
||||
piskel = pskl.utils.Serializer.backwardDeserializer_(piskelData);
|
||||
piskel = pskl.utils.Serializer.backwardDeserializer_(data);
|
||||
}
|
||||
|
||||
return piskel;
|
||||
},
|
||||
|
||||
deserializeLayer : function (layerString) {
|
||||
var lData = JSON.parse(layerString);
|
||||
var layer = new pskl.model.Layer(lData.name);
|
||||
var layerData = JSON.parse(layerString);
|
||||
var layer = new pskl.model.Layer(layerData.name);
|
||||
// TODO : nasty trick to keep the whole loading process lazily synchronous
|
||||
// 1 - adding a fake frame so that the rendering can start
|
||||
layer.addFrame(new pskl.model.Frame(32,32));
|
||||
|
||||
lData.frames.forEach(function (serializedFrame) {
|
||||
// 2 - create an image to load the base64PNG representing the layer
|
||||
var base64PNG = layerData.base64PNG;
|
||||
var image = new Image();
|
||||
|
||||
// 3 - attach the onload callback that will be triggered asynchronously
|
||||
image.onload = function () {
|
||||
// 6 - remove the fake frame
|
||||
layer.removeFrameAt(0);
|
||||
|
||||
// 7 - extract the frames from the loaded image
|
||||
var frames = pskl.utils.LayerUtils.createFromImage(image, layerData.frameCount);
|
||||
|
||||
// 8 - add each image to the layer
|
||||
frames.forEach(function (frame) {
|
||||
layer.addFrame(pskl.model.Frame.fromPixelGrid(frame));
|
||||
});
|
||||
};
|
||||
|
||||
// 4 - set the source of the image
|
||||
image.src = base64PNG;
|
||||
|
||||
// 5 - return a pointer to the new layer instance, which at this point contains a fake frame
|
||||
return layer;
|
||||
},
|
||||
|
||||
deserializeLayer_v1 : function (layerString) {
|
||||
var layerData = JSON.parse(layerString);
|
||||
var layer = new pskl.model.Layer(layerData.name);
|
||||
layerData.frames.forEach(function (serializedFrame) {
|
||||
var frame = pskl.utils.Serializer.deserializeFrame(serializedFrame);
|
||||
layer.addFrame(frame);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user