@caperjs/core 0.3.0 → 0.4.0

package/src/plugins/input/touch/VirtualControls.ts

@@ -1,28 +1,20 @@
-import { bindAllMethods, Logger } from '../../../utils';
-import type { ControlsActionMap, JoystickControlsScheme, TouchControlsMap, TouchControlsScheme } from '../types';
+import { bindAllMethods } from '../../../utils';
+import type { ControlsActionMap, JoystickControlsScheme, TouchControlsMap } from '../types';
 
 import { JoystickDirection } from '..';
-import { Application } from '../../../core/Application';
-import { WithSignals } from '../../../mixins/signals';
 import type { SignalConnection } from '../../../signals';
 import type { IButton, IJoystick } from '../../../ui';
 import type { Action } from '../../actions';
 import { AbstractControls } from '../AbstractControls';
+import { evaluateCombinations } from '../controlsCore';
 
-export class VirtualControls extends WithSignals(AbstractControls) {
+export class VirtualControls extends AbstractControls {
   protected scheme: Partial<TouchControlsMap>;
+  protected readonly logLabel = 'VirtualControls';
   private _buttons: Set<IButton> = new Set();
-  private _joystickMap: Partial<JoystickControlsScheme>;
-  private _buttonDownMap: Partial<TouchControlsScheme>;
-  private _buttonUpMap: Partial<TouchControlsScheme>;
-  private _combinations: string[][] = [];
   private _singleDownButtons: Set<string> = new Set();
   private _activeJoystickDirections: Map<JoystickDirection, Action> = new Map();
-  private _activeButtonDownIds: Map<string, Action> = new Map();
-  private _activeButtonUpIds: Map<string, Action> = new Map();
-  private _combinationsMap: Map<string[], Action> = new Map();
   private _buttonConnections: Map<IButton, SignalConnection[]> = new Map();
-  private _warnedMissingActions: Set<string> = new Set();
 
   constructor() {
     super();
@@ -39,10 +31,6 @@ export class VirtualControls extends WithSignals(AbstractControls) {
     this._joystick = value;
   }
 
-  get app() {
-    return Application.getInstance();
-  }
-
   addButton(button: IButton) {
     if (!button || this._buttons.has(button)) {
       return;
@@ -71,124 +59,40 @@ export class VirtualControls extends WithSignals(AbstractControls) {
 
   public initialize(scheme: Partial<TouchControlsMap>): void {
     super.initialize(scheme as Partial<ControlsActionMap>);
-    this._buttonDownMap = scheme.down || {};
-    this._buttonUpMap = scheme.up || {};
-    this._joystickMap = scheme.joystick || {};
-    this.addSignalConnection(this.app.signal.onActionContextChanged.connect(this._sortActions));
-    this._sortActions();
-  }
-
-  public connect() {
-    this.app.ticker.add(this._update);
-  }
-
-  public destroy(): void {
-    this.app.ticker.remove(this._update);
-    super.destroy();
   }
 
   isActionActive(action: Action): boolean {
     const buttonAction = this.scheme['down']?.[action] ?? null;
     if (buttonAction) {
-      if (Array.isArray(buttonAction)) {
-        return buttonAction.some((input) => this._isInputActive(input));
+      return super.isActionActive(action);
+    }
+    const joystickAction = this.scheme['joystick']?.[action] ?? null;
+    if (this._joystick && joystickAction) {
+      if (Array.isArray(joystickAction)) {
+        return joystickAction.includes(this._joystick.direction);
       } else {
-        return this._isInputActive(buttonAction);
-      }
-    } else {
-      const joystickAction = this.scheme['joystick']?.[action] ?? null;
-      if (this._joystick && joystickAction) {
-        if (Array.isArray(joystickAction)) {
-          return joystickAction.includes(this._joystick.direction);
-        } else {
-          return joystickAction === this._joystick?.direction;
-        }
+        return joystickAction === this._joystick?.direction;
       }
     }
     return false;
   }
 
-  /** A single button id, or a `+` separated combination requiring every input to be down. */
-  private _isInputActive(input: string): boolean {
-    if (input.includes('+')) {
-      return input.split('+').every((id) => this._singleDownButtons.has(id) || this._joystick?.direction === id);
-    }
-    return this._singleDownButtons.has(input);
+  protected isInputDown(id: string): boolean {
+    return this._singleDownButtons.has(id);
   }
 
-  private _warnMissingAction(key: string) {
-    if (this._warnedMissingActions.has(key)) {
-      return;
-    }
-    this._warnedMissingActions.add(key);
-    Logger.warn(`VirtualControls: scheme references unknown action "${key}"`);
+  /** A joystick direction can take part in a combination, but never stands alone. */
+  protected isComboPartDown(id: string): boolean {
+    return this._singleDownButtons.has(id) || this._joystick?.direction === id;
   }
 
-  private _sortActions() {
-    const actions = this.app.actionsPlugin.getActions();
-    this._combinations = [];
-    this._combinationsMap.clear();
-    this._activeJoystickDirections.clear();
-    this._activeButtonDownIds.clear();
-    this._activeButtonUpIds.clear();
-
-    let buttons = Object.keys(this._buttonDownMap);
-    buttons.forEach((key) => {
-      const item = this._buttonDownMap[key];
-      const action = actions[key];
-      if (!action) {
-        this._warnMissingAction(key);
-        return;
-      }
-      if (
-        action.context !== '*' &&
-        action.context !== this.app.actionContext &&
-        !action.context.includes(this.app.actionContext)
-      ) {
-        return;
-      }
-      let input = item;
-      if (input) {
-        if (!Array.isArray(input)) {
-          input = [input];
-        }
-        input.forEach((inputString) => {
-          if (inputString.includes('+')) {
-            const combo = inputString.split('+');
-            this._combinations.push(combo);
-            this._combinationsMap.set(combo, key as Action);
-          } else {
-            this._activeButtonDownIds.set(inputString, key as Action);
-          }
-        });
-      }
-    });
-
-    // sort them from the largest to smallest
-    this._combinations.sort((a, b) => b.length - a.length);
-
-    buttons = Object.keys(this._buttonUpMap);
-    buttons.forEach((key) => {
-      const item = this._buttonUpMap[key];
-      const action = actions[key];
-      if (!action) {
-        this._warnMissingAction(key);
-        return;
-      }
-      if (
-        action.context !== '*' &&
-        action.context !== this.app.actionContext &&
-        !action.context.includes(this.app.actionContext)
-      ) {
-        return;
-      }
-      this._activeButtonUpIds.set(item as string, key as Action);
-    });
+  protected _sortActions(): void {
+    super._sortActions();
 
-    const joystickActions = Object.keys(this._joystickMap);
-    joystickActions.forEach((key) => {
-      const item = this._joystickMap[key];
-      let input = item;
+    this._activeJoystickDirections.clear();
+    const joystickMap: Partial<JoystickControlsScheme> = this.scheme.joystick || {};
+    Object.keys(joystickMap).forEach((key) => {
+      let input = joystickMap[key];
       if (input) {
         if (!Array.isArray(input)) {
           input = [input];
@@ -206,7 +110,7 @@ export class VirtualControls extends WithSignals(AbstractControls) {
 
   private _handleButtonUp(button: IButton): void {
     this._singleDownButtons.delete(button.id!);
-    const action = this._activeButtonUpIds.get(button.id!);
+    const action = this.activeUpInputs.get(button.id!);
     if (action) {
       this.app.action(action, {
         combination: false,
@@ -216,30 +120,25 @@ export class VirtualControls extends WithSignals(AbstractControls) {
     }
   }
 
-  private _update() {
+  protected _update() {
     const joystickDirection = this._joystick?.direction ?? null;
     const buttonsDown = this._singleDownButtons;
-    const eliminated = new Set<string>();
-    // this._combinations is already sorted from largest to smallest
-    for (let i = 0; i < this._combinations.length; i++) {
-      const combination = this._combinations[i];
-      // check if all of the keys in the combination are down
-      if (combination.some((key) => eliminated.has(key))) {
-        continue;
-      }
-      if (combination.every((key) => buttonsDown.has(key) || joystickDirection === key)) {
-        combination.forEach((key) => eliminated.add(key));
-        // send the action
-        const action = this._combinationsMap.get(combination);
-        if (action) {
-          this.app.action(action, {
-            button: combination,
-            combination: true,
-            inputState: 'down',
-          });
-        }
+
+    // this.combinations is already sorted from largest to smallest
+    const { fired, eliminated } = evaluateCombinations(
+      this.combinations,
+      (key) => buttonsDown.has(key) || joystickDirection === key,
+    );
+    fired.forEach((combination) => {
+      const action = this.combinationsMap.get(combination);
+      if (action) {
+        this.app.action(action, {
+          button: combination,
+          combination: true,
+          inputState: 'down',
+        });
       }
-    }
+    });
 
     // order doesn't matter here
     this._singleDownButtons.forEach((id) => {
@@ -247,7 +146,7 @@ export class VirtualControls extends WithSignals(AbstractControls) {
         return;
       }
       if (buttonsDown.has(id)) {
-        const action = this._activeButtonDownIds.get(id);
+        const action = this.activeDownInputs.get(id);
         if (action) {
           this.app.action(action, {
             button: id,

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is auto-generated during the build process.
-export const version: string = '0.3.0';
+export const version: string = '0.4.0';
 export const pixiVersion: string = '8.19.0';

package/lib/plugins/input/keyboard/KeyboardContols.d.ts

@@ -1,33 +0,0 @@
-import { Application } from '../../../core/Application';
-import { Action } from '../../actions';
-import { AbstractControls } from '../AbstractControls';
-import { KeyboardControlsMap } from '../types';
-declare const KeyboardControls_base: typeof AbstractControls & import('../../..').Constructor<import('../../..').ISignalContainer>;
-export declare class KeyboardControls extends KeyboardControls_base {
-    protected scheme: Partial<KeyboardControlsMap>;
-    private _keyDownMap;
-    private _keyUpMap;
-    private _keyCombinations;
-    private _singleDownKeys;
-    private _keyCombinationsMap;
-    private _activeDownKeys;
-    private _activeUpKeys;
-    private _warnedMissingActions;
-    constructor();
-    get app(): Application;
-    isActionActive(action: Action): boolean;
-    initialize(scheme: Partial<KeyboardControlsMap>): void;
-    connect(): void;
-    destroy(): void;
-    /** A single key, or a `+` separated combination requiring every key to be down. */
-    private _isInputActive;
-    private _warnMissingAction;
-    private _sortActions;
-    private _handleContextChanged;
-    private _getPossibleActions;
-    private _handleKeyDown;
-    private _handleKeyUp;
-    private _update;
-}
-export {};
-//# sourceMappingURL=KeyboardContols.d.ts.map

package/lib/plugins/input/keyboard/KeyboardContols.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"KeyboardContols.d.ts","sourceRoot":"","sources":["../../../../src/plugins/input/keyboard/KeyboardContols.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAqB,mBAAmB,EAA0B,MAAM,UAAU,CAAC;;AAE/F,qBAAa,gBAAiB,SAAQ,qBAA6B;IACjE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC/C,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,qBAAqB,CAA0B;;IAOvD,IAAI,GAAG,gBAEN;IAED,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAYhC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,IAAI;IAOtD,OAAO;IAWP,OAAO,IAAI,IAAI;IAKtB,mFAAmF;IACnF,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,YAAY;IA4DpB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,OAAO;CA2ChB"}