diff --git a/public/index.html b/public/index.html
index ce4188b..d1807f0 100755
--- a/public/index.html
+++ b/public/index.html
@@ -62,10 +62,6 @@ Press 'O' To Continue
-
-
-
-
diff --git a/public/js/keyHandler2.js b/public/js/keyHandler2.js
deleted file mode 100644
index 7d6c013..0000000
--- a/public/js/keyHandler2.js
+++ /dev/null
@@ -1,91 +0,0 @@
-var keyState = [];
-
-function handleKeyPress(event){
- //console.log(event.keyCode);
- if(keyState[event.keyCode] != null){
- var theState = keyState[event.keyCode];
- theState.wasPressed = theState.pressed;
- theState.pressed = true;
- if(!theState.wasPressed){
- // console.log(event.keyCode);
- theState.pressAction();
- }
- }else{
- keyState[event.keyCode] =
- {
- pressed: true,
- wasPressed: false,
- pressAction: pressAction,
- releaseAction: releaseAction
- }
- }
-}
-
-function handleKeyRelease(event){
- if(keyState[event.keyCode] != null){
- var theState = keyState[event.keyCode];
- theState.pressed = false;
- theState.wasPressed = false;
- if(!theState.pressed){
- theState.releaseAction();
- }
- }else{
- keyState[event.keyCode] =
- {
- pressed: false,
- wasPressed: true,
- pressAction: pressAction,
- releaseAction: releaseAction
- }
- }
-}
-
-function setPressAction(keyCode, action){
- if(keyState[keyCode] != null){
- keyState[keyCode].pressAction = action;
- }else{
- keyState[keyCode] =
- {
- pressed: false,
- wasPressed: true,
- pressAction: action,
- releaseAction: releaseAction
- }
- }
-}
-
-function setReleaseAction(keyCode, action){
- if(keyState[keyCode] != null){
- keyState[keyCode].releaseAction = action;
- }else{
- keyState[keyCode] =
- {
- pressed: false,
- wasPressed: true,
- pressAction: pressAction,
- releaseAction: action
- }
- }
-}
-
-function getStringState(keyCode){
- var result = "not pressed";
- if(keyState[keyCode] != null){
- if(keyState[keyCode].pressed){
- result = "pressed";
- }
- }
-
- return result;
-}
-
-function getKeyState(keyCode){
- var result = false;
- if(keyState[keyCode] != null){
- if(keyState[keyCode].pressed){
- result = true;
- }
- }
-
- return result;
-}
diff --git a/public/js/main.js b/public/js/main.js
index 753b06c..67e033c 100755
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -586,7 +586,7 @@ function draw(){
}
context.fillText("SCORE: " + score, CANVAS_WIDTH-100, CANVAS_HEIGHT-20);
- powerBar.draw(context);
+ // powerBar.draw(context);
}
function loop(){
diff --git a/public/lib/jquery.hotkeys.js b/public/lib/jquery.hotkeys.js
deleted file mode 100644
index 189e54c..0000000
--- a/public/lib/jquery.hotkeys.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * jQuery Hotkeys Plugin
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Based upon the plugin by Tzury Bar Yochay:
- * http://github.com/tzuryby/hotkeys
- *
- * Original idea by:
- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
-*/
-
-(function(jQuery){
-
- jQuery.hotkeys = {
- version: "0.8",
-
- specialKeys: {
- 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
- 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
- 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del",
- 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
- 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
- 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
- 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta"
- },
-
- shiftNums: {
- "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
- "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
- ".": ">", "/": "?", "\\": "|"
- }
- };
-
- function keyHandler( handleObj ) {
- // Only care when a possible input has been specified
- if ( typeof handleObj.data !== "string" ) {
- return;
- }
-
- var origHandler = handleObj.handler,
- keys = handleObj.data.toLowerCase().split(" ");
-
- handleObj.handler = function( event ) {
- // Don't fire in text-accepting inputs that we didn't directly bind to
- if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
- event.target.type === "text") ) {
- return;
- }
-
- // Keypress represents characters, not special keys
- var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
- character = String.fromCharCode( event.which ).toLowerCase(),
- key, modif = "", possible = {};
-
- // check combinations (alt|ctrl|shift+anything)
- if ( event.altKey && special !== "alt" ) {
- modif += "alt+";
- }
-
- if ( event.ctrlKey && special !== "ctrl" ) {
- modif += "ctrl+";
- }
-
- // TODO: Need to make sure this works consistently across platforms
- if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
- modif += "meta+";
- }
-
- if ( event.shiftKey && special !== "shift" ) {
- modif += "shift+";
- }
-
- if ( special ) {
- possible[ modif + special ] = true;
-
- } else {
- possible[ modif + character ] = true;
- possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
-
- // "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
- if ( modif === "shift+" ) {
- possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
- }
- }
-
- for ( var i = 0, l = keys.length; i < l; i++ ) {
- if ( possible[ keys[i] ] ) {
- return origHandler.apply( this, arguments );
- }
- }
- };
- }
-
- jQuery.each([ "keydown", "keyup", "keypress" ], function() {
- jQuery.event.special[ this ] = { add: keyHandler };
- });
-
-})( jQuery );
diff --git a/public/lib/sprite.js b/public/lib/sprite.js
deleted file mode 100644
index a67dee3..0000000
--- a/public/lib/sprite.js
+++ /dev/null
@@ -1,72 +0,0 @@
-(function() {
- function LoaderProxy() {
- return {
- draw: $.noop,
- fill: $.noop,
- frame: $.noop,
- update: $.noop,
- width: null,
- height: null
- };
- }
-
- function Sprite(image, sourceX, sourceY, width, height) {
- sourceX = sourceX || 0;
- sourceY = sourceY || 0;
- width = width || image.width;
- height = height || image.height;
-
- return {
- draw: function(canvas, x, y) {
- canvas.drawImage(
- image,
- sourceX,
- sourceY,
- width,
- height,
- x,
- y,
- width,
- height
- );
- },
-
- fill: function(canvas, x, y, width, height, repeat) {
- repeat = repeat || "repeat";
- var pattern = canvas.createPattern(image, repeat);
- canvas.fillColor(pattern);
- canvas.fillRect(x, y, width, height);
- },
-
- width: width,
- height: height
- };
- };
-
- Sprite.load = function(url, loadedCallback) {
- var img = new Image();
- var proxy = LoaderProxy();
-
- img.onload = function() {
- var tile = Sprite(this);
-
- $.extend(proxy, tile);
-
- if(loadedCallback) {
- loadedCallback(proxy);
- }
- };
-
- img.src = url;
-
- return proxy;
- };
-
- var spriteImagePath = "images/";
-
- window.Sprite = function(name, callback) {
- return Sprite.load(spriteImagePath + name + ".png", callback);
- };
- window.Sprite.EMPTY = LoaderProxy();
- window.Sprite.load = Sprite.load;
-}());
diff --git a/public/lib/util.js b/public/lib/util.js
deleted file mode 100644
index c4b4333..0000000
--- a/public/lib/util.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Returns a number whose value is limited to the given range.
- *
- * Example: limit the output of this computation to between 0 and 255
- *
- * (x * 255).clamp(0, 255)
- *
- *
- * @param {Number} min The lower boundary of the output range
- * @param {Number} max The upper boundary of the output range
- * @returns A number in the range [min, max]
- * @type Number
- */
-Number.prototype.clamp = function(min, max) {
- return Math.min(Math.max(this, min), max);
-};