From 3ebdcc68451d0891b7a6bf6beaf208c331c7b60c Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 11:28:36 -0400
Subject: [PATCH 01/11] got some sound

---
 index.html |  6 +++++-
 sketch.js  |  2 ++
 sound.js   | 11 +++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 sound.js
diff --git a/index.html b/index.html
index 2f413c2..99811ed 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,11 @@
     <meta charset="UTF-8" />
     <title>sketch.js</title>
     <script src="node_modules/p5/lib/p5.js" type="text/javascript"></script>
-
+    <script
+      src="node_modules/p5/lib/addons/p5.sound.js"
+      type="text/javascript"
+    ></script>
+    <script src="sound.js" type="text/javascript"></script>
     <script src="sketch.js" type="text/javascript"></script>
 
     <style>
diff --git a/sketch.js b/sketch.js
index 8d042b3..21561c8 100644
--- a/sketch.js
+++ b/sketch.js
@@ -1,7 +1,9 @@
 function setup() {
   createCanvas(400, 400);
+  b = new b2Sound();
 }
 
 function draw() {
   background(220);
+  b.play();
 }
diff --git a/sound.js b/sound.js
new file mode 100644
index 0000000..1052be5
--- /dev/null
+++ b/sound.js
@@ -0,0 +1,11 @@
+class b2Sound {
+  constructor() {
+    console.log("nice");
+  }
+
+  play() {
+    const p = new p5.Pulse();
+    p.amp(0.5);
+    p.freq(260);
+  }
+}

From 291448dc6f5262d2a1c010048b6c299132da162e Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 12:02:22 -0400
Subject: [PATCH 02/11] sounds testing

---
 sketch.js | 2 +-
 sound.js  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sketch.js b/sketch.js
index 21561c8..591d486 100644
--- a/sketch.js
+++ b/sketch.js
@@ -1,9 +1,9 @@
 function setup() {
   createCanvas(400, 400);
   b = new b2Sound();
+  console.info(b);
 }
 
 function draw() {
   background(220);
-  b.play();
 }
diff --git a/sound.js b/sound.js
index 1052be5..c8f3af6 100644
--- a/sound.js
+++ b/sound.js
@@ -1,11 +1,10 @@
 class b2Sound {
-  constructor() {
-    console.log("nice");
-  }
+  constructor() {}
 
-  play() {
+  playPulse() {
     const p = new p5.Pulse();
     p.amp(0.5);
     p.freq(260);
+    p.start();
   }
 }

From 6234108f947b752fe8787a71fe9e6bf56ffeb784 Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 13:12:40 -0400
Subject: [PATCH 03/11] need help

---
 index.html   | 1 +
 sketch.js    | 5 ++++-
 src/sound.js | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index bbb06dd..8636090 100644
--- a/index.html
+++ b/index.html
@@ -28,6 +28,7 @@
   <body>
     <main id="main"></main>
     <script src="src/Circle.js" type="module"></script>
+    <script src="src/sound.js" type="module"></script>
     <script src="sketch.js" type="module"></script>
   </body>
 </html>
diff --git a/sketch.js b/sketch.js
index ac1a4fe..0637e38 100644
--- a/sketch.js
+++ b/sketch.js
@@ -1,16 +1,19 @@
 import Circle from "./src/Circle.js";
-import sound from "./src/sound.js";
+import b2Sound from "./src/sound.js";
 
 let sphereA;
+let b;
 
 function setup() {
   createCanvas(900, 600);
   sphereA = new Circle(createVector(width / 2, height / 2));
+  b = new b2Sound();
 }
 window.setup = setup;
 
 function draw() {
   background(0);
   sphereA.run();
+  b.playPulse();
 }
 window.draw = draw;
diff --git a/src/sound.js b/src/sound.js
index ef20448..a371576 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -1,3 +1,5 @@
+import { p5 } from "p5";
+
 export default class b2Sound {
   constructor() {}
 

From 561b67f2db7d15b9544a42259cdff322e887b15b Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 13:14:28 -0400
Subject: [PATCH 04/11] pulse is not defined

---
 index.html   | 4 ++++
 src/sound.js | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 8636090..f367c36 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,10 @@
     <meta name="viewport" content="width=device-width" />
     <title>BaseTwo EasterEgg</title>
     <script src="node_modules/p5/lib/p5.js" type="text/javascript"></script>
+    <script
+      src="node_modules/p5/lib/addons/p5.sound.js"
+      type="text/javascript"
+    ></script>
     <style>
       body {
         background: #232323;
diff --git a/src/sound.js b/src/sound.js
index a371576..6363a01 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -1,10 +1,8 @@
-import { p5 } from "p5";
-
 export default class b2Sound {
   constructor() {}
 
   playPulse() {
-    const p = new p5.Pulse();
+    const p = new Pulse();
     p.amp(0.5);
     p.freq(260);
     p.start();

From 5d3925ad9b325d640503933cd47837d71fa8bc8f Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 13:18:24 -0400
Subject: [PATCH 05/11] sound stuff

---
 sketch.js    | 1 -
 src/sound.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sketch.js b/sketch.js
index 0637e38..bdb6756 100644
--- a/sketch.js
+++ b/sketch.js
@@ -14,6 +14,5 @@ window.setup = setup;
 function draw() {
   background(0);
   sphereA.run();
-  b.playPulse();
 }
 window.draw = draw;
diff --git a/src/sound.js b/src/sound.js
index 6363a01..ef20448 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -2,7 +2,7 @@ export default class b2Sound {
   constructor() {}
 
   playPulse() {
-    const p = new Pulse();
+    const p = new p5.Pulse();
     p.amp(0.5);
     p.freq(260);
     p.start();

From cccb1cc8d09841d39be9bcfeb56568c9f80021ff Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 13:46:01 -0400
Subject: [PATCH 06/11] make a sound!

---
 sketch.js    | 7 +++++++
 src/sound.js | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sketch.js b/sketch.js
index bdb6756..f38c1ed 100644
--- a/sketch.js
+++ b/sketch.js
@@ -16,3 +16,10 @@ function draw() {
   sphereA.run();
 }
 window.draw = draw;
+
+function mousePressed() {
+  b.playPulse(mouseX, mouseY);
+}
+window.mousePressed = mousePressed;
+
+function mouseReleased() {}
diff --git a/src/sound.js b/src/sound.js
index ef20448..e33e3f2 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -1,10 +1,10 @@
 export default class b2Sound {
   constructor() {}
 
-  playPulse() {
+  playPulse(amp, freq) {
     const p = new p5.Pulse();
-    p.amp(0.5);
-    p.freq(260);
+    p.amp(0.3);
+    p.freq(freq);
     p.start();
   }
 }

From 695bb674a5942de34307b62b2a171a01f8b579b6 Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 14:08:24 -0400
Subject: [PATCH 07/11] some more freq processing

---
 sketch.js    | 2 +-
 src/sound.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sketch.js b/sketch.js
index f38c1ed..ea48a7b 100644
--- a/sketch.js
+++ b/sketch.js
@@ -18,7 +18,7 @@ function draw() {
 window.draw = draw;
 
 function mousePressed() {
-  b.playPulse(mouseX, mouseY);
+  b.playPulse(0.3, mouseY);
 }
 window.mousePressed = mousePressed;
 
diff --git a/src/sound.js b/src/sound.js
index e33e3f2..d70669b 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -3,8 +3,9 @@ export default class b2Sound {
 
   playPulse(amp, freq) {
     const p = new p5.Pulse();
-    p.amp(0.3);
-    p.freq(freq);
+    p.amp(amp);
+    console.log(freq);
+    p.freq(120 + (200 * freq) / 800); //trying to get it to stick around an octave
     p.start();
   }
 }

From 7572ea540df24173f2cb24e492e844aab00ab376 Mon Sep 17 00:00:00 2001
From: Zachary Chay-Dolan <Zacharia.cd@gmail.com>
Date: Wed, 26 Aug 2020 14:17:45 -0400
Subject: [PATCH 08/11] stop playing the note

---
 sketch.js    |  5 ++++-
 src/sound.js | 17 +++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/sketch.js b/sketch.js
index ea48a7b..934c1d7 100644
--- a/sketch.js
+++ b/sketch.js
@@ -22,4 +22,7 @@ function mousePressed() {
 }
 window.mousePressed = mousePressed;
 
-function mouseReleased() {}
+function mouseReleased() {
+  b.stopPulse();
+}
+window.mouseReleased = mouseReleased;
diff --git a/src/sound.js b/src/sound.js
index d70669b..3bb86db 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -1,11 +1,16 @@
 export default class b2Sound {
-  constructor() {}
+  constructor() {
+    this.note = new p5.Pulse();
+  }
 
   playPulse(amp, freq) {
-    const p = new p5.Pulse();
-    p.amp(amp);
-    console.log(freq);
-    p.freq(120 + (200 * freq) / 800); //trying to get it to stick around an octave
-    p.start();
+    this.note.amp(amp);
+    this.note.freq(120 + (200 * freq) / 800); //trying to get it to stick around an octave
+    this.note.start();
+  }
+
+  stopPulse() {
+    console.log("its working");
+    this.note.stop();
   }
 }

From 6df121a705e70e138297975965be592fed465412 Mon Sep 17 00:00:00 2001
From: Reed Dunkle <reeddunkle@gmail.com>
Date: Wed, 26 Aug 2020 16:37:13 -0400
Subject: [PATCH 09/11] WIP: Reed play

---
 index.html    |  2 +-
 sketch.js     | 40 ++++++++++++++++++++++++++++++----------
 src/Circle.js | 16 ++++++----------
 src/sound.js  | 47 ++++++++++++++++++++++++++++++++++++++---------
 4 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/index.html b/index.html
index f367c36..d658f01 100644
--- a/index.html
+++ b/index.html
@@ -32,7 +32,7 @@
   <body>
     <main id="main"></main>
     <script src="src/Circle.js" type="module"></script>
-    <script src="src/sound.js" type="module"></script>
+    <script src="src/Sound.js" type="module"></script>
     <script src="sketch.js" type="module"></script>
   </body>
 </html>
diff --git a/sketch.js b/sketch.js
index 934c1d7..2174ff1 100644
--- a/sketch.js
+++ b/sketch.js
@@ -1,28 +1,48 @@
 import Circle from "./src/Circle.js";
-import b2Sound from "./src/sound.js";
+import B2Sound from "./src/Sound.js";
+
+function isInBounds(mouse, circle) {
+  const { position, size } = circle;
+  const { mouseX, mouseY } = mouse;
+  return dist(mouseX, mouseY, position.x, position.y) < size;
+}
 
 let sphereA;
-let b;
+let sound;
+let canvas;
+
+let mouseHeldInterval = 500;
+let mouseHeldCount = 0;
+let millisLastPlayed = null;
+
+function resetMouseTimer() {
+  millisLastPlayed = null;
+  mouseHeldCount = 0;
+}
 
 function setup() {
-  createCanvas(900, 600);
+  canvas = createCanvas(900, 600);
   sphereA = new Circle(createVector(width / 2, height / 2));
-  b = new b2Sound();
+  sound = new B2Sound();
 }
 window.setup = setup;
 
 function draw() {
   background(0);
   sphereA.run();
-}
-window.draw = draw;
 
-function mousePressed() {
-  b.playPulse(0.3, mouseY);
+  if (mouseIsPressed && isInBounds({ mouseX, mouseY }, sphereA)) {
+    if (!millisLastPlayed || millis() >= millisLastPlayed + mouseHeldInterval) {
+      millisLastPlayed = millis();
+      sound.play(mouseHeldCount);
+      mouseHeldCount += 1;
+    }
+  }
 }
-window.mousePressed = mousePressed;
+window.draw = draw;
 
 function mouseReleased() {
-  b.stopPulse();
+  sound.stop();
+  resetMouseTimer();
 }
 window.mouseReleased = mouseReleased;
diff --git a/src/Circle.js b/src/Circle.js
index 502e473..4a55854 100644
--- a/src/Circle.js
+++ b/src/Circle.js
@@ -1,27 +1,23 @@
 export default class Circle {
-  constructor (position) {
+  constructor(position) {
     this.acceleration = createVector(0, 0.05);
     this.velocity = createVector(random(-1, 1), random(-1, 0));
     this.position = position.copy();
-    this.size = 10;
+    this.size = 30;
     // TODO: Add Properties for Modifying Color
   }
 
-  run () {
+  run() {
     this.update();
     this.display();
   }
 
-  update () {
+  update() {
     // TODO: Animation properties happen here (e.g. sets next state)
   }
 
-  display () {
+  display() {
     // Rendering happens here
-    circle(
-      this.position.x,
-      this.position.y,
-      this.size * 2
-    );
+    circle(this.position.x, this.position.y, this.size * 2);
   }
 }
diff --git a/src/sound.js b/src/sound.js
index 3bb86db..5994a8d 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -1,16 +1,45 @@
-export default class b2Sound {
+const notesToFreq = {
+  G: 49,
+  A: 55,
+  B: 61.74,
+  D: 36.71,
+  E: 41.2,
+  C: 32.7,
+};
+
+const pitches = ["G", "A", "B", "D", "E", "G", "C"]; // G Maj Pentatonic
+const octaves = [2, 3, 4];
+const velocityIncrement = 0.05;
+
+export default class B2Sound {
   constructor() {
-    this.note = new p5.Pulse();
+    this.sound = new p5.PolySynth(undefined, 12);
   }
 
-  playPulse(amp, freq) {
-    this.note.amp(amp);
-    this.note.freq(120 + (200 * freq) / 800); //trying to get it to stick around an octave
-    this.note.start();
+  play(countHeld) {
+    // userStartAudio();
+
+    // this.sound.amp(amp);
+    // this.sound.freq(120 + (200 * freq) / 800); //trying to get it to stick around an octave
+    // this.sound.start();
+
+    const pitch = pitches[countHeld % pitches.length];
+    const octave = octaves[countHeld % octaves.length];
+    const note = notesToFreq[pitch] * octave;
+    const velocity = Math.min(velocityIncrement * (1 + countHeld), 1);
+
+    console.log("note", note, this.sound.notes);
+
+    console.log("countHeld", countHeld);
+
+    if (countHeld > 30) {
+      this.sound.noteRelease(); // Fix sounds glitching eventually
+    }
+
+    this.sound.noteAttack(note, velocity);
   }
 
-  stopPulse() {
-    console.log("its working");
-    this.note.stop();
+  stop() {
+    this.sound.noteRelease();
   }
 }

From 7ec48c985426a61f93d2395095bee050c356519d Mon Sep 17 00:00:00 2001
From: Reed Dunkle <reeddunkle@gmail.com>
Date: Wed, 26 Aug 2020 16:42:33 -0400
Subject: [PATCH 10/11] WIP: remove console logs

---
 sketch.js    | 1 +
 src/sound.js | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/sketch.js b/sketch.js
index 2174ff1..6c7fd63 100644
--- a/sketch.js
+++ b/sketch.js
@@ -4,6 +4,7 @@ import B2Sound from "./src/Sound.js";
 function isInBounds(mouse, circle) {
   const { position, size } = circle;
   const { mouseX, mouseY } = mouse;
+
   return dist(mouseX, mouseY, position.x, position.y) < size;
 }
 
diff --git a/src/sound.js b/src/sound.js
index 5994a8d..4e3ba89 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -28,10 +28,6 @@ export default class B2Sound {
     const note = notesToFreq[pitch] * octave;
     const velocity = Math.min(velocityIncrement * (1 + countHeld), 1);
 
-    console.log("note", note, this.sound.notes);
-
-    console.log("countHeld", countHeld);
-
     if (countHeld > 30) {
       this.sound.noteRelease(); // Fix sounds glitching eventually
     }

From 8c57ac97a0182597b940906d90694ff0f505fcbf Mon Sep 17 00:00:00 2001
From: Reed Dunkle <reeddunkle@gmail.com>
Date: Wed, 26 Aug 2020 17:02:09 -0400
Subject: [PATCH 11/11] WIP

---
 sketch.js    | 2 +-
 src/sound.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sketch.js b/sketch.js
index 6c7fd63..c276c97 100644
--- a/sketch.js
+++ b/sketch.js
@@ -12,7 +12,7 @@ let sphereA;
 let sound;
 let canvas;
 
-let mouseHeldInterval = 500;
+let mouseHeldInterval = 500; // ms
 let mouseHeldCount = 0;
 let millisLastPlayed = null;
 
diff --git a/src/sound.js b/src/sound.js
index 4e3ba89..82da493 100644
--- a/src/sound.js
+++ b/src/sound.js
@@ -17,7 +17,7 @@ export default class B2Sound {
   }
 
   play(countHeld) {
-    // userStartAudio();
+    userStartAudio();
 
     // this.sound.amp(amp);
     // this.sound.freq(120 + (200 * freq) / 800); //trying to get it to stick around an octave
