lotta stuff

css/styles.css

@@ -52,6 +52,7 @@ body{
 #gameOver{
 	height:100%;
 	position: absolute;
+	right:120px;
 	background:rgba(0,0,0,.75);
 	z-index:999;
 	color:#ffe100;

dist/tetrion.js

@@ -158,7 +158,7 @@ var tetrisCanvas = {
 				if (value === 1){
 					var x = gsize *(shape.x + j);
 					var y = gsize *(bottomY + i); //(shape.y + i);
-					drawBox(this.sceneContext,shape.color,x,y,gsize);
+					drawBox(this.sceneContext,"rgba(255, 255, 255, 0.4)",x,y,gsize);
 				}
 			}
 		}
@@ -403,23 +403,15 @@ var UserInputs = {
 		this.gpButtons = gamepad.update();
 	},
 
-	incFrame() {
-		this.frames++;
-		this.nframe++;
-	},
 	incDeciframes() {
 		this.nDeciframes++;
 		this.nDeciframesKey++;
+		this.keyboardButtonsDeciframes++;
+		this.keyboardDirectionArrowsDeciframes++;
+		this.gamepadButtonsDeciFrames++;
+		this.gamepadDirectionPadDeciFrames++;
 	},
 	processGamepadInput() {
-		
-		this.gamepadDown("DPad-Left");
-		this.gamepadDown("DPad-Right");
-		this.gamepadDown("DPad-Down");
-		
-		return;
-	},
-	processButtons() {
 		this.gamepadButtonsDown("RB");
 		this.gamepadButtonsDown("LB");
 		this.gamepadButtonsDown("A");
@@ -427,13 +419,24 @@ var UserInputs = {
 		this.gamepadButtonsDown("DPad-Up");
 		//this.gamepadButtonsDown("X");
 		//this.gamepadButtonsDown("Y");
+		
+		this.gamepadDPadDown("DPad-Left");
+		this.gamepadDPadDown("DPad-Right");
+		this.gamepadDPadDown("DPad-Down");
+		
 		return;
 	},
+	/*
+	processButtons() {
+
+		return;
+	},
+	*/
 	
 	//  X, Y, A, B , RB, LB Buttons
 	gamepadButtonsDown(finds) {
-		var deciDAS = 50;
+		var deciDAS = 50.0;
-		var deciARR = 10;
+		var deciARR = 10.0;
 		var isContained = this.gpButtons.includes(finds);
 		var isPrevContained = this.prevGpButtons.includes(finds);
 
@@ -443,25 +446,26 @@ var UserInputs = {
 			if(isContained)
 				this.gamepadQueue.push(finds);
 		}
+		var gamepadDASFrames = this.gamepadButtonsDeciFrames / 1.0;
 		
 		if (!this.isGamepadButtonDown) {
 
-				if (this.nDeciframes >= deciDAS) {
+				if (gamepadDASFrames >= deciDAS) {
-					this.nDeciframes = 0;
+					this.gamepadButtonsDeciFrames = 0;
 					this.isGamepadButtonDown = true;
 				}
 				
 		} else {
-			if (this.nDeciframes >= deciARR && isContained) {
+			if (gamepadDASFrames >= deciARR && isContained) {
 				this.gamepadQueue.push(finds);
-				this.nDeciframes = 0;
+				this.gamepadButtonsDeciFrames = 0;
 			}
 		}
 			
 	},
 	
 	// Direction Pad
-	gamepadDown(finds) {
+	gamepadDPadDown(finds) {
 		var DAS = 7;
 		var ARR = 3;
 		var isContained = this.gpButtons.includes(finds);
@@ -493,59 +497,68 @@ var UserInputs = {
 		this.processKeyDown(88);  // X
 		this.processKeyDown(90);  // Z
 	},
-	processKeyShift() {
+
-		this.processInput(39);  // right
-		this.processInput(37);	// left
-		this.processInput(40);  // down
-	},
 	// keyboard keys z,x,space
 	processKeyDown(key)
 	{
 		var deciDAS = 10;
-		var deciARR = 9;
+		var deciARR = 15
 		
 
 		if(this.prevKeyboardKeys[key] != this.keyboardKeys[key]) {
-		this.isKeyDown = false;
+			this.isKeyboardKeyDown = false;
 			if(this.keyboardKeys[key] == true)
 				this.inputqueue.push(key);
 		}
 		
-		if (!this.isKeyDown) {
+		var keyboardDASFrames = this.keyboardButtonsDeciframes;
-				if (this.nDeciframesKey >= deciDAS) {
+
-					this.nDeciframesKey = 0;
+		if (!this.isKeyboardKeyDown) {
-					this.isKeyDown = true;
+				if (keyboardDASFrames >= deciDAS) {
+					this.keyboardButtonsDeciframes = 0;
+					this.isKeyboardKeyDown = true;
 				}
 		} else {
-			if (this.nDeciframesKey >= deciARR && this.keyboardKeys[key] == true) {
+			if (keyboardDASFrames >= deciARR && this.keyboardKeys[key] == true) {
 				this.inputqueue.push(key);
-				this.nDeciframesKey = 0;
+				this.keyboardButtonsDeciframes = 0;
 			}
 		}
 		
 		
 		
 	},
-	// Direction arrows
-    processInput(key) {
-		var DAS = 13;
-		var ARR = 5;
 	
+	processKeyShift() {
+		this.processKeyboardArrowKeys(39);  // right
+		this.processKeyboardArrowKeys(37);	// left
+		this.processKeyboardArrowKeys(40);  // down
+	},
+	// Direction arrows
+    processKeyboardArrowKeys(key) {		
+		var DAS = 13;
+		var ARR = 3.0;
+
+	/*  do once?
 		if(this.prevKeyboardKeys[key] != this.keyboardKeys[key]) {
-			this.held = false;
+			this.isDirectionArrowDown = false;
 			if(this.keyboardKeys[key] == true)
 				this.inputqueue.push(key);
 		}
+		*/
+		//console.log(key + " " + this.held
+		var keyboardDASFrames = this.keyboardDirectionArrowsDeciframes / 1.0; // why isnt this 10?
+		//console.log(keyboardDASFrames + " " + this.held);
+            if (!this.isDirectionArrowDown) {
 				
-            if (!this.held) {
+                if (keyboardDASFrames >= DAS) {
-                if (this.frames >= DAS) {
+                    this.keyboardDirectionArrowsDeciframes = 0;
-                    this.frames = 0;
+                    this.isDirectionArrowDown = true;
-                    this.held = true;
                 }
             } else {
-                if (this.frames >= ARR && this.keyboardKeys[key] == true) {
+                if (keyboardDASFrames >= ARR && this.keyboardKeys[key] == true) {
                     this.inputqueue.push(key);
-                    this.frames = 0;
+                    this.keyboardDirectionArrowsDeciframes = 0;
                 }
             }
         //}
@@ -554,13 +567,11 @@ var UserInputs = {
 		this.keyboardKeys[event.keyCode] = true;
     },
     keyUp(event) {
-		this.nDeciframesKey = 0;
 		this.isKeyDown = false;
 		this.keyboardKeys[event.keyCode] = false;
     },
 	gamepadButtonClear() {
 		gpButtons = [];
-		nDeciframes = 0;
 		isGamepadDown = false;
 		isGamepadButtonDown = false;
 		gamepadQueue = [];
@@ -571,19 +582,25 @@ var UserInputs = {
 	saveKeyboardKeys() {
 		this.prevKeyboardKeys = {...this.keyboardKeys};
 	},
-    isDown: false,
+	// button states
-	isKeyDown: false,
+    isDirectionArrowDown: false,
+	isKeyboardKeyDown: false,
 	isGamepadDown: false,
 	isGamepadButtonDown: false,
-	held: false,
+	
-	nframe: 0,
+	// das frame counters 
-	frames: 0,
+	keyboardButtonsDeciframes: 0,				// DAS controlled frames/10 for non-shifted keys
-	nDeciframes: 0,
+	keyboardDirectionArrowsDeciframes: 0, 		// DAS controlled frames/10 for mino shifting keys
-	nDeciframesKey: 0,
+	gamepadButtonsDeciFrames: 0,				// DAS controlled frames/10 for non-shifted keys
+	gamepadDirectionPadDeciFrames: 0,			// DAS controlled frames/10 for mino shifting keys
+	
+	// buttons state contatiners
 	gpButtons: [],
 	prevGpButtons:[],
 	keyboardKeys: [],
 	prevKeyboardKeys: [],
+    
+	// button pressed containers
 	inputqueue: [],
 	gamepadQueue: []
 };
@@ -785,6 +802,7 @@ Tetris.prototype = {
 			this.holdQueue.push(this.shape);
 			this.shape = this.shapeQueue.shift();
 			this.canPullFromHoldQueue = false;
+			this.shape.resetOrigin();
 			//canvas.drawHoldShape(this.holdQueue);
 			this._draw(); // update?
 		}
@@ -793,10 +811,10 @@ Tetris.prototype = {
 	{
 		if(this.holdQueue.length >= 1 && this.canPullFromHoldQueue)
 		{
-			
 			this.canPullFromHoldQueue = false;
 			this.shapeQueue.unshift(this.shape);
 			this.shape = this.holdQueue.pop();
+			this.shape.resetOrigin();
 			//canvas.drawHoldShape(this.holdQueue);
 			this._draw();
 		}
@@ -904,18 +922,22 @@ Tetris.prototype = {
         this.currentTime = new Date().getTime();
 		var deltaTime = this.currentTime - this.prevTime;
 	
+/*	
 		if(deltaTime >= 10)
 		{
 			inputs.incFrame();
 			
 		}
+*/
 	
 		if(deltaTime >= 1) {	//  600hz
 			inputs.incDeciframes();
-			inputs.updateGamepad();
+		}
-			inputs.processButtons();
-			inputs.processGamepadInput();
 		
+		if(deltaTime >= 1) {
+			inputs.updateGamepad();
+			//inputs.processButtons();
+			inputs.processGamepadInput();
 		}
 		
 		// drain gamepad queue
@@ -997,14 +1019,14 @@ Tetris.prototype = {
 					this._update();
 				}
 				if(curkey == 16) {
-					 //holdQueue.push(this.shape);
+					 this.pullHoldQueue();
 					 
-					 this._update();
+					 //this._update();
 				}
 					if(curkey == 16) {
-					 //holdQueue.pop(this.shape);
+					 this.pushHoldQueue();
 					 
-					 this._update();
+					 //this._update();
 				}
 			}
 			inputs.inputqueue = [];
@@ -1120,6 +1142,7 @@ function ShapeL() {
     this.states = [state1, state2, state3, state4];
     this.x = 4;
     this.y = -3;
+	this.originY = -3;
     this.flag = 'L';
 }
 
@@ -1150,6 +1173,7 @@ function ShapeLR() {
     this.states = [state1, state2, state3, state4];
     this.x = 4;
     this.y = -3;
+	this.originY = -3;
     this.flag = 'LR';
 }
 
@@ -1164,6 +1188,7 @@ function ShapeO() {
     this.states = [state1];
     this.x = 4;
     this.y = -2;
+	this.originY = -2;
     this.flag = 'O';
 }
 
@@ -1183,6 +1208,7 @@ function ShapeI() {
 
     this.x = 5;
     this.y = -4;
+	this.originY = -4;
     this.flag = 'I';
 }
 
@@ -1212,6 +1238,7 @@ function ShapeT() {
     this.states = [state1, state2, state3, state4];
     this.x = 4;
     this.y = -2;
+	this.originY = -2;
     this.flag = 'T';
 }
 
@@ -1230,6 +1257,7 @@ function ShapeZ() {
     this.states = [state1, state2];
     this.x = 4;
     this.y = -2;
+	this.originY = -2;
     this.flag = 'Z';
 }
 
@@ -1247,7 +1275,8 @@ function ShapeZR() {
 
     this.states = [state1, state2];
     this.x = 4;
-    this.y = -2;
+    this.y = -2
+	this.originY = -2;
     this.flag = 'ZR';
 }
 
@@ -1463,6 +1492,9 @@ ShapeZR.prototype = {
 				}
 			}
 		}
+	},
+	resetOrigin: function() {
+		this.y = this.originY + 1;
 	}
 }
 

media/ico/about.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Ubuntu
+- Font Author: Copyright 2011 Canonical Ltd. Licensed under the Ubuntu Font Licence 1.0
+- Font Source: http://fonts.gstatic.com/s/ubuntu/v15/4iCs6KVjbNBYlgo6eAT3v02QFg.ttf
+- Font License: Ubuntu Font License, 1.0 (http://font.ubuntu.com/ufl/)

media/ico/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

src/canvas.js

@@ -157,7 +157,7 @@ var tetrisCanvas = {
 				if (value === 1){
 					var x = gsize *(shape.x + j);
 					var y = gsize *(bottomY + i); //(shape.y + i);
-					drawBox(this.sceneContext,shape.color,x,y,gsize);
+					drawBox(this.sceneContext,"rgba(255, 255, 255, 0.4)",x,y,gsize);
 				}
 			}
 		}

src/input.js

@@ -11,23 +11,15 @@ var UserInputs = {
 		this.gpButtons = gamepad.update();
 	},
 
-	incFrame() {
-		this.frames++;
-		this.nframe++;
-	},
 	incDeciframes() {
 		this.nDeciframes++;
 		this.nDeciframesKey++;
+		this.keyboardButtonsDeciframes++;
+		this.keyboardDirectionArrowsDeciframes++;
+		this.gamepadButtonsDeciFrames++;
+		this.gamepadDirectionPadDeciFrames++;
 	},
 	processGamepadInput() {
-		
-		this.gamepadDown("DPad-Left");
-		this.gamepadDown("DPad-Right");
-		this.gamepadDown("DPad-Down");
-		
-		return;
-	},
-	processButtons() {
 		this.gamepadButtonsDown("RB");
 		this.gamepadButtonsDown("LB");
 		this.gamepadButtonsDown("A");
@@ -35,13 +27,24 @@ var UserInputs = {
 		this.gamepadButtonsDown("DPad-Up");
 		//this.gamepadButtonsDown("X");
 		//this.gamepadButtonsDown("Y");
+		
+		this.gamepadDPadDown("DPad-Left");
+		this.gamepadDPadDown("DPad-Right");
+		this.gamepadDPadDown("DPad-Down");
+		
 		return;
 	},
+	/*
+	processButtons() {
+
+		return;
+	},
+	*/
 	
 	//  X, Y, A, B , RB, LB Buttons
 	gamepadButtonsDown(finds) {
-		var deciDAS = 50;
+		var deciDAS = 50.0;
-		var deciARR = 10;
+		var deciARR = 10.0;
 		var isContained = this.gpButtons.includes(finds);
 		var isPrevContained = this.prevGpButtons.includes(finds);
 
@@ -51,25 +54,26 @@ var UserInputs = {
 			if(isContained)
 				this.gamepadQueue.push(finds);
 		}
+		var gamepadDASFrames = this.gamepadButtonsDeciFrames / 1.0;
 		
 		if (!this.isGamepadButtonDown) {
 
-				if (this.nDeciframes >= deciDAS) {
+				if (gamepadDASFrames >= deciDAS) {
-					this.nDeciframes = 0;
+					this.gamepadButtonsDeciFrames = 0;
 					this.isGamepadButtonDown = true;
 				}
 				
 		} else {
-			if (this.nDeciframes >= deciARR && isContained) {
+			if (gamepadDASFrames >= deciARR && isContained) {
 				this.gamepadQueue.push(finds);
-				this.nDeciframes = 0;
+				this.gamepadButtonsDeciFrames = 0;
 			}
 		}
 			
 	},
 	
 	// Direction Pad
-	gamepadDown(finds) {
+	gamepadDPadDown(finds) {
 		var DAS = 7;
 		var ARR = 3;
 		var isContained = this.gpButtons.includes(finds);
@@ -101,59 +105,68 @@ var UserInputs = {
 		this.processKeyDown(88);  // X
 		this.processKeyDown(90);  // Z
 	},
-	processKeyShift() {
+
-		this.processInput(39);  // right
-		this.processInput(37);	// left
-		this.processInput(40);  // down
-	},
 	// keyboard keys z,x,space
 	processKeyDown(key)
 	{
 		var deciDAS = 10;
-		var deciARR = 9;
+		var deciARR = 15
 		
 
 		if(this.prevKeyboardKeys[key] != this.keyboardKeys[key]) {
-		this.isKeyDown = false;
+			this.isKeyboardKeyDown = false;
 			if(this.keyboardKeys[key] == true)
 				this.inputqueue.push(key);
 		}
 		
-		if (!this.isKeyDown) {
+		var keyboardDASFrames = this.keyboardButtonsDeciframes;
-				if (this.nDeciframesKey >= deciDAS) {
+
-					this.nDeciframesKey = 0;
+		if (!this.isKeyboardKeyDown) {
-					this.isKeyDown = true;
+				if (keyboardDASFrames >= deciDAS) {
+					this.keyboardButtonsDeciframes = 0;
+					this.isKeyboardKeyDown = true;
 				}
 		} else {
-			if (this.nDeciframesKey >= deciARR && this.keyboardKeys[key] == true) {
+			if (keyboardDASFrames >= deciARR && this.keyboardKeys[key] == true) {
 				this.inputqueue.push(key);
-				this.nDeciframesKey = 0;
+				this.keyboardButtonsDeciframes = 0;
 			}
 		}
 		
 		
 		
 	},
-	// Direction arrows
-    processInput(key) {
-		var DAS = 13;
-		var ARR = 5;
 	
+	processKeyShift() {
+		this.processKeyboardArrowKeys(39);  // right
+		this.processKeyboardArrowKeys(37);	// left
+		this.processKeyboardArrowKeys(40);  // down
+	},
+	// Direction arrows
+    processKeyboardArrowKeys(key) {		
+		var DAS = 13;
+		var ARR = 3.0;
+
+	/*  do once?
 		if(this.prevKeyboardKeys[key] != this.keyboardKeys[key]) {
-			this.held = false;
+			this.isDirectionArrowDown = false;
 			if(this.keyboardKeys[key] == true)
 				this.inputqueue.push(key);
 		}
+		*/
+		//console.log(key + " " + this.held
+		var keyboardDASFrames = this.keyboardDirectionArrowsDeciframes / 1.0; // why isnt this 10?
+		//console.log(keyboardDASFrames + " " + this.held);
+            if (!this.isDirectionArrowDown) {
 				
-            if (!this.held) {
+                if (keyboardDASFrames >= DAS) {
-                if (this.frames >= DAS) {
+                    this.keyboardDirectionArrowsDeciframes = 0;
-                    this.frames = 0;
+                    this.isDirectionArrowDown = true;
-                    this.held = true;
                 }
             } else {
-                if (this.frames >= ARR && this.keyboardKeys[key] == true) {
+                if (keyboardDASFrames >= ARR && this.keyboardKeys[key] == true) {
                     this.inputqueue.push(key);
-                    this.frames = 0;
+                    this.keyboardDirectionArrowsDeciframes = 0;
                 }
             }
         //}
@@ -162,13 +175,11 @@ var UserInputs = {
 		this.keyboardKeys[event.keyCode] = true;
     },
     keyUp(event) {
-		this.nDeciframesKey = 0;
 		this.isKeyDown = false;
 		this.keyboardKeys[event.keyCode] = false;
     },
 	gamepadButtonClear() {
 		gpButtons = [];
-		nDeciframes = 0;
 		isGamepadDown = false;
 		isGamepadButtonDown = false;
 		gamepadQueue = [];
@@ -179,19 +190,25 @@ var UserInputs = {
 	saveKeyboardKeys() {
 		this.prevKeyboardKeys = {...this.keyboardKeys};
 	},
-    isDown: false,
+	// button states
-	isKeyDown: false,
+    isDirectionArrowDown: false,
+	isKeyboardKeyDown: false,
 	isGamepadDown: false,
 	isGamepadButtonDown: false,
-	held: false,
+	
-	nframe: 0,
+	// das frame counters 
-	frames: 0,
+	keyboardButtonsDeciframes: 0,				// DAS controlled frames/10 for non-shifted keys
-	nDeciframes: 0,
+	keyboardDirectionArrowsDeciframes: 0, 		// DAS controlled frames/10 for mino shifting keys
-	nDeciframesKey: 0,
+	gamepadButtonsDeciFrames: 0,				// DAS controlled frames/10 for non-shifted keys
+	gamepadDirectionPadDeciFrames: 0,			// DAS controlled frames/10 for mino shifting keys
+	
+	// buttons state contatiners
 	gpButtons: [],
 	prevGpButtons:[],
 	keyboardKeys: [],
 	prevKeyboardKeys: [],
+    
+	// button pressed containers
 	inputqueue: [],
 	gamepadQueue: []
 };

src/main.js

@@ -193,6 +193,7 @@ Tetris.prototype = {
 			this.holdQueue.push(this.shape);
 			this.shape = this.shapeQueue.shift();
 			this.canPullFromHoldQueue = false;
+			this.shape.resetOrigin();
 			//canvas.drawHoldShape(this.holdQueue);
 			this._draw(); // update?
 		}
@@ -201,10 +202,10 @@ Tetris.prototype = {
 	{
 		if(this.holdQueue.length >= 1 && this.canPullFromHoldQueue)
 		{
-			
 			this.canPullFromHoldQueue = false;
 			this.shapeQueue.unshift(this.shape);
 			this.shape = this.holdQueue.pop();
+			this.shape.resetOrigin();
 			//canvas.drawHoldShape(this.holdQueue);
 			this._draw();
 		}
@@ -312,18 +313,22 @@ Tetris.prototype = {
         this.currentTime = new Date().getTime();
 		var deltaTime = this.currentTime - this.prevTime;
 	
+/*	
 		if(deltaTime >= 10)
 		{
 			inputs.incFrame();
 			
 		}
+*/
 	
 		if(deltaTime >= 1) {	//  600hz
 			inputs.incDeciframes();
-			inputs.updateGamepad();
+		}
-			inputs.processButtons();
-			inputs.processGamepadInput();
 		
+		if(deltaTime >= 1) {
+			inputs.updateGamepad();
+			//inputs.processButtons();
+			inputs.processGamepadInput();
 		}
 		
 		// drain gamepad queue
@@ -405,14 +410,14 @@ Tetris.prototype = {
 					this._update();
 				}
 				if(curkey == 16) {
-					 //holdQueue.push(this.shape);
+					 this.pullHoldQueue();
 					 
-					 this._update();
+					 //this._update();
 				}
 					if(curkey == 16) {
-					 //holdQueue.pop(this.shape);
+					 this.pushHoldQueue();
 					 
-					 this._update();
+					 //this._update();
 				}
 			}
 			inputs.inputqueue = [];

src/shapes.js

@@ -34,6 +34,7 @@ function ShapeL() {
     this.states = [state1, state2, state3, state4];
     this.x = 4;
     this.y = -3;
+	this.originY = -3;
     this.flag = 'L';
 }
 
@@ -64,6 +65,7 @@ function ShapeLR() {
     this.states = [state1, state2, state3, state4];
     this.x = 4;
     this.y = -3;
+	this.originY = -3;
     this.flag = 'LR';
 }
 
@@ -78,6 +80,7 @@ function ShapeO() {
     this.states = [state1];
     this.x = 4;
     this.y = -2;
+	this.originY = -2;
     this.flag = 'O';
 }
 
@@ -97,6 +100,7 @@ function ShapeI() {
 
     this.x = 5;
     this.y = -4;
+	this.originY = -4;
     this.flag = 'I';
 }
 
@@ -126,6 +130,7 @@ function ShapeT() {
     this.states = [state1, state2, state3, state4];
     this.x = 4;
     this.y = -2;
+	this.originY = -2;
     this.flag = 'T';
 }
 
@@ -144,6 +149,7 @@ function ShapeZ() {
     this.states = [state1, state2];
     this.x = 4;
     this.y = -2;
+	this.originY = -2;
     this.flag = 'Z';
 }
 
@@ -161,7 +167,8 @@ function ShapeZR() {
 
     this.states = [state1, state2];
     this.x = 4;
-    this.y = -2;
+    this.y = -2
+	this.originY = -2;
     this.flag = 'ZR';
 }
 
@@ -377,6 +384,9 @@ ShapeZR.prototype = {
 				}
 			}
 		}
+	},
+	resetOrigin: function() {
+		this.y = this.originY + 1;
 	}
 }