refactor: Pointer System

.eslintrc.json

@@ -75,6 +75,7 @@
     "jsdoc/require-returns": 0,
     "jsdoc/require-returns-type": 0,
     "jsdoc/newline-after-description": 0,
+    "jsdoc/no-multi-asterisks": 0,
     "jsdoc/check-tag-names": ["error", { "definedTags": ["hidden", "internal", "source", "obsolete", "warning", "notimplemented", "credit", "typedoc"]}]
   }
 }

sandbox/src/game.ts

@@ -640,7 +640,25 @@ game.input.keyboard.on('up', (e?: ex.Input.KeyEvent) => {
 });
 
 player.on('pointerdown', (e?: ex.Input.PointerEvent) => {
-  alert('Player clicked!');
+  // alert('Player clicked!');
+});
+player.on('pointerdown', () => {
+  console.log('pointer down');
+});
+player.on('pointerup', () => {
+  console.log('pointer up');
+});
+player.on('pointermove', () => {
+  //console.log('pointer over');
+});
+player.on('pointerleave', () => {
+  console.log('pointer exit');
+});
+player.on('pointerenter', () => {
+  console.log('pointer enter');
+});
+player.on('pointerwheel', () => {
+  console.log('pointer wheel');
 });
 
 var newScene = new ex.Scene();
@@ -820,7 +838,7 @@ var trigger = new ex.Trigger({
 
 game.add(trigger);
 
-game.input.pointers.primary.on('down', (evt?: ex.Input.PointerEvent) => {
+game.input.pointers.primary.on('down', (evt: ex.Input.PointerEvent) => {
   var c = tileMap.getCellByPoint(evt.worldPos.x, evt.worldPos.y);
   if (c) {
     if (c.solid) {

sandbox/tests/boundingbox/bbtester.ts

@@ -38,14 +38,14 @@ block2.on('pointerdragend', (pe: ex.Input.PointerEvent) => {
 // Drag box around
 block2.on('pointerdragmove', (pe: ex.Input.PointerEvent) => {
   if (boxPointerDragging) {
-    block2.pos = pe.pointer.lastWorldPos;
+    block2.pos = pe.worldPos;
   }
 });
 
 // Drag box around
 block2.on('pointerdragleave', (pe: ex.Input.PointerEvent) => {
   if (boxPointerDragging) {
-    block2.pos = pe.pointer.lastWorldPos;
+    block2.pos = pe.worldPos;
   }
 });
 

sandbox/tests/input/pointer.ts

@@ -31,7 +31,7 @@ box.on('pointerdown', (pe: ex.Input.PointerEvent) => {
 
 box2.on('pointerdown', (pe: ex.Input.PointerEvent) => {
   console.log('box2 clicked');
-  pe.stopPropagation();
+  pe.cancel();
   if (box2.color.toString() === ex.Color.White.toString()) {
     box2.color = ex.Color.Yellow;
   } else {
@@ -52,14 +52,14 @@ box.on('pointerdragend', (pe: ex.Input.PointerEvent) => {
 // Drag box around
 box.on('pointerdragmove', (pe: ex.Input.PointerEvent) => {
   if (boxPointerDragging) {
-    box.pos = pe.pointer.lastWorldPos;
+    box.pos = pe.worldPos;
   }
 });
 
 // Drag box around
 box.on('pointerdragleave', (pe: ex.Input.PointerEvent) => {
   if (boxPointerDragging) {
-    box.pos = pe.pointer.lastWorldPos;
+    box.pos = pe.worldPos;
   }
 });
 
@@ -69,7 +69,7 @@ box.on('pointerwheel', (pe: ex.Input.WheelEvent) => {
 
 // Follow cursor
 game.input.pointers.primary.on('move', (pe: ex.Input.PointerEvent) => {
-  cursor.pos = pe.pointer.lastWorldPos;
+  cursor.pos = pe.worldPos;
 });
 
 // Button type

sandbox/tests/physics/physics.ts

@@ -141,7 +141,7 @@ game.input.keyboard.on('down', (evt: ex.Input.KeyEvent) => {
   }
 });
 
-game.input.pointers.primary.on('down', (evt: ex.Input.PointerDownEvent) => {
+game.input.pointers.primary.on('down', (evt: ex.Input.PointerEvent) => {
   spawnBlock(evt.worldPos.x, evt.worldPos.y);
 });
 

src/engine/Actor.ts

@@ -20,7 +20,6 @@ import {
   EnterViewPortEvent,
   ExitViewPortEvent
 } from './Events';
-import { PointerEvent, WheelEvent, PointerDragEvent, PointerEventName } from './Input/PointerEvents';
 import { Engine } from './Engine';
 import { Color } from './Color';
 import { Sprite } from './Drawing/Sprite';
@@ -51,7 +50,9 @@ import { Shape } from './Collision/Colliders/Shape';
 import { watch } from './Util/Watch';
 import { Collider, CollisionGroup } from './Collision/Index';
 import { Circle } from './Graphics/Circle';
-import { CapturePointerConfig } from './Input/CapturePointerConfig';
+import { PointerEvent } from './Input/PointerEvent';
+import { WheelEvent } from './Input/WheelEvent';
+import { PointerComponent } from './Input/PointerComponent';
 import { ActionsComponent } from './Actions/ActionsComponent';
 
 /**
@@ -197,6 +198,13 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
     return this.get(ColliderComponent);
   }
 
+  /**
+   * Access to the Actor's built in [[PointerComponent]] config
+   */
+  public get pointer(): PointerComponent {
+    return this.get(PointerComponent);
+  }
+
   /**
    * Useful for quickly scripting actor behavior, like moving to a place, patroling back and forth, blinking, etc.
    *
@@ -427,13 +435,13 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
 
   private _pointerDragMoveHandler = (pe: PointerEvent) => {
     if (this._dragging) {
-      this.pos = pe.pointer.lastWorldPos;
+      this.pos = pe.worldPos;
     }
   };
 
   private _pointerDragLeaveHandler = (pe: PointerEvent) => {
     if (this._dragging) {
-      this.pos = pe.pointer.lastWorldPos;
+      this.pos = pe.worldPos;
     }
   };
 
@@ -461,6 +469,7 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
 
   /**
    * Modify the current actor update pipeline.
+   * @deprecated will be removed in v0.26.0
    */
   public traits: Trait[] = [];
 
@@ -478,20 +487,6 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
   }
   private _color: Color;
 
-  /**
-   * Whether or not to enable the [[Traits.CapturePointer]] trait that propagates
-   * pointer events to this actor
-   */
-  public enableCapturePointer: boolean = false;
-
-  /**
-   * Configuration for [[Traits.CapturePointer]] trait
-   */
-  public capturePointer: CapturePointerConfig = {
-    captureMoveEvents: false,
-    captureDragEvents: false
-  };
-
   // #endregion
 
   /**
@@ -534,6 +529,8 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
     this.scale = scale ?? vec(1, 1);
     this.z = z ?? 0;
 
+    this.addComponent(new PointerComponent);
+
     this.addComponent(new GraphicsComponent());
     this.addComponent(new CanvasDrawComponent((ctx, delta) => this.draw(ctx, delta)));
     this.addComponent(new MotionComponent());
@@ -588,7 +585,6 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
       // TODO remove offscreen trait after legacy drawing removed
       this.traits.push(new Traits.OffscreenCulling());
     }
-    this.traits.push(new Traits.CapturePointer());
 
   }
 
@@ -618,54 +614,6 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
 
   // #region Events
 
-  private _capturePointerEvents: PointerEventName[] = [
-    'pointerup',
-    'pointerdown',
-    'pointermove',
-    'pointerenter',
-    'pointerleave',
-    'pointerdragstart',
-    'pointerdragend',
-    'pointerdragmove',
-    'pointerdragenter',
-    'pointerdragleave'
-  ];
-
-  private _captureMoveEvents: PointerEventName[] = [
-    'pointermove',
-    'pointerenter',
-    'pointerleave',
-    'pointerdragmove',
-    'pointerdragenter',
-    'pointerdragleave'
-  ];
-
-  private _captureDragEvents: PointerEventName[] = [
-    'pointerdragstart',
-    'pointerdragend',
-    'pointerdragmove',
-    'pointerdragenter',
-    'pointerdragleave'
-  ];
-
-  private _checkForPointerOptIn(eventName: string) {
-    if (eventName) {
-      const normalized = <PointerEventName>eventName.toLowerCase();
-
-      if (this._capturePointerEvents.indexOf(normalized) !== -1) {
-        this.enableCapturePointer = true;
-
-        if (this._captureMoveEvents.indexOf(normalized) !== -1) {
-          this.capturePointer.captureMoveEvents = true;
-        }
-
-        if (this._captureDragEvents.indexOf(normalized) !== -1) {
-          this.capturePointer.captureDragEvents = true;
-        }
-      }
-    }
-  }
-
   public on(eventName: Events.exittrigger, handler: (event: ExitTriggerEvent) => void): void;
   public on(eventName: Events.entertrigger, handler: (event: EnterTriggerEvent) => void): void;
   /**
@@ -720,16 +668,15 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
   public on(eventName: Events.pointermove, handler: (event: PointerEvent) => void): void;
   public on(eventName: Events.pointercancel, handler: (event: PointerEvent) => void): void;
   public on(eventName: Events.pointerwheel, handler: (event: WheelEvent) => void): void;
-  public on(eventName: Events.pointerdragstart, handler: (event: PointerDragEvent) => void): void;
-  public on(eventName: Events.pointerdragend, handler: (event: PointerDragEvent) => void): void;
-  public on(eventName: Events.pointerdragenter, handler: (event: PointerDragEvent) => void): void;
-  public on(eventName: Events.pointerdragleave, handler: (event: PointerDragEvent) => void): void;
-  public on(eventName: Events.pointerdragmove, handler: (event: PointerDragEvent) => void): void;
+  public on(eventName: Events.pointerdragstart, handler: (event: PointerEvent) => void): void;
+  public on(eventName: Events.pointerdragend, handler: (event: PointerEvent) => void): void;
+  public on(eventName: Events.pointerdragenter, handler: (event: PointerEvent) => void): void;
+  public on(eventName: Events.pointerdragleave, handler: (event: PointerEvent) => void): void;
+  public on(eventName: Events.pointerdragmove, handler: (event: PointerEvent) => void): void;
   public on(eventName: Events.enterviewport, handler: (event: EnterViewPortEvent) => void): void;
   public on(eventName: Events.exitviewport, handler: (event: ExitViewPortEvent) => void): void;
   public on(eventName: string, handler: (event: GameEvent<Actor>) => void): void;
   public on(eventName: string, handler: (event: any) => void): void {
-    this._checkForPointerOptIn(eventName);
     super.on(eventName, handler);
   }
 
@@ -787,16 +734,15 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
   public once(eventName: Events.pointermove, handler: (event: PointerEvent) => void): void;
   public once(eventName: Events.pointercancel, handler: (event: PointerEvent) => void): void;
   public once(eventName: Events.pointerwheel, handler: (event: WheelEvent) => void): void;
-  public once(eventName: Events.pointerdragstart, handler: (event: PointerDragEvent) => void): void;
-  public once(eventName: Events.pointerdragend, handler: (event: PointerDragEvent) => void): void;
-  public once(eventName: Events.pointerdragenter, handler: (event: PointerDragEvent) => void): void;
-  public once(eventName: Events.pointerdragleave, handler: (event: PointerDragEvent) => void): void;
-  public once(eventName: Events.pointerdragmove, handler: (event: PointerDragEvent) => void): void;
+  public once(eventName: Events.pointerdragstart, handler: (event: PointerEvent) => void): void;
+  public once(eventName: Events.pointerdragend, handler: (event: PointerEvent) => void): void;
+  public once(eventName: Events.pointerdragenter, handler: (event: PointerEvent) => void): void;
+  public once(eventName: Events.pointerdragleave, handler: (event: PointerEvent) => void): void;
+  public once(eventName: Events.pointerdragmove, handler: (event: PointerEvent) => void): void;
   public once(eventName: Events.enterviewport, handler: (event: EnterViewPortEvent) => void): void;
   public once(eventName: Events.exitviewport, handler: (event: ExitViewPortEvent) => void): void;
   public once(eventName: string, handler: (event: GameEvent<Actor>) => void): void;
   public once(eventName: string, handler: (event: any) => void): void {
-    this._checkForPointerOptIn(eventName);
     super.once(eventName, handler);
   }
 
@@ -844,11 +790,11 @@ export class Actor extends Entity implements Eventable, PointerEvents, CanInitia
   public off(eventName: Events.pointermove, handler?: (event: PointerEvent) => void): void;
   public off(eventName: Events.pointercancel, handler?: (event: PointerEvent) => void): void;
   public off(eventName: Events.pointerwheel, handler?: (event: WheelEvent) => void): void;
-  public off(eventName: Events.pointerdragstart, handler?: (event: PointerDragEvent) => void): void;
-  public off(eventName: Events.pointerdragend, handler?: (event: PointerDragEvent) => void): void;
-  public off(eventName: Events.pointerdragenter, handler?: (event: PointerDragEvent) => void): void;
-  public off(eventName: Events.pointerdragleave, handler?: (event: PointerDragEvent) => void): void;
-  public off(eventName: Events.pointerdragmove, handler?: (event: PointerDragEvent) => void): void;
+  public off(eventName: Events.pointerdragstart, handler?: (event: PointerEvent) => void): void;
+  public off(eventName: Events.pointerdragend, handler?: (event: PointerEvent) => void): void;
+  public off(eventName: Events.pointerdragenter, handler?: (event: PointerEvent) => void): void;
+  public off(eventName: Events.pointerdragleave, handler?: (event: PointerEvent) => void): void;
+  public off(eventName: Events.pointerdragmove, handler?: (event: PointerEvent) => void): void;
   public off(eventName: Events.prekill, handler?: (event: PreKillEvent) => void): void;
   public off(eventName: Events.postkill, handler?: (event: PostKillEvent) => void): void;
   public off(eventName: Events.initialize, handler?: (event: Events.InitializeEvent<Actor>) => void): void;

src/engine/Class.ts

@@ -1,4 +1,3 @@
-import { GameEvent } from './Events';
 import { EventDispatcher } from './EventDispatcher';
 import { Eventable } from './Interfaces/Evented';
 
@@ -22,7 +21,7 @@ export class Class implements Eventable {
    * @param eventName  Name of the event to listen for
    * @param handler    Event handler for the thrown event
    */
-  public on(eventName: string, handler: (event: GameEvent<any>) => void) {
+  public on(eventName: string, handler: (event: any) => void) {
     this.eventDispatcher.on(eventName, handler);
   }
 
@@ -34,7 +33,7 @@ export class Class implements Eventable {
    * @param eventName  Name of the event to listen for
    * @param handler    Event handler for the thrown event
    */
-  public off(eventName: string, handler?: (event: GameEvent<any>) => void) {
+  public off(eventName: string, handler?: (event: any) => void) {
     this.eventDispatcher.off(eventName, handler);
   }
 
@@ -43,7 +42,7 @@ export class Class implements Eventable {
    * @param eventName   Name of the event to emit
    * @param eventObject Data associated with this event
    */
-  public emit(eventName: string, eventObject: GameEvent<any>) {
+  public emit(eventName: string, eventObject: any) {
     this.eventDispatcher.emit(eventName, eventObject);
   }
 
@@ -53,7 +52,7 @@ export class Class implements Eventable {
    * @param eventName The name of the event to subscribe to once
    * @param handler   The handler of the event that will be auto unsubscribed
    */
-  public once(eventName: string, handler: (event: GameEvent<any>) => void) {
+  public once(eventName: string, handler: (event: any) => void) {
     this.eventDispatcher.once(eventName, handler);
   }
 }