some work done

js/initialization.js

@@ -2,6 +2,12 @@ $(document).ready(function() {
 	initialize();
 });
 function initialize(a) {
+	// color blind mode variables
+	// max amount of color blind modes
+	window.maxColorBlindMode = 2;
+	window.currColorBlindMode = 0;
+
+
 	window.rush = 1;
 	window.lastTime = Date.now();
 	window.iframHasLoaded = false;

js/input.js

@@ -102,40 +102,15 @@ function addKeyListeners() {
 		return false;
 	});
 
-	function togglecolor(){
-		console.log("Hit toggle colour method");
-		//window.colors = ["#8e44ad", "#f1c40f", "#3498db", "#d35400"];
-		window.colors = ["#ffffff", "#f1c40f", "#3498db", "#d35400"];
-		window.hexColorsToTintedColors = {
-			//"#8e44ad": "rgb(229,152,102)",
-			"#ffffff": "rgb(000,000,000)",
-			"#f1c40f": "rgb(246,223,133)",
-			"#3498db": "rgb(151,201,235)",
-			"#d35400": "rgb(210,180,222)"
-		};
-
-		window.rgbToHex = {
-			"rgb(142,68,173)": "#8e44ad",
-			"rgb(241,196,15)": "#f1c40f",
-			"rgb(52,152,219)": "#3498db",
-			"rgb(211,84,0)": "#d35400"
-		};
-
-		window.rgbColorsToTintedColors = {
-			"rgb(142,68,173)": "rgb(229,152,102)",
-			"rgb(241,196,15)": "rgb(246,223,133)",
-			"rgb(52,152,219)": "rgb(151,201,235)",
-			"rgb(46,204,113)": "rgb(210,180,222)"
-		};
-	}
 
 	$("#colorBlindBtn").on('touchstart mousedown', function() {
 	window.colors = ["#8e44ad", "#f1c40f", "#3498db", "#d35400"];
 
 	window.hexColorsToTintedColors = {
 		//"#8e44ad": "rgb(229,152,102)",
 		"#ffffff": "rgb(000,000,000)",
-		"#f1c40f": "rgb(246,223,133)",
+		"#000000": "rgp(000,000,000)",
+		//"#f1c40f": "rgb(246,223,133)",
 		"#3498db": "rgb(151,201,235)",
 		"#d35400": "rgb(210,180,222)"
 	};
@@ -240,3 +215,29 @@ function handleClickTap(x,y) {
 	}
 }
 
+function togglecolor(a){
+	console.log("Hit toggle colour method");
+	//window.colors = ["#8e44ad", "#f1c40f", "#3498db", "#d35400"];
+	window.colors = ["#ffffff", "#f1c40f", "#3498db", "#d35400"];
+	window.hexColorsToTintedColors = {
+		//"#8e44ad": "rgb(229,152,102)",
+		"#ffffff": "rgb(000,000,000)",
+		"#f1c40f": "rgb(246,223,133)",
+		"#3498db": "rgb(151,201,235)",
+		"#d35400": "rgb(210,180,222)"
+	};
+
+	window.rgbToHex = {
+		"rgb(142,68,173)": "#8e44ad",
+		"rgb(241,196,15)": "#f1c40f",
+		"rgb(52,152,219)": "#3498db",
+		"rgb(211,84,0)": "#d35400"
+	};
+
+	window.rgbColorsToTintedColors = {
+		"rgb(142,68,173)": "rgb(229,152,102)",
+		"rgb(241,196,15)": "rgb(246,223,133)",
+		"rgb(52,152,219)": "rgb(151,201,235)",
+		"rgb(46,204,113)": "rgb(210,180,222)"
+	};
+}