Merge branch 'master' of github.com:ControllingTransmission/sacredgeo

ControllingTransmission · Nov 14, 2013 · 50f4d21 · 50f4d21
2 parents d0c06d1 + 4d50f99
commit 50f4d21
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Spectrum.js b/Spectrum.js
@@ -65,6 +65,7 @@ Spectrum = {
 	    //this._analyserNode.fftSize = 2048;
 	    this._analyserNode.fftSize = 512;
 	    this._inputPoint.connect(this._analyserNode);
+
 /*
 	    zeroGain = this._audioContext.createGain();
 	    zeroGain.gain.value = 0.0;

diff --git a/hotkeys.js b/hotkeys.js
@@ -34,8 +34,12 @@ $(document).bind('keydown', '8', function(e) {
 	Mode.isWireframe = !Mode.isWireframe
 });
 
-$(document).bind('keyup', '8', function(e) {
+$(document).bind('keydown', '9', function(e) {
+	Mode.blackAndWhite = true
+});
 
+$(document).bind('keyup', '9', function(e) {
+	Mode.blackAndWhite = false
 });
 
 

diff --git a/index.html b/index.html
@@ -42,7 +42,8 @@
 			var camera, scene, renderer;
 
 			var Mode = {
-				isWireframe: false
+				isWireframe: false,
+				blackAndWhite: false
 			}
 
 			$(document).ready(function()
@@ -231,9 +232,12 @@
 
 						if (b < bins.length)
 						{
-
 							var color =  COLORSETS.RAINBOWBRITE[b % COLORSETS.RAINBOWBRITE.length]
 							//console.log("object.color = " + object.color)
+							if (Mode.blackAndWhite)
+							{
+								color = 0xffffff
+							}
 
 							var fill_material = new THREE.MeshBasicMaterial( 
 								{