Skip to content

Commit

Permalink
extract touch.js, some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown committed Sep 30, 2017
1 parent e9153f9 commit 771f837
Show file tree
Hide file tree
Showing 4 changed files with 260 additions and 219 deletions.
1 change: 1 addition & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ <h3>Next</h3>
<script type="text/javascript" src="ranking.js"></script>
<script type="text/javascript" src="compress.js"></script>
<script type="text/javascript" src="sound.js"></script>
<script type="text/javascript" src="touch.js"></script>

<!--
<script>_gaq=[['_setAccount','UA-30472693-1'],['_trackPageview']];(function(d){var g=d.createElement('script'),s=d.scripts[0];g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)})(document)</script>
Expand Down
3 changes: 1 addition & 2 deletions menu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,5 +305,4 @@ for (var s in mySettings) {
div.appendChild(span);
div.appendChild(iRight);
}
}
resize();
}
219 changes: 2 additions & 217 deletions tetris.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,174 +837,7 @@ function resize() {
timeCtx.textAlign = "center";
timeCtx.textBaseline = "middle";


// position of touch buttons
{
var dpiX = 96;
var dpiY = 96;
var winW = window.innerWidth / dpiX;
var winH = window.innerHeight / dpiY;
var buttonH = 0.7, buttonW = 1, fontSize=0.55, margin=0.1, unit="in";

var setPos = function(elem, posX, posY, sizeW, sizeH,
alignX, alignY, offsetX, offsetY, clientW, clientH)
{
elem.style.width = "" + sizeW + unit;
elem.style.height = "" + sizeH + unit;
// border ignored, for now
elem.style.left = "" + (offsetX + alignX * 0.5 * (clientW - sizeW) + posX * sizeW - ( (alignX-1) * margin/2 )) + unit;
elem.style.top = "" + (offsetY + alignY * 0.5 * (clientH - sizeH) + posY * sizeH - ( (alignY-1) * margin/2 )) + unit;
elem.style.display = "block";
elem.style.fontSize = "" + fontSize + unit;
}

var layouts = { //function array
"NONE":
function() {
for (var i = 0, len = touchButtons.length; i < len; i++)
touchButtons[i].style.display = "none";
},
"KBD_R":
function() {
setPos(touchRotLeft, 0, -1, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchRot180, 0.5, -2, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchRotRight, 1, -1, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchHold, 1.5, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchRight, 0, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchLeft, -2, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchDown, -1, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchDrop, -1, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
},
"KBD_L":
function() {
setPos(touchRotLeft, -1, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRot180, -0.4, -2, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRotRight, 0, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchHold, -1.5, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRight, 2, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchLeft, 0, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchDown, 1, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchDrop, 1, -1, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
},
"JOY":
function() {
var oy/*offset Y by block*/,ay/*align Y*/;
if (winH-winW>buttonH*1.5) {
oy=-1; ay=2;
} else {
oy=0; ay=1;
}
/* single finger */
buttonW = 0.8;
if ((winW-0.1)/4<buttonW) {
buttonW=(winW-0.1)/4;
}
setPos(touchRotLeft, -0.5, 1+oy, buttonW, buttonH, 2, ay, 0, 0, winW, winH);
setPos(touchRot180, -0.5, -1+oy, buttonW, buttonH, 2, ay, 0, 0, winW, winH);
setPos(touchRotRight, 0, 0+oy, buttonW, buttonH, 2, ay, 0, 0, winW, winH);
setPos(touchHold, -1, 0+oy, buttonW, buttonH, 2, ay, 0, 0, winW, winH);
setPos(touchRight, 1, 0+oy, buttonW, buttonH, 0, ay, 0, 0, winW, winH);
setPos(touchLeft, 0, 0+oy, buttonW, buttonH, 0, ay, 0, 0, winW, winH);
setPos(touchDown, 0.5, 1+oy, buttonW, buttonH, 0, ay, 0, 0, winW, winH);
setPos(touchDrop, 0.5, -1+oy, buttonW, buttonH, 0, ay, 0, 0, winW, winH);
},
"NARROW":
function() {
setPos(touchLeft, -2, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRight, 0, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
if (winH-winW>buttonH*1.5) {
setPos(touchDown, -1, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchDrop, -1, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
} else {
setPos(touchDown, 0, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchDrop, -1, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
}
setPos(touchRotLeft, 0, -1.2, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
setPos(touchRotRight, 0, 0, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
setPos(touchHold, 0, 1.2, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
setPos(touchRot180, 0, -2.4, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
},
"NARROW_L":
function() {
setPos(touchRotLeft, -2, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRotRight, -1, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchDrop, 0, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
if (winH-winW>buttonH*1.5) {
setPos(touchRot180, -1, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
} else {
setPos(touchRot180, 0, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
}
setPos(touchLeft, 0, -1.2, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
setPos(touchDown, 0, 0, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
setPos(touchRight, 0, 1.2, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
setPos(touchHold, 0, -2.4, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
},
"NARROW_LM":
function() {
setPos(touchLeft, 0, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchRight, 2, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
if (winH-winW>buttonH*1.5) {
setPos(touchDown, 1, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchDrop, 1, -1, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
}
else {
setPos(touchDown, 0, -1, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchDrop, 1, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
}
setPos(touchRotLeft, 0, -1.2, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRotRight, 0, -2.4, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchHold, 0, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRot180, 0, -3.6, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
},

"DELUXE":
function() {
buttonW = 0.8;
if ((winW-0.1)/4<buttonW) {
buttonW=(winW-0.1)/4;
}
setPos(touchLeft, 0, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchRight, 1, 0, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
setPos(touchDown, 0, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchDrop, 0, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRotLeft, -1, 0, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchRotRight, -1, -1, buttonW, buttonH, 2, 2, 0, 0, winW, winH);
setPos(touchHold, 0.5, -1, buttonW, buttonH, 0, 2, 0, 0, winW, winH);
//setPos(touchRot180, 0, -buttonH*2.4, buttonW, buttonH, 0, 1, 0, 0, winW, winH);
touchRot180.style.display = "none";
},

};

setPos(touchLayout, 0, 0, buttonW, buttonH, 2, 0, 0, 0, winW, winH);
if(currLayout === -2) { // none
layouts["NONE"]();
}else if(currLayout === -1) { // auto detection
if(winW<buttonW*3) {
layouts["NONE"]();
}
else if((winW-(winH*0.5)>buttonW*4.5) ||
(winH-winW>4*buttonH && winW>buttonW*5.5)) {
layouts["KBD_R"]();
}
else if(winW-(winH*0.5)>buttonW*3) {
layouts["JOY"]();
}
else if(winH-winW>0) {
layouts["NARROW"]();
}
else if(winW>=buttonW*4) {
layouts["DELUXE"]();
}
else {
layouts["NONE"]();
}
}
else {
layouts[["KBD_R","KBD_L","JOY","NARROW","NARROW_L","NARROW_LM","DELUXE"][currLayout]]();
}

}
touchButtonsLayout();

// Redraw graphics
makeSprite();
Expand All @@ -1027,6 +860,7 @@ function resize() {
//}
}
addEventListener('resize', resize, false);
addEventListener('load', resize, false);

/**
* ========================== Model ===========================================
Expand Down Expand Up @@ -1566,55 +1400,6 @@ function keyUpDown(e) {
addEventListener('keydown', keyUpDown, false);
addEventListener('keyup', keyUpDown, false);

function touch(e)
{
var winH = window.innerHeight, winW = window.innerWidth;
//if (e.type==="touchmove")
//e.preventDefault();
if ((e.type === "touchstart" || e.type === "click") && e.target === touchLayout) {
currLayout++;
if (currLayout === nLayouts) {
currLayout = -2; //none, auto, 0, 1, 2...
}
resize();
}
if (e.type === "touchstart" || e.type === "touchmove" || e.type === "touchend") {
for (var i in binds)
keyUpDown({
type: "keyup",
keyCode: binds[i],
preventDefault: function(){}
});
for (var i = 0, l = e.touches.length; i < l; i++) {
var tX = e.touches[i].pageX, tY = e.touches[i].pageY;
for (var j in touchButtons) {
var oRef = touchButtons[j];
if (tX>=oRef.offsetLeft && tX<oRef.offsetLeft+oRef.offsetWidth &&
tY>=oRef.offsetTop && tY<oRef.offsetTop+oRef.offsetHeight) {
keyUpDown({
type: "keydown",
keyCode: binds[oRef.bindsMemberName],
preventDefault: function(){}
});
e.preventDefault();
}
}
}
}
}

function preventDefault(e) {
e.preventDefault();
}
document.addEventListener('touchstart',touch, false);
document.addEventListener('touchmove',touch, false);
document.addEventListener('touchend',touch, false);
document.addEventListener('click',touch, false);

document.addEventListener('gesturestart',preventDefault,false);
document.addEventListener('gestureend',preventDefault,false);
document.addEventListener('gesturechange',preventDefault,false);

// ========================== Loop ============================================

//TODO Cleanup gameloop and update.
Expand Down
Loading

0 comments on commit 771f837

Please sign in to comment.