Merge branch 'master' into almost-eased-up

Author: Saksham Saxena

README.md

@@ -8,13 +8,13 @@ Using the original metaphor of a software sketchbook, p5.js has a full set of dr
 
 p5.js is a new interpretation, not an emulation or port, and it is in active development. An official editing environment is coming soon, as well as many more features!
 
-If you already know the basics of JS or Processing, the [p5.js overview](https://github.com/processing/p5.js/wiki/p5.js-overview) wiki page is a good place to start. The [frequently asked questions](https://github.com/processing/p5.js/wiki/Frequently-Asked-Questions) might also be helpful.
+If you already know the basics of JavaScript or Processing, the [p5.js overview](https://github.com/processing/p5.js/wiki/p5.js-overview) wiki page is a good place to start. The [frequently asked questions](https://github.com/processing/p5.js/wiki/Frequently-Asked-Questions) might also be helpful.
 
-If you have found a bug in the p5.js library, you can file it here under the [“issues” tab](https://github.com/processing/p5.js/issues).
+If you have found a bug in the p5.js library, you can file it here under the [“issues” tab](https://github.com/processing/p5.js/issues). An indicative template for reporting an issue is provided to assist you (and us!) better.
 
 ## p5.js library
 
-To use p5.js, you can [download the p5.js library here](http://p5js.org/download). If you are interested in the most recent, less stable version, you can clone this repository and run `grunt` from the command line to generate the library from source. See the [development](https://github.com/processing/p5.js/wiki/Development) wiki for more information about our build process.
+To use the complete p5.js library, you can [download it here](http://p5js.org/download). If you are interested in the most recent, less stable version, or even simply in (**new!**) certain components of p5.js, you can clone this repository and run `grunt` from the command line to generate the library from source. See the [development](https://github.com/processing/p5.js/wiki/Development#Setup) wiki for more information about our build process to generate the complete as well as selective library.	
 
 ## Issues
 

package.json

@@ -10,7 +10,7 @@
     "docs": "grunt yui",
     "test": "grunt"
   },
-  "version": "0.5.12",
+  "version": "0.5.13",
   "devDependencies": {
     "amdclean": "~0.3.3",
     "browserify": "^11.0.1",

src/core/error_helpers.js

@@ -58,19 +58,14 @@ function report(message, func, color) {
   }
   if (func.substring(0,4) === 'load'){
     console.log(
-      '%c> p5.js says: '+message+'%c'+
-      '[https://github.com/processing/p5.js/wiki/Local-server]',
-      'background-color:' + color + ';color:#FFF;',
-      'background-color:transparent;color:' + color +';',
-      'background-color:' + color + ';color:#FFF;',
-      'background-color:transparent;color:' + color +';'
+      '> p5.js says: '+message+
+      '[https://github.com/processing/p5.js/wiki/Local-server]'
     );
   }
   else{
     console.log(
-      '%c> p5.js says: '+message+'%c [http://p5js.org/reference/#p5/'+func+
-      ']', 'background-color:' + color + ';color:#FFF;',
-      'background-color:transparent;color:' + color +';'
+      '> p5.js says: '+message+' [http://p5js.org/reference/#p5/'+func+
+      ']'
     );
   }
 }
@@ -103,7 +98,7 @@ p5._friendlyFileLoadError = function (errorType, filePath) {
   var errorInfo = errorCases[ errorType ];
   var message = 'It looks like there was a problem' +
   ' loading your ' + errorInfo.fileType + '.' +
-  ' Try checking if the file path%c [' + filePath + '] %cis correct,' +
+  ' Try checking if the file path [' + filePath + '] is correct,' +
   (errorInfo.message || '') + ' or running a local server.';
   report(message, errorInfo.method, FILE_LOAD);
 };
@@ -239,7 +234,7 @@ p5._friendlyParamError = function (errorObj, func) {
       message = 'It looks like ' + func +
         '() received an empty variable in spot #' + errorObj.position +
         ' (zero-based index). If not intentional, this is often a problem' +
-        ' with scope: [link to scope].';
+        ' with scope: [https://p5js.org/examples/data-variable-scope.html].';
       report(message, func, ERR_PARAMS);
       break;
     case 'WRONG_CLASS':
@@ -259,21 +254,19 @@ p5._friendlyParamError = function (errorObj, func) {
 };
 function friendlyWelcome() {
   // p5.js brand - magenta: #ED225D
-  var astrixBgColor = 'transparent';
-  var astrixTxtColor = '#ED225D';
-  var welcomeBgColor = '#ED225D';
-  var welcomeTextColor = 'white';
+  //var astrixBgColor = 'transparent';
+  //var astrixTxtColor = '#ED225D';
+  //var welcomeBgColor = '#ED225D';
+  //var welcomeTextColor = 'white';
   console.log(
-  '%c    _ \n'+
+  '    _ \n'+
   ' /\\| |/\\ \n'+
   ' \\ ` \' /  \n'+
   ' / , . \\  \n'+
   ' \\/|_|\\/ '+
-  '\n\n%c> p5.js says: Welcome! '+
+  '\n\n> p5.js says: Welcome! '+
   'This is your friendly debugger. ' +
-  'To turn me off switch to using “p5.min.js”.',
-  'background-color:'+astrixBgColor+';color:' + astrixTxtColor +';',
-  'background-color:'+welcomeBgColor+';color:' + welcomeTextColor +';'
+  'To turn me off switch to using “p5.min.js”.'
   );
 }
 
@@ -392,12 +385,11 @@ function helpForMisusedAtTopLevelCode(e, log) {
     //   * Uncaught ReferenceError: PI is not defined  (Chrome)
 
     if (e.message && e.message.match('\\W?'+symbol.name+'\\W') !== null) {
-      log('%cDid you just try to use p5.js\'s ' + symbol.name +
+      log('Did you just try to use p5.js\'s ' + symbol.name +
           (symbol.type === 'function' ? '() ' : ' ') + symbol.type +
           '? If so, you may want to ' +
           'move it into your sketch\'s setup() function.\n\n' +
-          'For more details, see: ' + FAQ_URL,
-          'color: #B40033' /* Dark magenta */);
+          'For more details, see: ' + FAQ_URL);
       return true;
     }
   });

src/math/p5.Vector.js

@@ -636,7 +636,13 @@ p5.Vector.prototype.rotate = function (a) {
  * </div>
  */
 p5.Vector.prototype.angleBetween = function (v) {
-  var angle = Math.acos(this.dot(v) / (this.mag() * v.mag()));
+  var dotmagmag = this.dot(v) / (this.mag() * v.mag());
+  // Mathematically speaking: the dotmagmag variable will be between -1 and 1
+  // inclusive. Practically though it could be slightly outside this range due
+  // to floating-point rounding issues. This can make Math.acos return NaN.
+  //
+  // Solution: we'll clamp the value to the -1,1 range
+  var angle = Math.acos(Math.min(1, Math.max(-1, dotmagmag)));
   if (this.p5) {
     if (this.p5._angleMode === constants.DEGREES) {
       angle = polarGeometry.radiansToDegrees(angle);

test/unit/core/structure.js

@@ -14,6 +14,7 @@ suite('Structure', function() {
       //myp5.noLoop();
       var c0 = myp5.frameCount;
       myp5.noLoop();
+      myp5.ellipse(0, 0, 10, 10);
       var c1 = myp5.frameCount;
       assert.equal(c0, c1);
     });
@@ -22,6 +23,7 @@ suite('Structure', function() {
       myp5.noLoop();
       var c0 = myp5.frameCount;
       myp5.loop();
+      myp5.ellipse(0, 0, 10, 10);
       var c1 = myp5.frameCount;
       assert.notEqual(c0, c1);
     });

test/unit/math/p5.Vector.js

@@ -114,6 +114,35 @@ suite('p5.Vector', function() {
       assert.closeTo(v.z, 0, 0.001);
     });
   });
+
+  suite('p5.prototype.angleBetween()', function() {
+    test('should not trip on rounding issues in 2D space', function() {
+      var v1 = myp5.createVector(-11, -20);
+      var v2 = myp5.createVector(-5.5, -10);
+      expect(v1.angleBetween(v2)).to.be.closeTo(0, 0.00001);
+
+      var v3 = myp5.createVector(-11, -20);
+      var v4 = myp5.createVector(5.5, 10);
+      expect(v3.angleBetween(v4)).to.be.closeTo(180, 0.00001);
+    });
+
+    test('should not trip on rounding issues in 3D space', function() {
+      var v1 = myp5.createVector(1, 1.1, 1.2);
+      var v2 = myp5.createVector(2, 2.2, 2.4);
+
+      var angle = v1.angleBetween(v2);
+      expect(angle).to.be.closeTo(0, 0.00001);
+    });
+
+    test('should return NaN for zero vector', function() {
+      var v1 = myp5.createVector(0, 0, 0);
+      var v2 = myp5.createVector(2, 3, 4);
+
+      expect(v1.angleBetween(v2)).to.be.NaN; // jshint ignore:line
+      expect(v2.angleBetween(v1)).to.be.NaN; // jshint ignore:line
+    });
+
+  });
 });
 
 //  describe('set()', function() {