simplifying print function closes #2206

Author: Lauren McCarthy

src/core/environment.js

@@ -19,58 +19,33 @@ p5.prototype._targetFrameRate = 60;
 
 var _windowPrint = window.print;
 
-
-if (window.console && console.log) {
-  /**
-   * The print() function writes to the console area of your browser.
-   * This function is often helpful for looking at the data a program is
-   * producing. This function creates a new line of text for each call to
-   * the function. Individual elements can be
-   * separated with quotes ("") and joined with the addition operator (+).
-   * <br><br>
-   * While print() is similar to console.log(), it does not directly map to
-   * it in order to simulate easier to understand behavior than
-   * console.log(). Due to this, it is slower. For fastest results, use
-   * console.log().
-   *
-   * @method print
-   * @param {Any} contents any combination of Number, String, Object, Boolean,
-   *                       Array to print
-   * @example
-   * <div><code class='norender'>
-   * var x = 10;
-   * print("The value of x is " + x);
-   * // prints "The value of x is 10"
-   * </code></div>
-   * @alt
-   * default grey canvas
-   */
-  // Converts passed args into a string and then parses that string to
-  // simulate synchronous behavior. This is a hack and is gross.
-  // Since this will not work on all objects, particularly circular
-  // structures, simply console.log() on error.
-  p5.prototype.print = function(args) {
-    try {
-      if (arguments.length === 0) {
-        _windowPrint();
-      }
-      else if (arguments.length > 1) {
-        console.log.apply(console, arguments);
-      } else {
-        var newArgs = JSON.parse(JSON.stringify(args));
-        if (JSON.stringify(newArgs)==='{}'){
-          console.log(args);
-        } else {
-          console.log(newArgs);
-        }
-      }
-    } catch(err) {
-      console.log(args);
-    }
-  };
-} else {
-  p5.prototype.print = function() {};
-}
+/**
+ * The print() function writes to the console area of your browser.
+ * This function is often helpful for looking at the data a program is
+ * producing. This function creates a new line of text for each call to
+ * the function. Individual elements can be
+ * separated with quotes ("") and joined with the addition operator (+).
+ *
+ * @method print
+ * @param {Any} contents any combination of Number, String, Object, Boolean,
+ *                       Array to print
+ * @example
+ * <div><code class='norender'>
+ * var x = 10;
+ * print("The value of x is " + x);
+ * // prints "The value of x is 10"
+ * </code></div>
+ * @alt
+ * default grey canvas
+ */
+p5.prototype.print = function(args) {
+  if (arguments.length === 0) {
+    _windowPrint();
+  }
+  else {
+    console.log.apply(console, arguments);
+  }
+};
 
 
 /**

src/webgl/light.js

@@ -92,12 +92,12 @@ p5.prototype.ambientLight = function(v1, v2, v3, a){
  * @param  {Number|Array|String|p5.Color} v1   gray value,
  * red or hue value (depending on the current color mode),
  * or color Array, or CSS color string
- * @param  {Number}          [v2] optional: green or saturation value
- * @param  {Number}          [v3] optional: blue or brightness value
- * @param  {Number}          [a]  optional: opacity
+ * @param  {Number}          [v2] green or saturation value
+ * @param  {Number}          [v3] blue or brightness value
+ * @param  {Number}          [a]  opacity
  * @param  {Number|p5.Vector} x   x axis direction or a p5.Vector
- * @param  {Number}          [y]  optional: y axis direction
- * @param  {Number}          [z]  optional: z axis direction
+ * @param  {Number}          [y]  y axis direction
+ * @param  {Number}          [z]  z axis direction
  * @chainable
  * @example
  * <div>
@@ -121,7 +121,7 @@ p5.prototype.ambientLight = function(v1, v2, v3, a){
  * light source on canvas changeable with mouse position
  *
  */
-p5.prototype.directionalLight = function(v1, v2, v3, a, x, y, z) {
+p5.prototype.directionalLight = function(v1, v2, v3, x, y, z) {
   if (! this._renderer.curFillShader.isLightShader()) {
     this._renderer.setFillShader(this._renderer._getLightShader());
   }
@@ -171,12 +171,12 @@ p5.prototype.directionalLight = function(v1, v2, v3, a, x, y, z) {
  * @param  {Number|Array|String|p5.Color} v1   gray value,
  * red or hue value (depending on the current color mode),
  * or color Array, or CSS color string
- * @param  {Number}          [v2] optional: green or saturation value
- * @param  {Number}          [v3] optional: blue or brightness value
- * @param  {Number}          [a]  optional: opacity
+ * @param  {Number}          [v2] green or saturation value
+ * @param  {Number}          [v3] blue or brightness value
+ * @param  {Number}          [a]  opacity
  * @param  {Number|p5.Vector} x   x axis position or a p5.Vector
- * @param  {Number}          [y]  optional: y axis position
- * @param  {Number}          [z]  optional: z axis position
+ * @param  {Number}          [y]  y axis position
+ * @param  {Number}          [z]  z axis position
  * @chainable
  * @example
  * <div>

src/webgl/material.js

@@ -215,9 +215,9 @@ p5.prototype.texture = function(){
  * @param  {Number|Array|String|p5.Color} v1  gray value,
  * red or hue value (depending on the current color mode),
  * or color Array, or CSS color string
- * @param  {Number}            [v2] optional: green or saturation value
- * @param  {Number}            [v3] optional: blue or brightness value
- * @param  {Number}            [a]  optional: opacity
+ * @param  {Number}            [v2] green or saturation value
+ * @param  {Number}            [v3] blue or brightness value
+ * @param  {Number}            [a]  opacity
  * @chainable
  * @example
  * <div>
@@ -258,9 +258,9 @@ p5.prototype.ambientMaterial = function(v1, v2, v3, a) {
  * @param  {Number|Array|String|p5.Color} v1  gray value,
  * red or hue value (depending on the current color mode),
  * or color Array, or CSS color string
- * @param  {Number}            [v2] optional: green or saturation value
- * @param  {Number}            [v3] optional: blue or brightness value
- * @param  {Number}            [a]  optional: opacity
+ * @param  {Number}            [v2] green or saturation value
+ * @param  {Number}            [v3] blue or brightness value
+ * @param  {Number}            [a]  opacity
  * @chainable
  * @example
  * <div>

src/webgl/p5.RendererGL.js

@@ -355,9 +355,9 @@ p5.RendererGL.prototype.background = function() {
  * @param  {Number|Array|String|p5.Color} v1  gray value,
  * red or hue value (depending on the current color mode),
  * or color Array, or CSS color string
- * @param  {Number}            [v2] optional: green or saturation value
- * @param  {Number}            [v3] optional: blue or brightness value
- * @param  {Number}            [a]  optional: opacity
+ * @param  {Number}            [v2] green or saturation value
+ * @param  {Number}            [v3] blue or brightness value
+ * @param  {Number}            [a]  opacity
  * @return {p5}                the p5 object
  * @example
  * <div>
@@ -463,9 +463,9 @@ p5.RendererGL.prototype.noStroke = function() {
  * @param  {Number|Array|String|p5.Color} v1  gray value,
  * red or hue value (depending on the current color mode),
  * or color Array, or CSS color string
- * @param  {Number}            [v2] optional: green or saturation value
- * @param  {Number}            [v3] optional: blue or brightness value
- * @param  {Number}            [a]  optional: opacity
+ * @param  {Number}            [v2] green or saturation value
+ * @param  {Number}            [v3] blue or brightness value
+ * @param  {Number}            [a]  opacity
  * @example
  * <div>
  * <code>

src/webgl/primitives.js

@@ -191,10 +191,10 @@ p5.prototype.box = function(){
  * Draw a sphere with given radius
  * @method sphere
  * @param  {Number} radius            radius of circle
- * @param  {Number} [detailX]         optional: number of segments,
+ * @param  {Number} [detailX]         number of segments,
  *                                    the more segments the smoother geometry
  *                                    default is 24
- * @param  {Number} [detailY]         optional: number of segments,
+ * @param  {Number} [detailY]         number of segments,
  *                                    the more segments the smoother geometry
  *                                    default is 16
  * @chainable
@@ -345,10 +345,10 @@ var _truncatedCone = function(
  * @method  cylinder
  * @param  {Number} radius     radius of the surface
  * @param  {Number} height     height of the cylinder
- * @param  {Number} [detailX]  optional: number of segments,
+ * @param  {Number} [detailX]  number of segments,
  *                             the more segments the smoother geometry
  *                             default is 24
- * @param {Number} [detailY]   optional: number of segments in y-dimension,
+ * @param {Number} [detailY]   number of segments in y-dimension,
  *                             the more segments the smoother geometry
  *                             default is 16
  * @chainable
@@ -411,10 +411,10 @@ p5.prototype.cylinder = function(){
  * @method cone
  * @param  {Number} radius            radius of the bottom surface
  * @param  {Number} height            height of the cone
- * @param  {Number} [detailX]         optional: number of segments,
+ * @param  {Number} [detailX]         number of segments,
  *                                    the more segments the smoother geometry
  *                                    default is 24
- * @param  {Number} [detailY]         optional: number of segments,
+ * @param  {Number} [detailY]         number of segments,
  *                                    the more segments the smoother geometry
  *                                    default is 16
  * @chainable
@@ -478,11 +478,11 @@ p5.prototype.cone = function(){
  * @param  {Number} radiusx           xradius of circle
  * @param  {Number} radiusy           yradius of circle
  * @param  {Number} radiusz           zradius of circle
- * @param  {Number} [detailX]         optional: number of segments,
+ * @param  {Number} [detailX]         number of segments,
  *                                    the more segments the smoother geometry
  *                                    default is 24. Avoid detail number above
  *                                    150, it may crash the browser.
- * @param  {Number} [detailY]         optional: number of segments,
+ * @param  {Number} [detailY]         number of segments,
  *                                    the more segments the smoother geometry
  *                                    default is 16. Avoid detail number above
  *                                    150, it may crash the browser.
@@ -558,10 +558,10 @@ p5.prototype.ellipsoid = function(){
  * @method torus
  * @param  {Number} radius        radius of the whole ring
  * @param  {Number} tubeRadius    radius of the tube
- * @param  {Number} [detailX]     optional: number of segments in x-dimension,
+ * @param  {Number} [detailX]     number of segments in x-dimension,
  *                                the more segments the smoother geometry
  *                                default is 24
- * @param  {Number} [detailY]     optional: number of segments in y-dimension,
+ * @param  {Number} [detailY]     number of segments in y-dimension,
  *                                the more segments the smoother geometry
  *                                default is 16
  * @chainable