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

Author: lauren mccarthy

examples/addons/p5.sound/oscillatorFFT/sketch.js

@@ -5,17 +5,14 @@ var freqSlider, freqLabel, ampLabel, ampSlider, button;
 
 var osc;
 var freq = 220; // current frequency (updated by slider)
-var amp = .5;
+var amp = 0.5;
 var fft;
 
 
 var oscOn = false;
 
 function setup() {
   createCanvas(800,400);
-  background(30);
-  stroke(255);
-  strokeWeight(10);
 
   freqLabel = createP('Frequency: ');
   freqSlider = createSlider(1, 700, freq);
@@ -47,7 +44,7 @@ function setup() {
 }
 
 function draw() {
-  background(0);
+  background(30);
 
   amp = ampSlider.value()/100;
   osc.amp(amp);
@@ -63,6 +60,8 @@ function draw() {
   waveform = fft.waveform();
 
   // draw the shape of the waveform
+  stroke(255);
+  strokeWeight(10);
   beginShape();
   for (var i = 0; i<waveform.length; i++){
     var x = map(i, 0, waveform.length, 0, width);

examples/addons/p5.sound/pan_soundfile/sketch.js

@@ -13,58 +13,38 @@ function preload() {
 
 function setup() {
   createCanvas(400, 400); 
-  background(0, 0, 0);
 
   soundFile.volume = .6;
 
   // create the ball
-  ball = ellipse()
-  ball.x = width/2;
-  ball.y = height/2;
-  ball.speed = 7;
-  ellipse(ball.x, ball.y, 100, 100);
+  ball = {
+    x: width/2,
+    y: height/2,
+    speed: 7
+  }
 }
 
 function draw() {
-  background(0, 0, 0);
+  background(0);
 
   ball.x += ball.speed;
 
 
   // when the ball hits the wall...
-  if (ball.x > width) {
-
-    // map the ball's x location to a panning degree (float between -1.0 and 1.0)
-    var panning = map(ball.x, 0., width,-1.0, 1.0);
-    soundFile.pan(panning);
-
-
-    // set a random playback speed for the sound
-    var newSpeed = Math.random();
-    ball.speed = -(ball.speed);
-    soundFile.rate(newSpeed);
-
-    // play the sound
-    soundFile.play();
-  }
-
-  if (ball.x < 0) {
+  if (ball.x > width || ball.x < 0) {
 
     // map the ball's x location to a panning degree (float between -1.0 and 1.0)
-    var panning = map(ball.x, 0., width,-1.0, 1.0);
+    var panning = map(ball.x, 0, width, -1, 1);
     soundFile.pan(panning);
 
     // set a random playback speed for the sound
-    var newSpeed = Math.random();
-    ball.speed = -(ball.speed);
+    var newSpeed = random(1);
+    ball.speed = -ball.speed;
     soundFile.rate(newSpeed);
 
     // play the sound
     soundFile.play();
-
   }
-
-  ellipse(ball.x, ball.y, 100, 100)
-
+  ellipse(ball.x, ball.y, 100, 100);
 }