Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

use MouseEvent in keyboard hooks

This commit is contained in:
Dimava 2020-05-30 10:56:23 +03:00
parent da94d5264a
commit e58c2fd371
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,25 +182,28 @@ export class InputDistributor {
}
/**
* @param {KeyboardEvent} event
* @param {KeyboardEvent | MouseEvent} event
*/
handleKeydown(event) {
const keyCode = event instanceof MouseEvent ? event.button : event.keyCode;
if (
event.keyCode === 9 || // TAB
event.keyCode === 16 || // SHIFT
event.keyCode === 17 || // CTRL
event.keyCode === 18 || // ALT
(event.keyCode >= 112 && event.keyCode < 122) // F1 - F10
keyCode === 3 ||
keyCode === 4 || // MB3 / MB4
keyCode === 9 || // TAB
keyCode === 16 || // SHIFT
keyCode === 17 || // CTRL
keyCode === 18 || // ALT
(keyCode >= 112 && keyCode < 122) // F1 - F10
) {
event.preventDefault();
}
const isInitial = !this.keysDown.has(event.keyCode);
this.keysDown.add(event.keyCode);
const isInitial = !this.keysDown.has(keyCode);
this.keysDown.add(keyCode);
if (
this.forwardToReceiver("keydown", {
keyCode: event.keyCode,
keyCode: keyCode,
shift: event.shiftKey,
alt: event.altKey,
initial: isInitial,
@ -210,8 +213,7 @@ export class InputDistributor {
return;
}
const code = event.keyCode;
if (code === 27) {
if (keyCode === 27) {
// Escape key
event.preventDefault();
event.stopPropagation();
@ -220,13 +222,14 @@ export class InputDistributor {
}
/**
* @param {KeyboardEvent} event
* @param {KeyboardEvent | MouseEvent} event
*/
handleKeyup(event) {
this.keysDown.delete(event.keyCode);
const keyCode = event instanceof MouseEvent ? event.button : event.keyCode;
this.keysDown.delete(keyCode);
this.forwardToReceiver("keyup", {
keyCode: event.keyCode,
keyCode: keyCode,
shift: event.shiftKey,
alt: event.altKey,
});

5
src/js/game/camera.js
View File

@ -442,6 +442,8 @@ export class Camera extends BasicSerializableObject {
this.downPreHandler.dispatch(new Vector(event.clientX, event.clientY), enumMouseButton.middle);
} else if (event.button === 2) {
this.downPreHandler.dispatch(new Vector(event.clientX, event.clientY), enumMouseButton.right);
} else {
this.root.app.inputMgr.handleKeydown(event);
}
return false;
}
@ -484,6 +486,9 @@ export class Camera extends BasicSerializableObject {
if (!this.checkPreventDoubleMouse()) {
return;
}
if (event.button >= 3) {
this.root.app.inputMgr.handleKeyup(event);
}
this.combinedSingleTouchStopHandler(event.clientX, event.clientY);
return false;