moving update pcoords calls back into updatecoords from draw issue #367

Author: lauren mccarthy

examples/p5.Image/saving-images.js

@@ -8,7 +8,7 @@ function setup() {
 
     setTimeout(function(){
       console.log("Save image")
-      save(img, "unicorn.png");
+      save(img, "unicorn.jpeg");
     }, 1000);
 
   });

lib/p5.js

@@ -199,8 +199,6 @@ var core = function (require, shim, constants) {
             f.call(this);
           });
           userDraw();
-          this._updatePMouseCoords();
-          this._updatePTouchCoords();
           this._registeredMethods.post.forEach(function (f) {
             f.call(this);
           });
@@ -2956,6 +2954,7 @@ var inputmouse = function (require, core, constants) {
     p5.prototype.mouseIsPressed = false;
     p5.prototype.isMousePressed = false;
     p5.prototype._updateMouseCoords = function (e) {
+      this._updatePMouseCoords();
       if (e.type === 'touchstart' || e.type === 'touchmove') {
         this._setProperty('mouseX', this.touchX);
         this._setProperty('mouseY', this.touchY);
@@ -3111,6 +3110,7 @@ var inputtouch = function (require, core) {
     p5.prototype.ptouchY = 0;
     p5.prototype.touches = [];
     p5.prototype._updateTouchCoords = function (e) {
+      this._updatePTouchCoords();
       if (e.type === 'mousedown' || e.type === 'mousemove') {
         this._setProperty('touchX', this.mouseX);
         this._setProperty('touchY', this.mouseY);
@@ -3587,7 +3587,7 @@ var outputfiles = function (require, core) {
           } else if (args[0] instanceof p5.Table) {
             p5.prototype.saveTable(args[0], args[1], args[2], args[3]);
           } else if (args[0] instanceof p5.Image) {
-            p5.prototype.saveCanvas(args[0].canvas, args[1], args[2]);
+            p5.prototype.saveCanvas(args[0].canvas, args[1]);
           } else if (args[0] instanceof p5.SoundFile) {
             p5.prototype.saveSound(args[0], args[1], args[2], args[3]);
           } else if (args[0] instanceof Object) {
@@ -3726,11 +3726,12 @@ var outputfiles = function (require, core) {
       if (!extension) {
         extension = '';
       }
+      if (!filename) {
+        filename = 'untitled';
+      }
       var ext = '';
-      if (filename) {
+      if (filename && filename.indexOf('.') > -1) {
         ext = filename.split('.').pop();
-      } else {
-        filename = 'untitled';
       }
       if (extension) {
         if (ext !== extension) {
@@ -3743,6 +3744,7 @@ var outputfiles = function (require, core) {
         ext
       ];
     }
+    p5.prototype._checkFileExtension = _checkFileExtension;
     p5.prototype._isSafari = function () {
       var x = Object.prototype.toString.call(window.HTMLElement);
       return x.indexOf('Constructor') > 0;
@@ -3757,6 +3759,12 @@ var outputimage = function (require, core) {
     var p5 = core;
     var frames = [];
     p5.prototype.saveCanvas = function (_cnv, filename, extension) {
+      if (!extension) {
+        extension = p5.prototype._checkFileExtension(filename, extension)[1];
+        if (extension === '') {
+          extension = 'png';
+        }
+      }
       var cnv;
       if (_cnv) {
         cnv = _cnv;
@@ -3772,7 +3780,7 @@ var outputimage = function (require, core) {
         window.location.href = cnv.toDataURL();
       } else {
         var mimeType;
-        if (!extension) {
+        if (typeof extension === 'undefined') {
           extension = 'png';
           mimeType = 'image/png';
         } else {

lib/p5.min.js

@@ -280,8 +280,8 @@ define(function (require) {
           f.call(this);
         });
         userDraw();
-        this._updatePMouseCoords();
-        this._updatePTouchCoords();
+        // this._updatePMouseCoords();
+        // this._updatePTouchCoords();
         // call any registered post functions
         this._registeredMethods.post.forEach(function(f) {
           f.call(this);

src/core/core.js

@@ -101,6 +101,7 @@ define(function (require) {
   p5.prototype.isMousePressed = false; // both are supported
 
   p5.prototype._updateMouseCoords = function(e) {
+    this._updatePMouseCoords();
     if(e.type === 'touchstart' || e.type === 'touchmove') {
       this._setProperty('mouseX', this.touchX);
       this._setProperty('mouseY', this.touchY);

src/input/mouse.js

@@ -61,6 +61,7 @@ define(function (require) {
   p5.prototype.touches = [];
 
   p5.prototype._updateTouchCoords = function(e) {
+    this._updatePTouchCoords();
     if(e.type === 'mousedown' || e.type === 'mousemove'){
       this._setProperty('touchX', this.mouseX);
       this._setProperty('touchY', this.mouseY);

src/input/touch.js

@@ -215,7 +215,7 @@ define(function (require) {
           p5.prototype.saveTable(args[0], args[1], args[2], args[3]);
         }
         else if (args[0] instanceof p5.Image) {
-          p5.prototype.saveCanvas(args[0].canvas, args[1], args[2]);
+          p5.prototype.saveCanvas(args[0].canvas, args[1]);
         }
         else if (args[0] instanceof p5.SoundFile) {
           p5.prototype.saveSound(args[0], args[1], args[2], args[3]);
@@ -520,12 +520,13 @@ define(function (require) {
     if (!extension) {
       extension = '';
     }
+    if (!filename) {
+      filename = 'untitled';
+    }
     var ext = '';
     // make sure the file will have a name, see if filename needs extension
-    if (filename) {
+    if (filename && filename.indexOf('.') > -1) {
       ext = filename.split('.').pop();
-    } else {
-      filename = 'untitled';
     }
     // append extension if it doesn't exist
     if (extension) {
@@ -536,6 +537,7 @@ define(function (require) {
     }
     return [filename, ext];
   }
+  p5.prototype._checkFileExtension = _checkFileExtension;
 
   /**
    *  Returns true if the browser is Safari, false if not.

src/output/files.js

@@ -17,6 +17,12 @@ define(function (require) {
    *                             specific html5 canvas (optional).
    */
   p5.prototype.saveCanvas = function(_cnv, filename, extension) {
+    if (!extension) {
+      extension = p5.prototype._checkFileExtension(filename, extension)[1];
+      if (extension === '') {
+        extension = 'png';
+      }
+    }
     var cnv;
     if (_cnv) {
       cnv = _cnv;
@@ -33,7 +39,7 @@ define(function (require) {
       window.location.href = cnv.toDataURL();
     } else {
       var mimeType;
-      if (!extension) {
+      if (typeof(extension) === 'undefined') {
         extension = 'png';
         mimeType = 'image/png';
       }