updated index

abbernie · Aug 25, 2015 · 27a571c · 27a571c
1 parent 550ed59
commit 27a571c
Showing 1 changed file with 99 additions and 35 deletions.
diff --git a/index.html b/index.html
@@ -1,50 +1,114 @@
+<!DOCTYPE html>
 <html>
   <head>
-
-  	<script src="tunings.js"></script>
-  	<script src="tune.js"></script>
-    <script type="text/javascript" src="node_modules/tone/build/Tone.js"></script>
+
+      <script src="js/Tone.min.js"></script>
+      <script src="js/tune.js"></script>
+      <script src="js/nexusUI.js"></script>
+      <script src="js/qwerty-hancock2.js"></script>
+      <link href='http://fonts.googleapis.com/css?family=Hammersmith+One' rel='stylesheet' type='text/css'>
+      <link rel='stylesheet' href='style2.css'>
 
   </head>
+
   <body>
-	<script>
 
-		var tune = new Tune();
-		tune.loadscale("ji_21");
-    console.log(tune.scale);
+    <h1>Tune.js Demo</h1>
+    <h2>A Web Audio Microtonal Piano</h2>
+    <h3>Use your computer keyboard to play</h3>
+
+    <div id="keyboard">
+
 
-    var synth = new Tone.SimpleSynth({
-      envelope: {
-            attack: 5,
-            decay: 2,
-            sustain:1,
-            release:3
-          }
-        });
+    </div>
+
+    <div id="scales">
+      <p>Scale:</p>
+      <canvas nx="select" choices="ji_12,young-lm_piano,partch-barstow,pyth_12,couperin,johnston,bach2,ptolemy,chin_bronze,slendro,xenakis_chrom,partch_43,et-mix6"></canvas><br>
+      <p id="scaledesc"></p>
+    </div>
 
-    synth.oscillator = 'triangle';
-    synth.toMaster();
+    <div id="loading">
+      Loading Samples...
+    </div>
 
-    var MIDInote = 60;
+    <div id="fork">
+      Visit the <a href="http://abbernie.github.io/tune/scales.html" target="blank">Tune.js Scale Archive</a> for a full list of scales and descriptions.<br>
+      <a href="http://www.github.com/abbernie/tune">Fork</a> this project on github.
+      <footer> Tune.js was written by <a href="http://andrewbernstein.tumblr.com">Andrew Bernstein</a> and <a href="http://www.whitechord.org">Ben Taylor</a>.
+    </div>
 
-    var clock = new Tone.Clock(0.5, function(time){
+  </body>
+  <script>
+
+  /*
+  *
+  * Interface
+  *
+  */
+    var keyboard = new QwertyHancock({
+                 id: 'keyboard',
+                 width: 800,
+                 height: 100,
+                 octaves: 2,
+                 startNote: 'c4',
+                 whiteNotesColour: 'white',
+                 blackNotesColour: 'black',
+                 activeColour: '#f00'
+            });
+    var gui = document.getElementById('keyboard')
+    gui.style.margin = '65px auto'
+    gui.style.padding = '20px'
+   nx.onload = function(){
 
-    var note = tune.note(MIDInote);
+    select1.on('*',function(){
+      var scale = select1.val.text;
+      tune.loadScale(scale);
+      select1.canvas.blur();
+      document.getElementById("scaledesc").innerHTML = TuningList[scale].description
+    });
+    select1.canvas.selectedIndex = 0;
+    document.getElementById("scaledesc").innerHTML = TuningList["ji_12"].description
+  }
+  var loading = document.getElementById('loading')
 
-    synth.triggerAttackRelease(note, 5);
-
-    console.log(note);
-    MIDInote++;
+  loading.style.left = '40%';
+  loading.style.top = '40%';
+  loading.style.padding = '50px';
 
-    if(MIDInote > 81){
-      MIDInote = 60;
+    /*
+    *
+    *
+    * AUDIO SYNTHESIS CODE
+    *
+    *
+    */
+    // Create a new Tune object
+    var tune = new Tune();
+    // Load a 12 tone just intonation scale
+    tune.loadScale('ji_12');
+    // Set the output mode to 'MIDI' 
+    tune.mode.output = 'MIDI';
+    //tune.setKey(69);
+    var actx = new (AudioContext || wedkitAudioContext)();
+    var piano = new Tone.Sampler({
+
+      "C4":"samples/c4.mp3"
+    });
+    piano.toMaster();
+    Tone.Buffer.onload = function(){
+      document.getElementById('loading').style.display = 'none';
+        keyboard.keyDown = function(note, freq) {
+
+          var midi = 69 + 12*Math.log(freq/440)/Math.log(2)
+
+          piano.triggerAttack("C4");
+
+          // Detune each piano sample 
+          piano.pitch = tune.note(midi-tune.scale.length)-tune.key; 
+
+      };
     }
-
-});
-
-    clock.start();
-
-
-	</script>
-  </body>
+
+  </script>
 </html>