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

Author: Lauren McCarthy

Gruntfile.js

@@ -441,7 +441,7 @@ module.exports = function(grunt) {
   grunt.registerTask('yui:test', ['yuidoc:prod', 'connect', 'mocha:yui']);
   grunt.registerTask('yui:dev', [
     'yui:prod',
-    'browserify',
+    'build',
     'connect',
     'open:yui',
     'watch:yui'

src/core/p5.Element.js

@@ -160,6 +160,19 @@ p5.Element.prototype.id = function(id) {
  * @method class
  * @param  {String} class class to add
  * @chainable
+ *
+ * @example
+ * <div class='norender'><code>
+ * function setup() {
+ *   var cnv = createCanvas(100, 100);
+ *   // Assigns a CSS selector class 'small'
+ *   // to the canvas element.
+ *   cnv.class('small');
+ * }
+ * </code></div>
+ *
+ * @alt
+ * no display.
  */
 /**
  * @method class

src/image/p5.Image.js

@@ -409,7 +409,7 @@ p5.Image.prototype.set = function(x, y, imgOrCol) {
  * <div><code>
  * var img;
  *
- * function setup() {
+ * function preload() {
  *   img = loadImage('assets/rockies.jpg');
  * }
 

src/image/pixels.js

@@ -265,9 +265,9 @@ p5.prototype.copy = function() {
  * <br><br>
  *
  * BLUR
- * Executes a Guassian blur with the level parameter specifying the extent
+ * Executes a Gaussian blur with the level parameter specifying the extent
  * of the blurring. If no parameter is used, the blur is equivalent to
- * Guassian blur of radius 1. Larger values increase the blur.
+ * Gaussian blur of radius 1. Larger values increase the blur.
  * <br><br>
  *
  * ERODE

src/webgl/loading.js

@@ -38,10 +38,12 @@ require('./p5.Geometry');
  * //draw a spinning teapot
  * var teapot;
  *
+ * function preload() {
+ *   teapot = loadModel('assets/teapot.obj');
+ * }
+ *
  * function setup() {
  *   createCanvas(100, 100, WEBGL);
- *
- *   teapot = loadModel('assets/teapot.obj');
  * }
  *
  * function draw() {
@@ -218,10 +220,12 @@ function parseObj(model, lines) {
  * //draw a spinning teapot
  * var teapot;
  *
+ * function preload() {
+ *   teapot = loadModel('assets/teapot.obj');
+ * }
+ *
  * function setup() {
  *   createCanvas(100, 100, WEBGL);
- *
- *   teapot = loadModel('assets/teapot.obj');
  * }
  *
  * function draw() {

src/webgl/material.js

@@ -186,9 +186,12 @@ p5.prototype.normalMaterial = function() {
  * <div>
  * <code>
  * var img;
+ * function preload() {
+ *   img = loadImage('assets/laDefense.jpg');
+ * }
+ *
  * function setup() {
  *   createCanvas(100, 100, WEBGL);
- *   img = loadImage('assets/laDefense.jpg');
  * }
  *
  * function draw() {

test/manual-test-examples/addons/p5.sound/loadSound_callback/sketch.js

@@ -1,11 +1,13 @@
 // Sound samples from Damscray - "Dancing Tiger",
 // Creative Commons BY-NC-SA
 
+function preload() {
+  soundFile = loadSound('../_files/Damscray_-_Dancing_Tiger_01', soundReady);
+}
 
 function setup() {
   createCanvas(400,200);
   soundFormats('ogg', 'mp3');
-  soundFile = loadSound('../_files/Damscray_-_Dancing_Tiger_01', soundReady);
 }
 
 function soundReady(){

test/manual-test-examples/addons/p5.sound/peakDetect_basic/sketch.js

@@ -1,10 +1,13 @@
 var cnv, soundFile, fft, peakDetect;
 var ellipseWidth = 10;
 
+function preload() {
+  soundFile = loadSound('../_files/beat.mp3');
+}
+
 function setup() {
   cnv = createCanvas(100,100);
 
-  soundFile = loadSound('../_files/beat.mp3');
   fft = new p5.FFT();
   peakDetect = new p5.PeakDetect();
 

test/manual-test-examples/addons/p5.sound/play_soundfile/sketch.js

@@ -5,13 +5,15 @@
 // create a variable for the sound file
 var soundFile;
 
+function preload() {
+  // create a SoundFile
+  soundFile = loadSound( ['../_files/beatbox.ogg', '../_files/beatbox.mp3'] );
+}
+
 function setup() {
   createCanvas(400, 400);
   background(0);
 
-  // create a SoundFile
-  soundFile = loadSound( ['../_files/beatbox.ogg', '../_files/beatbox.mp3'] );
-
   createP('Press any key to play the sound');
 }
 

test/manual-test-examples/addons/p5.sound/soundfile_playMode/sketch.js

@@ -7,10 +7,13 @@
 var playMode = 'sustain';
 var sample1, sample2, button;
 
-function setup() {
-  createCanvas(0,0);
+function preload() {
   sample1 = loadSound( ['../_files/Damscray_-_Dancing_Tiger_01.ogg', '../_files/Damscray_-_Dancing_Tiger_01.mp3'] );
   sample2 = loadSound( ['../_files/Damscray_-_Dancing_Tiger_02.ogg', '../_files/Damscray_-_Dancing_Tiger_02.mp3'] );
+}
+
+function setup() {
+  createCanvas(0,0);
 
   createP('Press "a" and "s" on your keyboard to play two different samples.<br> Trigger lots of sounds at once! Change mode to hear the difference');