Merge remote-tracking branch 'processing/master'

Author: matthewkaney

lib/addons/p5.dom.js

@@ -980,8 +980,8 @@
     // set width and height onload metadata
     elt.addEventListener('loadedmetadata', function() {
       elt.play();
-      c.width = elt.width = elt.videoWidth;
-      c.height = elt.height = elt.videoHeight;
+      c.width = elt.videoWidth = elt.width;
+      c.height = elt.videoHeight = elt.height;
       c.loadedmetadata = true;
     });
     return c;
@@ -1423,7 +1423,7 @@
    * @example
    * <div class='norender'><code>
    * var div = createDiv('div');
-   * div.attribute("display", "none");
+   * div.style("display", "none");
    * div.show(); // turns display to block
    * </code></div>
    */
@@ -1766,7 +1766,11 @@
   p5.MediaElement.prototype.get = function(x, y, w, h){
     if (this.loadedmetadata) { // wait for metadata
       return p5.Renderer2D.prototype.get.call(this, x, y, w, h);
-    } else return [0, 0, 0, 255];
+    } else if (!x) {
+      return new p5.Image(1, 1);
+    } else {
+      return [0, 0, 0, 255];
+    }
   };
   p5.MediaElement.prototype.set = function(x, y, imgOrCol){
     if (this.loadedmetadata) { // wait for metadata

src/app.js

@@ -46,18 +46,18 @@ require('./core/transform');
 require('./typography/attributes');
 require('./typography/loading_displaying');
 
-require('./3d/p5.Renderer3D');
-require('./3d/p5.Geometry');
-require('./3d/p5.Renderer3D.Retained');
-require('./3d/p5.Renderer3D.Immediate');
-require('./3d/primitives');
-require('./3d/loading');
-require('./3d/p5.Matrix');
-require('./3d/material');
-require('./3d/light');
-require('./3d/shader');
-require('./3d/camera');
-require('./3d/interaction');
+require('./webgl/p5.RendererGL');
+require('./webgl/p5.Geometry');
+require('./webgl/p5.RendererGL.Retained');
+require('./webgl/p5.RendererGL.Immediate');
+require('./webgl/primitives');
+require('./webgl/loading');
+require('./webgl/p5.Matrix');
+require('./webgl/material');
+require('./webgl/light');
+require('./webgl/shader');
+require('./webgl/camera');
+require('./webgl/interaction');
 
 /**
  * _globalInit

src/core/2d_primitives.js

@@ -123,14 +123,15 @@ p5.prototype.arc = function(x, y, w, h, start, stop, mode) {
 /**
  * Draws an ellipse (oval) to the screen. An ellipse with equal width and
  * height is a circle. By default, the first two parameters set the location,
- * and the third and fourth parameters set the shape's width and height. The
- * origin may be changed with the ellipseMode() function.
+ * and the third and fourth parameters set the shape's width and height. If
+ * no height is specified, the value of width is used for both the width and
+ * height. The origin may be changed with the ellipseMode() function.
  *
  * @method ellipse
  * @param  {Number} x x-coordinate of the ellipse.
  * @param  {Number} y y-coordinate of the ellipse.
  * @param  {Number} w width of the ellipse.
- * @param  {Number} h height of the ellipse.
+ * @param  {Number} [h] height of the ellipse.
  * @return {p5}       the p5 object
  * @example
  * <div>
@@ -145,14 +146,18 @@ p5.prototype.arc = function(x, y, w, h, start, stop, mode) {
  * @param {Number} y
  * @param {Number} z z-coordinate of the ellipse
  * @param {Number} w
- * @param {Number} h
+ * @param {Number} [h]
  * @return {p5}
  */
 p5.prototype.ellipse = function() {
   var args = new Array(arguments.length);
   for (var i = 0; i < args.length; ++i) {
     args[i] = arguments[i];
   }
+  // Duplicate 3rd argument if onl 3 given.
+  if (args.length === 3) {
+    args.push(args[2]);
+  }
   if(this._renderer.isP3D){
     // p5 supports negative width and heights for ellipses
     if (args[3] < 0){args[3] = Math.abs(args[3]);}
@@ -314,9 +319,17 @@ p5.prototype.point = function() {
  */
 /**
  * @method quad
+ * @param {Number} x1
+ * @param {Number} y1
  * @param {Number} z1 the z-coordinate of the first point
+ * @param {Number} x2
+ * @param {Number} y2
  * @param {Number} z2 the z-coordinate of the second point
+ * @param {Number} x3
+ * @param {Number} y3
  * @param {Number} z3 the z-coordinate of the third point
+ * @param {Number} x4
+ * @param {Number} y4
  * @param {Number} z4 the z-coordinate of the fourth point
  * @return {p5} the p5 object
  */
@@ -405,7 +418,15 @@ p5.prototype.quad = function() {
 */
 /**
 * @method rect
+* @param  {Number} x
+* @param  {Number} y
 * @param  {Number} z  z-coordinate of the rectangle.
+* @param  {Number} w
+* @param  {Number} h
+* @param  {Number} [tl]
+* @param  {Number} [tr]
+* @param  {Number} [br]
+* @param  {Number} [bl]
 * @return {p5}          the p5 object.
 */
 p5.prototype.rect = function () {

src/core/core.js

@@ -335,7 +335,8 @@ var p5 = function(sketch, node, sync) {
     if (!this._loop ||
         time_since_last >= target_time_between_frames - epsilon) {
 
-      //mandatory update values(matrixs and stack) for 3d
+      //mandatory update values(matrixs and stack)
+      this.resetMatrix();
       if(this._renderer.isP3D){
         this._renderer._update();
       }

src/core/p5.Graphics.js

@@ -36,7 +36,7 @@ p5.Graphics = function(w, h, renderer, pInst) {
   this._pixelDensity = pInst._pixelDensity;
 
   if (r === constants.WEBGL) {
-    this._renderer = new p5.Renderer3D(c, this, false);
+    this._renderer = new p5.RendererGL(c, this, false);
   } else {
     this._renderer = new p5.Renderer2D(c, this, false);
   }

src/core/p5.Renderer2D.js

@@ -213,20 +213,19 @@ p5.Renderer2D.prototype.get = function(x, y, w, h) {
   var ctx = this._pInst || this;
 
   var pd = ctx._pixelDensity;
-
-  this.loadPixels.call(ctx);
+  ctx.loadPixels();
 
   // round down to get integer numbers
   x = Math.floor(x);
   y = Math.floor(y);
 
   if (w === 1 && h === 1){
-
+    var startPoint = pd*pd*4*(y*this.width+x);
     return [
-      ctx.pixels[pd*4*(y*this.width+x)],
-      ctx.pixels[pd*(4*(y*this.width+x)+1)],
-      ctx.pixels[pd*(4*(y*this.width+x)+2)],
-      ctx.pixels[pd*(4*(y*this.width+x)+3)]
+      ctx.pixels[startPoint],
+      ctx.pixels[startPoint+1],
+      ctx.pixels[startPoint+2],
+      ctx.pixels[startPoint+3]
     ];
   } else {
     var sx = x * pd;
@@ -1106,7 +1105,7 @@ p5.Renderer2D.prototype.text = function (str, x, y, maxWidth, maxHeight) {
       case constants.BOTTOM:
         y += (maxHeight - totalHeight);
         break;
-      case constants._CTX_MIDDLE:
+      case constants._CTX_MIDDLE: // CENTER?
         y += (maxHeight - totalHeight) / 2;
         break;
       case constants.BASELINE:
@@ -1140,8 +1139,8 @@ p5.Renderer2D.prototype.text = function (str, x, y, maxWidth, maxHeight) {
     }
   }
   else {
-    //offset to account for centering multiple lines of text
-    var offset = ((cars.length)*0.5-0.5)*p.textLeading();
+    // offset to account for vertically centering multiple lines of text
+    var offset = ((cars.length * 0.5) - 0.5) * p.textLeading(); // see #1410
 
     for (jj = 0; jj < cars.length; jj++) {
 

src/core/rendering.js

@@ -8,7 +8,7 @@ var p5 = require('./core');
 var constants = require('./constants');
 require('./p5.Graphics');
 require('./p5.Renderer2D');
-require('../3d/p5.Renderer3D');
+require('../webgl/p5.RendererGL');
 var defaultId = 'defaultCanvas0'; // this gets set again in createCanvas
 
 /**
@@ -94,7 +94,7 @@ p5.prototype.createCanvas = function(w, h, renderer) {
   // Init our graphics renderer
   //webgl mode
   if (r === constants.WEBGL) {
-    this._setProperty('_renderer', new p5.Renderer3D(c, this, true));
+    this._setProperty('_renderer', new p5.RendererGL(c, this, true));
     this._isdefaultGraphics = true;
   }
   //P2D mode

src/core/structure.js

@@ -283,7 +283,6 @@ p5.prototype.redraw = function () {
   var userSetup = this.setup || window.setup;
   var userDraw = this.draw || window.draw;
   if (typeof userDraw === 'function') {
-    this.resetMatrix.bind(this);
     if (typeof userSetup === 'undefined') {
       this.scale(this._pixelDensity, this._pixelDensity);
     }

src/io/p5.Table.js

@@ -407,17 +407,50 @@ p5.Table.prototype.matchRow = function(regexp, column) {
 };
 
 /**
- *  Finds the first row in the Table that matches the regular
- *  expression provided, and returns a reference to that row.
- *  Even if multiple rows are possible matches, only the first
- *  matching row is returned. The column to search may be specified
- *  by either its ID or title.
+ *  Finds the rows in the Table that match the regular expression provided,
+ *  and returns references to those rows. Returns an array, so for must be
+ *  used to iterate through all the rows, as shown in the example. The
+ *  column to search may be specified by either its ID or title.
  *
  *  @method  matchRows
  *  @param  {String} regexp The regular expression to match
  *  @param  {String|Number} [column] The column ID (number) or
  *                                   title (string)
  *  @return {Array}        An Array of TableRow objects
+ *  @example
+ *  var table;
+ *
+ *  function setup() {
+ *
+ *    table = new p5.Table();
+ *
+ *    table.addColumn('name');
+ *    table.addColumn('type');
+ *
+ *    var newRow = table.addRow();
+ *    newRow.setString('name', 'Lion');
+ *    newRow.setString('type', 'Mammal');
+ *
+ *    newRow = table.addRow();
+ *    newRow.setString('name', 'Snake');
+ *    newRow.setString('type', 'Reptile');
+ *
+ *    newRow = table.addRow();
+ *    newRow.setString('name', 'Mosquito');
+ *    newRow.setString('type', 'Insect');
+ *
+ *    newRow = table.addRow();
+ *    newRow.setString('name', 'Lizard');
+ *    newRow.setString('type', 'Reptile');
+ *
+ *    var rows = table.matchRows('R.*', 'type');
+ *    for (var i = 0; i < rows.length; i++) {
+ *      println(rows[i].getString('name') + ': ' + rows[i].getString('type'));
+ *    }
+ *  }
+ *  // Sketch prints:
+ *  // Snake: Reptile
+ *  // Lizard: Reptile
  */
 p5.Table.prototype.matchRows = function(regexp, column) {
   var ret = [];

src/math/p5.Vector.js

@@ -347,7 +347,7 @@ p5.Vector.prototype.div = function (n) {
  * <div class="norender">
  * <code>
  * var v = createVector(20.0, 30.0, 40.0);
- * var m = v.mag(10);
+ * var m = v.mag();
  * print(m); // Prints "53.85164807134504"
  * </code>
  * </div>