Skip to content

Commit 2fca77c

Browse files
author
Avaer Kazmer
authored
Merge pull request #45 from modulesio/keys
Update keys for ctrl, space, tab
2 parents 16857ff + a4b2c7d commit 2fca77c

File tree

1 file changed

+32
-22
lines changed

1 file changed

+32
-22
lines changed

app.html

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,20 +1183,22 @@
11831183
_handleKey(e.keyCode, e.shiftKey);
11841184
} else {
11851185
switch (e.which) {
1186-
case 69: { // E
1186+
case 9: { // tab
1187+
e.preventDefault();
1188+
11871189
const gamepads = navigator.getGamepads();
11881190
if (gamepads[1]) {
11891191
gamepads[1].buttons[5].pressed = true;
11901192
}
11911193
break;
11921194
}
1193-
case 70: { // F
1195+
/* case 70: { // F
11941196
const gamepads = navigator.getGamepads();
11951197
if (gamepads[1]) {
11961198
gamepads[1].buttons[2].pressed = true;
11971199
}
11981200
break;
1199-
}
1201+
} */
12001202
case 46: { // del
12011203
for (let i = 0; i < currentMoveMeshes.length; i++) {
12021204
const moveMesh = currentMoveMeshes[i];
@@ -1219,20 +1221,22 @@
12191221
keyup(e) {
12201222
if (!keyboardFocus) {
12211223
switch (e.which) {
1222-
case 69: { // E
1224+
case 9: { // tab
1225+
e.preventDefault();
1226+
12231227
const gamepads = navigator.getGamepads();
12241228
if (gamepads[1]) {
12251229
gamepads[1].buttons[5].pressed = false;
12261230
}
12271231
break;
12281232
}
1229-
case 70: { // F
1233+
/* case 70: { // F
12301234
const gamepads = navigator.getGamepads();
12311235
if (gamepads[1]) {
12321236
gamepads[1].buttons[2].pressed = false;
12331237
}
12341238
break;
1235-
}
1239+
} */
12361240
}
12371241
}
12381242
},
@@ -1322,26 +1326,28 @@
13221326
} */
13231327
break;
13241328
}
1325-
case 69: { // E
1329+
case 9: { // tab
1330+
e.preventDefault();
1331+
13261332
const gamepads = navigator.getGamepads();
13271333
if (gamepads[1]) {
13281334
gamepads[1].buttons[5].pressed = true;
13291335
}
13301336
break;
13311337
}
1332-
case 70: { // E
1338+
/* case 70: { // E
13331339
const gamepads = navigator.getGamepads();
13341340
if (gamepads[1]) {
13351341
gamepads[1].buttons[2].pressed = true;
13361342
}
13371343
break;
1338-
}
1339-
case 32: { // space
1340-
keys.space = true;
1344+
} */
1345+
case 82: { // R
1346+
keys.r = true;
13411347
break;
13421348
}
1343-
case 17: { // ctrl
1344-
keys.ctrl = true;
1349+
case 70: { // F
1350+
keys.f = true;
13451351
break;
13461352
}
13471353
/* case 49: // 1
@@ -1374,26 +1380,28 @@
13741380
keys.right = false;
13751381
break;
13761382
}
1377-
case 69: { // E
1383+
case 9: { // tab
1384+
e.preventDefault();
1385+
13781386
const gamepads = navigator.getGamepads();
13791387
if (gamepads[1]) {
13801388
gamepads[1].buttons[5].pressed = false;
13811389
}
13821390
break;
13831391
}
1384-
case 70: { // F
1392+
/* case 70: { // F
13851393
const gamepads = navigator.getGamepads();
13861394
if (gamepads[1]) {
13871395
gamepads[1].buttons[2].pressed = false;
13881396
}
13891397
break;
1390-
}
1391-
case 32: { // space
1392-
keys.space = false;
1398+
} */
1399+
case 82: { // R
1400+
keys.r = false;
13931401
break;
13941402
}
1395-
case 17: { // ctrl
1396-
keys.ctrl = false;
1403+
case 70: { // F
1404+
keys.f = false;
13971405
break;
13981406
}
13991407
}
@@ -4666,6 +4674,8 @@
46664674
down: false,
46674675
left: false,
46684676
right: false,
4677+
r: false,
4678+
f: false,
46694679
};
46704680
const _makeButtons = () => ({
46714681
trigger: false,
@@ -5672,11 +5682,11 @@
56725682
velocity.x += speed * timeDiff;
56735683
// moving = true;
56745684
}
5675-
if (keys.space) {
5685+
if (keys.r) {
56765686
velocity.y += speed * timeDiff;
56775687
// moving = true;
56785688
}
5679-
if (keys.ctrl) {
5689+
if (keys.f) {
56805690
velocity.y -= speed * timeDiff;
56815691
// moving = true;
56825692
}

0 commit comments

Comments
 (0)