@vnejs/plugins.subfeature.controls.gamepad 0.1.0 → 0.1.1

package/modules/gamepad.js

@@ -5,11 +5,13 @@ import { Module } from "@vnejs/module";
 export class Gamepad extends Module {
   name = "controls.gamepad";
 
-  init = async () => {
+  isTriggerAllowedToPress = false;
+
+  init = () => {
     const [ABSTRACT, GAMEPAD] = [this.CONST.CONTROLS.BUTTONS, this.CONST.GAMEPAD.BUTTONS];
 
     const BUTTON_PRESS_TO_KEYS_MAP = {
-      button_0: [GAMEPAD.MAIN_BUTTON_BOTTOM, GAMEPAD.ANY, ABSTRACT.INTERACT, ABSTRACT.ANY],
+      button_0: [GAMEPAD.MAIN_BUTTON_BOTTOM, GAMEPAD.ANY, ABSTRACT.ACCEPT, ABSTRACT.ANY],
       button_1: [GAMEPAD.MAIN_BUTTON_RIGHT, GAMEPAD.ANY, ABSTRACT.BACK, ABSTRACT.ANY],
       button_2: [GAMEPAD.MAIN_BUTTON_LEFT, GAMEPAD.ANY, ABSTRACT.INTERACT, ABSTRACT.ANY],
       button_3: [GAMEPAD.MAIN_BUTTON_UP, GAMEPAD.ANY, ABSTRACT.MENU, ABSTRACT.ANY],
@@ -17,30 +19,49 @@ export class Gamepad extends Module {
       button_4: [GAMEPAD.BUMPER_LEFT, GAMEPAD.ANY, ABSTRACT.TAB_PREV, ABSTRACT.ANY],
       button_5: [GAMEPAD.BUMPER_RIGHT, GAMEPAD.ANY, ABSTRACT.TAB_NEXT, ABSTRACT.ANY],
 
-      button_6: [GAMEPAD.TRIGGER_LEFT_KEYDOWN, GAMEPAD.ANY, ABSTRACT.FASTFORWARD_START, ABSTRACT.ANY],
-      // button_7: [GAMEPAD.TRIGGER_RIGHT_KEYDOWN, GAMEPAD.ANY, ABSTRACT.FASTFORWARD_START, ABSTRACT.ANY],
-
       button_8: [GAMEPAD.MENU, GAMEPAD.ANY, ABSTRACT.GAMEMENU, ABSTRACT.ANY],
       button_9: [GAMEPAD.START, GAMEPAD.ANY, ABSTRACT.MENU, ABSTRACT.ANY],
+
+      button_12: [GAMEPAD.ARROW_UP, GAMEPAD.ANY, ABSTRACT.ARROW_UP, ABSTRACT.ANY],
+      button_13: [GAMEPAD.ARROW_BOTTOM, GAMEPAD.ANY, ABSTRACT.ARROW_BOTTOM, ABSTRACT.ANY],
+      button_14: [GAMEPAD.ARROW_LEFT, GAMEPAD.ANY, ABSTRACT.ARROW_LEFT, ABSTRACT.ANY],
+      button_15: [GAMEPAD.ARROW_RIGHT, GAMEPAD.ANY, ABSTRACT.ARROW_RIGHT, ABSTRACT.ANY],
     };
 
     const BUTTON_RELEASE_TO_KEYS_MAP = {
       button_6: [GAMEPAD.TRIGGER_LEFT_KEYUP, GAMEPAD.ANY, ABSTRACT.FASTFORWARD_FINISH, ABSTRACT.ANY],
-      // button_7: [GAMEPAD.TRIGGER_RIGHT_KEYUP, GAMEPAD.ANY, ABSTRACT.FASTFORWARD_FINISH, ABSTRACT.ANY],
+      button_7: [GAMEPAD.TRIGGER_RIGHT_KEYUP, GAMEPAD.ANY, ABSTRACT.ANY],
     };
 
-    // button_7 - click
+    const BUTTON_TRIGGERS_PRESS_TO_KEYS_MAP = {
+      button_6: [GAMEPAD.TRIGGER_LEFT_KEYDOWN, GAMEPAD.ANY, ABSTRACT.FASTFORWARD_START, ABSTRACT.ANY],
+      button_7: [GAMEPAD.TRIGGER_RIGHT_KEYDOWN, GAMEPAD.ANY, ABSTRACT.ANY],
+    };
 
     joypad.on("button_press", (e) => this.emitControlEvent(BUTTON_PRESS_TO_KEYS_MAP[e.detail.buttonName]));
-    joypad.on("button_release", (e) => this.emitControlEvent(BUTTON_RELEASE_TO_KEYS_MAP[e.detail.buttonName]));
-    joypad.on("axis_move", (e) => {
-      // move cursor
+
+    joypad.on("button_release", (e) => {
+      if (!BUTTON_RELEASE_TO_KEYS_MAP[e.detail.buttonName]) return;
+
+      return this.emitControlEvent(BUTTON_RELEASE_TO_KEYS_MAP[e.detail.buttonName]);
+    });
+
+    joypad.on("button_press", (e) => {
+      if (!BUTTON_TRIGGERS_PRESS_TO_KEYS_MAP[e.detail.buttonName]) return;
+
+      if (this.isTriggerAllowedToPress) {
+        return this.emitControlEvent(BUTTON_TRIGGERS_PRESS_TO_KEYS_MAP[e.detail.buttonName]);
+      }
+
+      this.isTriggerAllowedToPress = true;
     });
   };
 
   emitControlEvent = async (keys) => {
     if (this.inProcess || !keys) return;
 
+    this.isTriggerAllowedToPress = true;
+
     this.inProcess = true;
     await this.emit(this.EVENTS.CONTROLS.EMIT, { keys });
     this.inProcess = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.subfeature.controls.gamepad",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",