Merge branch 'master' of github.com:processing/p5.js

Author: Lauren McCarthy

src/core/environment.js

@@ -58,7 +58,11 @@ if (window.console && console.log) {
         console.log.apply(console, arguments);
       } else {
         var newArgs = JSON.parse(JSON.stringify(args));
-        console.log(newArgs);
+        if (JSON.stringify(newArgs)==='{}'){
+          console.log(args);
+        } else {
+          console.log(newArgs);
+        }
       }
     } catch(err) {
       console.log(args);

src/core/p5.Graphics.js

@@ -25,20 +25,20 @@ p5.Graphics = function(w, h, renderer, pInst) {
 
   var r = renderer || constants.P2D;
 
-  var c = document.createElement('canvas');
+  this.canvas = document.createElement('canvas');
   var node = this._userNode || document.body;
-  node.appendChild(c);
+  node.appendChild(this.canvas);
 
-  p5.Element.call(this, c, pInst, false);
+  p5.Element.call(this, this.canvas, pInst, false);
   this._styles = [];
   this.width = w;
   this.height = h;
   this._pixelDensity = pInst._pixelDensity;
 
   if (r === constants.WEBGL) {
-    this._renderer = new p5.RendererGL(c, this, false);
+    this._renderer = new p5.RendererGL(this.canvas, this, false);
   } else {
-    this._renderer = new p5.Renderer2D(c, this, false);
+    this._renderer = new p5.Renderer2D(this.canvas, this, false);
   }
 
   this._renderer.resize(w, h);

src/math/p5.Vector.js

@@ -625,6 +625,32 @@ p5.Vector.prototype.rotate = function (a) {
   return this;
 };
 
+/**
+ * Calculates and returns the angle (in radians) between two vectors.
+ * @method angleBetween
+ * @param  {p5.Vector}    the x, y, and z components of a p5.Vector
+ * @return {Number}       the angle between (in radians)
+ * @example
+ * <div class="norender">
+ * <code>
+ * var v1 = createVector(1, 0, 0);
+ * var v2 = createVector(0, 1, 0);
+ *
+ * var angle = v1.angleBetween(v2);
+ * // angle is PI/2
+ * </code>
+ * </div>
+ */
+p5.Vector.prototype.angleBetween = function (v) {
+  var angle = Math.acos(this.dot(v) / (this.mag() * v.mag()));
+  if (this.p5) {
+    if (this.p5._angleMode === constants.DEGREES) {
+      angle = polarGeometry.radiansToDegrees(angle);
+    }
+  }
+  return angle;
+};
+
 /**
  * Linear interpolate the vector to another vector
  *
@@ -1011,34 +1037,6 @@ p5.Vector.lerp = function (v1, v2, amt, target) {
   return target;
 };
 
-/**
- * Calculates and returns the angle (in radians) between two vectors.
- * @method angleBetween
- * @static
- * @param  {p5.Vector} v1 the x, y, and z components of a p5.Vector
- * @param  {p5.Vector} v2 the x, y, and z components of a p5.Vector
- * @return {Number}       the angle between (in radians)
- * @example
- * <div class="norender">
- * <code>
- * var v1 = createVector(1, 0, 0);
- * var v2 = createVector(0, 1, 0);
- *
- * var angle = p5.Vector.angleBetween(v1, v2);
- * // angle is PI/2
- * </code>
- * </div>
- */
-p5.Vector.angleBetween = function (v1, v2) {
-  var angle = Math.acos(v1.dot(v2) / (v1.mag() * v2.mag()));
-  if (this.p5) {
-    if (this.p5._angleMode === constants.DEGREES) {
-      angle = polarGeometry.radiansToDegrees(angle);
-    }
-  }
-  return angle;
-};
-
 /**
  * @static
  */