Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

change MouseEvent keyCode to event.button + 1

Browse Source
This commit is contained in:
Dimava 2020-05-30 11:11:26 +03:00
parent 79dcd79734
commit d5d615bfd3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/core/input_distributor.js
View File

@ -185,10 +185,10 @@ export class InputDistributor {
* @param {KeyboardEvent | MouseEvent} event * @param {KeyboardEvent | MouseEvent} event
*/ */
handleKeydown(event) { handleKeydown(event) {
const keyCode = event instanceof MouseEvent ? event.button : event.keyCode; const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
if ( if (
keyCode === 3 || keyCode === 4 || // MB4
keyCode === 4 || // MB3 / MB4 keyCode === 5 || // MB5
keyCode === 9 || // TAB keyCode === 9 || // TAB
keyCode === 16 || // SHIFT keyCode === 16 || // SHIFT
keyCode === 17 || // CTRL keyCode === 17 || // CTRL
@ -225,7 +225,7 @@ export class InputDistributor {
* @param {KeyboardEvent | MouseEvent} event * @param {KeyboardEvent | MouseEvent} event
*/ */
handleKeyup(event) { handleKeyup(event) {
const keyCode = event instanceof MouseEvent ? event.button : event.keyCode; const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
this.keysDown.delete(keyCode); this.keysDown.delete(keyCode);
this.forwardToReceiver("keyup", { this.forwardToReceiver("keyup", {

10
src/js/game/key_action_mapper.js
View File

@ -86,15 +86,15 @@ for (const categoryId in KEYMAPPINGS) {
*/ */
export function getStringForKeyCode(code) { export function getStringForKeyCode(code) {
switch (code) { switch (code) {
case 0:
return "LMB";
case 1: case 1:
return "MMB"; return "LMB";
case 2: case 2:
return "RMB"; return "MMB";
case 3: case 3:
return "MB4"; return "RMB";
case 4: case 4:
return "MB4";
case 5:
return "MB5"; return "MB5";
case 8: case 8:
return "⌫"; return "⌫";

2
src/js/states/keybindings.js
View File

@ -127,7 +127,7 @@ export class KeybindingsState extends TextualGameState {
return; return;
} }
event.preventDefault(); event.preventDefault();
const keyCode = event.button; const keyCode = event.button + 1;
this.app.settings.updateKeybindingOverride(id, keyCode); this.app.settings.updateKeybindingOverride(id, keyCode);