merging upstream changes

Author: therewasaguy

docs/js/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.12 December 01, 2014 */
+/*! p5.js v0.3.14 December 15, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -117,7 +117,8 @@ var core = function (require, shim, constants) {
         'touchstart': null,
         'touchmove': null,
         'touchend': null,
-        'resize': null
+        'resize': null,
+        'blur': null
       };
       this._loadingScreenId = 'p5_loading';
       this._start = function () {
@@ -561,6 +562,7 @@ var p5Element = function (require, core) {
     };
     p5.Element.prototype.mousePressed = function (fxn) {
       attachListener('mousedown', fxn, this);
+      attachListener('touchstart', fxn, this);
       return this;
     };
     p5.Element.prototype.mouseWheel = function (fxn) {
@@ -569,6 +571,7 @@ var p5Element = function (require, core) {
     };
     p5.Element.prototype.mouseReleased = function (fxn) {
       attachListener('mouseup', fxn, this);
+      attachListener('touchend', fxn, this);
       return this;
     };
     p5.Element.prototype.mouseClicked = function (fxn) {
@@ -577,6 +580,7 @@ var p5Element = function (require, core) {
     };
     p5.Element.prototype.mouseMoved = function (fxn) {
       attachListener('mousemove', fxn, this);
+      attachListener('touchmove', fxn, this);
       return this;
     };
     p5.Element.prototype.mouseOver = function (fxn) {
@@ -587,6 +591,21 @@ var p5Element = function (require, core) {
       attachListener('mouseout', fxn, this);
       return this;
     };
+    p5.Element.prototype.touchStarted = function (fxn) {
+      attachListener('touchstart', fxn, this);
+      attachListener('mousedown', fxn, this);
+      return this;
+    };
+    p5.Element.prototype.touchMoved = function (fxn) {
+      attachListener('touchmove', fxn, this);
+      attachListener('mousemove', fxn, this);
+      return this;
+    };
+    p5.Element.prototype.touchEnded = function (fxn) {
+      attachListener('touchend', fxn, this);
+      attachListener('mouseup', fxn, this);
+      return this;
+    };
     function attachListener(ev, fxn, ctx) {
       var f = fxn.bind(ctx);
       ctx.elt.addEventListener(ev, f, false);
@@ -1019,11 +1038,11 @@ var p5Image = function (require, core, filters) {
     };
     p5.Image.prototype.resize = function (width, height) {
       width = width || this.canvas.width;
-      height = width || this.canvas.height;
+      height = height || this.canvas.height;
       var tempCanvas = document.createElement('canvas');
       tempCanvas.width = width;
       tempCanvas.height = height;
-      tempCanvas.getContext('2d').drawImage(this.canvas, 0, 0, this.canvas.width, this.canvas.height, 0, 0, tempCanvas.width, tempCanvas.width);
+      tempCanvas.getContext('2d').drawImage(this.canvas, 0, 0, this.canvas.width, this.canvas.height, 0, 0, tempCanvas.width, tempCanvas.height);
       this.canvas.width = this.width = width;
       this.canvas.height = this.height = height;
       this.drawingContext.drawImage(tempCanvas, 0, 0, width, height, 0, 0, width, height);
@@ -2105,6 +2124,14 @@ var environment = function (require, core, constants) {
         }
       }
     };
+    p5.prototype.devicePixelScaling = function (val) {
+      if (val) {
+        this._pixelDensity = window.devicePixelRatio || 1;
+      } else {
+        this._pixelDensity = 1;
+      }
+      this.resizeCanvas(this.width, this.height);
+    };
     function launchFullscreen(element) {
       var enabled = document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled || document.msFullscreenEnabled;
       if (!enabled) {
@@ -2129,6 +2156,26 @@ var environment = function (require, core, constants) {
         document.webkitExitFullscreen();
       }
     }
+    p5.prototype.getURL = function () {
+      return location.href;
+    };
+    p5.prototype.getURLPath = function () {
+      return location.pathname.split('/').filter(function (v) {
+        return v !== '';
+      });
+    };
+    p5.prototype.getURLParams = function () {
+      var re = /[?&]([^&=]+)(?:[&=])([^&=]+)/gim;
+      var m;
+      var v = {};
+      while ((m = re.exec(location.search)) != null) {
+        if (m.index === re.lastIndex) {
+          re.lastIndex++;
+        }
+        v[m[1]] = m[2];
+      }
+      return v;
+    };
     return p5;
   }({}, core, constants);
 var imageimage = function (require, core, constants) {
@@ -2322,7 +2369,8 @@ var imagepixels = function (require, core, filters, p5Color) {
       } else {
         throw new Error('Signature not supported');
       }
-      this.drawingContext.drawImage(srcImage.canvas, sx, sy, sw, sh, dx, dy, dw, dh);
+      var s = srcImage.canvas.width / srcImage.width;
+      this.drawingContext.drawImage(srcImage.canvas, s * sx, s * sy, s * sw, s * sh, dx, dy, dw, dh);
     };
     p5.prototype.filter = function (operation, value) {
       Filters.apply(this.canvas, Filters[operation.toLowerCase()], value);
@@ -2995,12 +3043,68 @@ var inputfiles = function (require, core, reqwest) {
     p5.prototype.selectInput = function () {
       throw 'not yet implemented';
     };
+    p5.prototype.httpGet = function () {
+      var args = Array.prototype.slice.call(arguments);
+      args.push('GET');
+      p5.prototype.httpDo.apply(this, args);
+    };
+    p5.prototype.httpPost = function () {
+      var args = Array.prototype.slice.call(arguments);
+      args.push('POST');
+      p5.prototype.httpDo.apply(this, args);
+    };
+    p5.prototype.httpDo = function () {
+      var method = 'GET';
+      var path = arguments[0];
+      var data = {};
+      var type = '';
+      var callback;
+      for (var i = 1; i < arguments.length; i++) {
+        var a = arguments[i];
+        if (typeof a === 'string') {
+          if (a === 'GET' || a === 'POST' || a === 'PUT') {
+            method = a;
+          } else {
+            type = a;
+          }
+        } else if (typeof a === 'object') {
+          data = a;
+        } else if (typeof a === 'function') {
+          callback = a;
+        }
+      }
+      if (type === '') {
+        if (path.indexOf('json') !== -1) {
+          type = 'json';
+        } else if (path.indexOf('xml') !== -1) {
+          type = 'xml';
+        } else {
+          type = 'text';
+        }
+      }
+      reqwest({
+        url: path,
+        method: method,
+        data: data,
+        type: type,
+        crossOrigin: true,
+        success: function (resp) {
+          if (typeof callback !== 'undefined') {
+            if (type === 'text') {
+              callback(resp.response);
+            } else {
+              callback(resp);
+            }
+          }
+        }
+      });
+    };
     return p5;
   }({}, core, reqwest);
 var inputkeyboard = function (require, core) {
     'use strict';
     var p5 = core;
-    p5.prototype._downKeys = [];
+    var downKeys = {};
     p5.prototype.isKeyPressed = false;
     p5.prototype.keyIsPressed = false;
     p5.prototype.key = '';
@@ -3009,9 +3113,7 @@ var inputkeyboard = function (require, core) {
       this._setProperty('isKeyPressed', true);
       this._setProperty('keyIsPressed', true);
       this._setProperty('keyCode', e.which);
-      if (this._downKeys.indexOf(e.which) < 0) {
-        this._downKeys.push(e.which);
-      }
+      downKeys[e.which] = true;
       var key = String.fromCharCode(e.which);
       if (!key) {
         key = e.which;
@@ -3029,9 +3131,7 @@ var inputkeyboard = function (require, core) {
       var keyReleased = this.keyReleased || window.keyReleased;
       this._setProperty('isKeyPressed', false);
       this._setProperty('keyIsPressed', false);
-      if (this._downKeys.indexOf(e.which) >= 0) {
-        this._downKeys.splice(this._downKeys.indexOf(e.which), 1);
-      }
+      downKeys[e.which] = false;
       var key = String.fromCharCode(e.which);
       if (!key) {
         key = e.which;
@@ -3056,8 +3156,11 @@ var inputkeyboard = function (require, core) {
         }
       }
     };
+    p5.prototype.onblur = function (e) {
+      downKeys = {};
+    };
     p5.prototype.keyIsDown = function (code) {
-      return this._downKeys.indexOf(code) >= 0;
+      return downKeys[code];
     };
     return p5;
   }({}, core);
@@ -4099,6 +4202,7 @@ var shape2d_primitives = function (require, core, canvas, constants) {
       var ctx = this.drawingContext;
       var vals = canvas.arcModeAdjust(x, y, width, height, this._ellipseMode);
       var radius = vals.h > vals.w ? vals.h / 2 : vals.w / 2, xScale = vals.h > vals.w ? vals.w / vals.h : 1, yScale = vals.h > vals.w ? 1 : vals.h / vals.w;
+      ctx.save();
       ctx.scale(xScale, yScale);
       ctx.beginPath();
       ctx.arc(vals.x, vals.y, radius, start, stop);
@@ -4117,6 +4221,7 @@ var shape2d_primitives = function (require, core, canvas, constants) {
       if (this._doStroke && mode !== constants.OPEN && mode !== undefined) {
         ctx.stroke();
       }
+      ctx.restore();
       return this;
     };
     p5.prototype.ellipse = function (x, y, w, h) {
@@ -4923,58 +5028,56 @@ var typographyattributes = function (require, core, constants) {
     };
     return p5;
   }({}, core, constants);
-var typographyloading_displaying = function (require, core, canvas) {
+var typographyloading_displaying = function (require, core) {
     'use strict';
     var p5 = core;
-    var canvas = canvas;
-    p5.prototype.text = function () {
-      if (arguments.length === 3) {
-        if (this._doFill) {
-          this.drawingContext.fillText(arguments[0], arguments[1], arguments[2]);
-        }
-        if (this._doStroke) {
-          this.drawingContext.strokeText(arguments[0], arguments[1], arguments[2]);
-        }
-      } else if (arguments.length === 5) {
-        var words = arguments[0].split(' ');
+    p5.prototype.text = function (str, x, y, maxWidth, maxHeight) {
+      if (typeof str !== 'string') {
+        return;
+      }
+      if (typeof maxWidth !== 'undefined') {
+        y += this._textLeading;
+        maxHeight += y;
+      }
+      str = str.replace(/(\t)/g, '  ');
+      var cars = str.split('\n');
+      for (var ii = 0; ii < cars.length; ii++) {
         var line = '';
-        var vals = canvas.modeAdjust(arguments[1], arguments[2], arguments[3], arguments[4], this._rectMode);
-        var y = vals.y + this._textLeading;
+        var words = cars[ii].split(' ');
         for (var n = 0; n < words.length; n++) {
-          var testLine = line + words[n] + ' ';
-          var metrics = this.drawingContext.measureText(testLine);
-          var testWidth = metrics.width;
-          if (y > vals.y + vals.h) {
-            break;
-          } else if (testWidth > vals.w && n > 0) {
-            if (this._doFill) {
-              this.drawingContext.fillText(line, vals.x, y);
-            }
-            if (this._doStroke) {
-              this.drawingContext.strokeText(line, vals.x, y);
+          if (y + this._textLeading <= maxHeight || typeof maxHeight === 'undefined') {
+            var testLine = line + words[n] + ' ';
+            var metrics = this.drawingContext.measureText(testLine);
+            var testWidth = metrics.width;
+            if (typeof maxWidth !== 'undefined' && testWidth > maxWidth) {
+              if (this._doFill) {
+                this.drawingContext.fillText(line, x, y);
+              }
+              if (this._doStroke) {
+                this.drawingContext.strokeText(line, x, y);
+              }
+              line = words[n] + ' ';
+              y += this._textLeading;
+            } else {
+              line = testLine;
             }
-            line = words[n] + ' ';
-            y += this._textLeading;
-          } else {
-            line = testLine;
           }
         }
-        if (y <= vals.y + vals.h) {
-          if (this._doFill) {
-            this.drawingContext.fillText(line, vals.x, y);
-          }
-          if (this._doStroke) {
-            this.drawingContext.strokeText(line, vals.x, y);
-          }
+        if (this._doFill) {
+          this.drawingContext.fillText(line, x, y);
         }
+        if (this._doStroke) {
+          this.drawingContext.strokeText(line, x, y);
+        }
+        y += this._textLeading;
       }
     };
     p5.prototype.textFont = function (str) {
       this._setProperty('_textFont', str);
       this._applyTextProperties();
     };
     return p5;
-  }({}, core, canvas);
+  }({}, core);
 var src_app = function (require, core, p5Color, p5Element, p5Graphics, p5Image, p5Vector, p5TableRow, p5Table, colorcreating_reading, colorsetting, constants, dataconversion, dataarray_functions, datastring_functions, environment, imageimage, imageloading_displaying, imagepixels, inputfiles, inputkeyboard, inputmouse, inputtime_date, inputtouch, mathmath, mathcalculation, mathrandom, mathnoise, mathtrigonometry, outputfiles, outputimage, outputtext_area, renderingrendering, shape2d_primitives, shapeattributes, shapecurves, shapevertex, structure, transform, typographyattributes, typographyloading_displaying) {
     'use strict';
     var p5 = core;

docs/js/p5.min.js

@@ -1,4 +1,4 @@
-/*! p5.dom.js v0.1.8 December 5, 2014 */
+/*! p5.dom.js v0.1.9 December 10, 2014 */
 /**
  * <p>The web is much more than just canvas and p5.dom makes it easy to interact 
  * with other HTML5 objects, including text, hyperlink, image, input, video, 
@@ -63,7 +63,7 @@ var p5DOM = (function(){
     var res = document.getElementsByClassName(e);
     if (res) {
       for (var j = 0; j < res.length; j++) {
-        var obj = wrapElement(res);
+        var obj = wrapElement(res[j]);
         arr.push(obj);
       }
     }