Cleanup of saving/loading process

js/Constants.js

@@ -31,7 +31,17 @@ var Constants = {
   /*
    * Default entry point for piskel web service:
    */
-  PISKEL_SERVICE_URL: 'http://3.piskel-app.appspot.com',
+  STATIC : {
+    URL : {
+      SAVE : 'http://3.piskel-app.appspot.com/store',
+      GET : 'http://3.piskel-app.appspot.com/get'
+    }
+  },
+  APPENGINE : {
+    URL : {
+      SAVE : 'save'
+    }
+  },
   IMAGE_SERVICE_UPLOAD_URL : 'http://screenletstore.appspot.com/__/upload',
   IMAGE_SERVICE_GET_URL : 'http://screenletstore.appspot.com/img/',
 

js/app.js

@@ -73,20 +73,29 @@
       this.isStaticVersion = !pskl.appEngineToken_;
 
       if (this.isStaticVersion) {
-        var framesheetId = this.readFramesheetIdFromURL_();
+        this.finishInitStatic_();
-        if (framesheetId) {
-          $.publish(Events.SHOW_NOTIFICATION, [{
-            "content" : "Loading animation with id : [" + framesheetId + "]"
-          }]);
-          this.loadFramesheetFromService(framesheetId);
-        } else {
-          this.localStorageService.displayRestoreNotification();
-        }
       } else {
-        if (pskl.framesheetData_ && pskl.framesheetData_.content) {
+        this.finishInitAppEngine_();
-          this.piskelController.load(pskl.framesheetData_.content);
+      }
-          pskl.app.animationController.setFPS(pskl.framesheetData_.fps);
+    },
-        }
+
+    finishInitStatic_ : function () {
+      var framesheetId = this.readFramesheetIdFromURL_();
+      if (framesheetId) {
+        $.publish(Events.SHOW_NOTIFICATION, [{
+          "content" : "Loading animation with id : [" + framesheetId + "]"
+        }]);
+        this.loadFramesheetFromService(framesheetId);
+      } else {
+        this.localStorageService.displayRestoreNotification();
+      }
+    },
+
+    finishInitAppEngine_ : function () {
+      if (pskl.framesheetData_ && pskl.framesheetData_.content) {
+        var piskel = pskl.utils.Serializer.createPiskel(pskl.framesheetData_.content);
+        piskel.app.PiskelController.setPiskel(piskel);
+        pskl.app.animationController.setFPS(pskl.framesheetData_.fps);
       }
     },
 
@@ -143,12 +152,12 @@
 
     loadFramesheetFromService : function (frameId) {
       var xhr = new XMLHttpRequest();
-      xhr.open('GET', Constants.PISKEL_SERVICE_URL + '/get?l=' + frameId, true);
+      xhr.open('GET', Constants.STATIC.URL.GET + '?l=' + frameId, true);
       xhr.responseType = 'text';
-      var piskelController = this.piskelController;
       xhr.onload = function (e) {
         var res = JSON.parse(this.responseText);
-        piskelController.deserialize(JSON.stringify(res.framesheet));
+        var piskel = pskl.utils.Serializer.createPiskel(res.framesheet);
+        pskl.app.piskelController.setPiskel(piskel);
         pskl.app.animationController.setFPS(res.fps);
         $.publish(Events.HIDE_NOTIFICATION);
       };
@@ -160,55 +169,13 @@
       xhr.send();
     },
 
-    getFirstFrameAsPNGData_ : function () {
-      throw 'getFirstFrameAsPNGData_ not implemented';
-    },
-
-    // TODO(julz): Create package ?
     storeSheet : function (event) {
-      var xhr = new XMLHttpRequest();
-      var formData = new FormData();
-      formData.append('framesheet_content', this.piskelController.serialize());
-      formData.append('fps_speed', $('#preview-fps').val());
-
       if (this.isStaticVersion) {
-        // anonymous save on old app-engine backend
+        this.storeSheetStatic_();
-        xhr.open('POST', Constants.PISKEL_SERVICE_URL + "/store", true);
       } else {
-        // additional values only used with latest app-engine backend
+        this.storeSheetAppEngine_();
-        formData.append('name', $('#piskel-name').val());
-        formData.append('frames', this.piskelController.getFrameCount());
-
-        // Get image/png data for first frame
-        var firstFrame = this.piskelController.getFrameAt(0);
-        var frameRenderer = new pskl.rendering.CanvasRenderer(firstFrame, 1);
-        frameRenderer.drawTransparentAs('rgba(0,0,0,0)');
-        var firstFrameCanvas = frameRenderer.render().canvas;
-        formData.append('preview', firstFrameCanvas.toDataURL("image/png"));
-
-        var imageData = (new pskl.rendering.SpritesheetRenderer(this.piskelController)).renderAsImageDataSpritesheetPNG();
-        formData.append('framesheet', imageData);
-
-        xhr.open('POST', "save", true);
       }
 
-      xhr.onload = function(e) {
-        if (this.status == 200) {
-          if (pskl.app.isStaticVersion) {
-            var baseUrl = window.location.href.replace(window.location.search, "");
-            window.location.href = baseUrl + "?frameId=" + this.responseText;
-          } else {
-            $.publish(Events.SHOW_NOTIFICATION, [{"content": "Successfully saved !"}]);
-          }
-        } else {
-          this.onerror(e);
-        }
-      };
-      xhr.onerror = function(e) {
-        $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+this.status+")"}]);
-      };
-      xhr.send(formData);
-
       if(event) {
         event.stopPropagation();
         event.preventDefault();
@@ -216,8 +183,69 @@
       return false;
     },
 
+    storeSheetStatic_ : function () {
+      var xhr = new XMLHttpRequest();
+      var formData = new FormData();
+      formData.append('framesheet_content', this.piskelController.serialize());
+      formData.append('fps_speed', $('#preview-fps').val());
+
+      xhr.open('POST', Constants.STATIC.URL.SAVE, true);
+
+      xhr.onload = function(e) {
+        if (this.status == 200) {
+          var baseUrl = window.location.href.replace(window.location.search, "");
+          window.location.href = baseUrl + "?frameId=" + this.responseText;
+        } else {
+          this.onerror(e);
+        }
+      };
+      xhr.onerror = function(e) {
+        $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+this.status+")"}]);
+      };
+      xhr.send(formData);
+    },
+
+    storeSheetAppEngine_ : function () {
+      var xhr = new XMLHttpRequest();
+      var formData = new FormData();
+      formData.append('framesheet_content', this.piskelController.serialize());
+      formData.append('fps_speed', $('#preview-fps').val());
+      formData.append('name', $('#piskel-name').val());
+      formData.append('frames', this.piskelController.getFrameCount());
+      formData.append('preview', this.getFirstFrameAsPng());
+      formData.append('framesheet', this.getFramesheetAsPng());
+
+      xhr.open('POST', Constants.APPENGINE.URL.SAVE, true);
+
+      xhr.onload = function(e) {
+        if (this.status == 200) {
+          $.publish(Events.SHOW_NOTIFICATION, [{"content": "Successfully saved !"}]);
+        } else {
+          this.onerror(e);
+        }
+      };
+      xhr.onerror = function(e) {
+        $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+this.status+")"}]);
+      };
+      xhr.send(formData);
+    },
+
+    getFirstFrameAsPng : function () {
+      var firstFrame = this.piskelController.getFrameAt(0);
+      var frameRenderer = new pskl.rendering.CanvasRenderer(firstFrame, 1);
+      frameRenderer.drawTransparentAs('rgba(0,0,0,0)');
+      var firstFrameCanvas = frameRenderer.render().canvas;
+      return firstFrameCanvas.toDataURL("image/png");
+    },
+
+    getFramesheetAsPng : function () {
+      var renderer = new pskl.rendering.SpritesheetRenderer(this.piskelController);
+      var framesheetCanvas = renderer.render();
+      return framesheetCanvas.toDataURL("image/png");
+    },
+
     uploadAsSpritesheetPNG : function () {
-      var imageData = (new pskl.rendering.SpritesheetRenderer(this.piskelController)).renderAsImageDataSpritesheetPNG();
+      var imageData = this.getFramesheetAsPng();
       this.imageUploadService.upload(imageData, this.openWindow.bind(this));
     },
 

js/controller/PiskelController.js

@@ -2,7 +2,11 @@
   var ns = $.namespace('pskl.controller');
 
   ns.PiskelController = function (piskel) {
-    this.setPiskel(piskel);
+    if (piskel) {
+      this.setPiskel(piskel);
+    } else {
+      throw 'A piskel instance is mandatory for instanciating PiskelController';
+    }
   };
 
   ns.PiskelController.prototype.setPiskel = function (piskel) {
@@ -187,14 +191,4 @@
   ns.PiskelController.prototype.load = function (data) {
     this.deserialize(JSON.stringify(data));
   };
-
-  ns.PiskelController.prototype.deserialize = function (jsonStr) {
-    try {
-      var piskel = pskl.utils.Serializer.deserializePiskel(jsonStr);
-      this.setPiskel(piskel);
-    } catch (e) {
-      console.error('Failed to deserialize');
-      console.error(e.stack);
-    }
-  };
 })();

js/rendering/SpritesheetRenderer.js

@@ -6,13 +6,13 @@
     this.piskelController = piskelController;
   };
 
-  ns.SpritesheetRenderer.prototype.renderAsImageDataSpritesheetPNG = function () {
+  ns.SpritesheetRenderer.prototype.render = function () {
     var canvas = this.createCanvas_();
     for (var i = 0 ; i < this.piskelController.getFrameCount() ; i++) {
       var frame = this.piskelController.getFrameAt(i);
       this.drawFrameInCanvas_(frame, canvas, i * this.piskelController.getWidth(), 0);
     }
-    return canvas.toDataURL("image/png");
+    return canvas;
   };
 
   /**

js/utils/Serializer.js

@@ -25,11 +25,20 @@
       });
     },
 
-    deserializePiskel : function (json) {
+    deserializePiskel : function (piskelString) {
+      var piskelData = JSON.parse(piskelString);
+      return this.createPiskelFromData(piskelData);
+    },
+
+    /**
+     * Similar to deserializePiskel, but dealing directly with a parsed piskel
+     * @param  {Object} piskelData JSON.parse of a serialized piskel
+     * @return {Piskel} a piskel
+     */
+    createPiskel : function (piskelData) {
       var piskel = null;
-      var data = JSON.parse(json);
+      if (piskelData.modelVersion == Constants.MODEL_VERSION) {
-      if (data.modelVersion == Constants.MODEL_VERSION) {
+        var pData = piskelData.piskel;
-        var pData = data.piskel;
         piskel = new pskl.model.Piskel(pData.width, pData.height);
 
         pData.layers.forEach(function (serializedLayer) {
@@ -37,14 +46,14 @@
           piskel.addLayer(layer);
         });
       } else {
-        piskel = pskl.utils.Serializer.backwardDeserializer_(data);
+        piskel = pskl.utils.Serializer.backwardDeserializer_(piskelData);
       }
 
       return piskel;
     },
 
-    deserializeLayer : function (json) {
+    deserializeLayer : function (layerString) {
-      var lData = JSON.parse(json);
+      var lData = JSON.parse(layerString);
       var layer = new pskl.model.Layer(lData.name);
 
       lData.frames.forEach(function (serializedFrame) {
@@ -55,8 +64,8 @@
       return layer;
     },
 
-    deserializeFrame : function (json) {
+    deserializeFrame : function (frameString) {
-      var framePixelGrid = JSON.parse(json);
+      var framePixelGrid = JSON.parse(frameString);
       return pskl.model.Frame.fromPixelGrid(framePixelGrid);
     },