1 files changed, 96 insertions, 53 deletions

diff --git a/engine/systems/Input.ts b/engine/systems/Input.ts
index 4aa9844..9afd1ab 100644
--- a/engine/systems/Input.ts
+++ b/engine/systems/Input.ts
@@ -4,30 +4,117 @@ import {
   ComponentNames,
   Velocity,
   Mass,
-  Control,
-} from "../components";
-import { Game } from "../Game";
-import { KeyConstants, PhysicsConstants } from "../config";
-import { Action } from "../interfaces";
-import { System, SystemNames } from "./";
+  Control
+} from '../components';
+import { Game } from '../Game';
+import { KeyConstants, PhysicsConstants } from '../config';
+import { Action } from '../interfaces';
+import { System, SystemNames } from '.';
+import { MessagePublisher, MessageType } from '../network';
+import { Entity } from '../entities';
 
 export class Input extends System {
+  public clientId: string;
+
   private keys: Set<string>;
   private actionTimeStamps: Map<Action, number>;
+  private messagePublisher?: MessagePublisher;
 
-  constructor() {
+  constructor(clientId: string, messagePublisher?: MessagePublisher) {
     super(SystemNames.Input);
 
-    this.keys = new Set<string>();
-    this.actionTimeStamps = new Map<Action, number>();
+    this.clientId = clientId;
+    this.keys = new Set();
+    this.actionTimeStamps = new Map();
+
+    this.messagePublisher = messagePublisher;
   }
 
   public keyPressed(key: string) {
     this.keys.add(key);
+
+    if (this.messagePublisher) {
+      this.messagePublisher.addMessage({
+        type: MessageType.NEW_INPUT,
+        body: key
+      });
+    }
   }
 
   public keyReleased(key: string) {
     this.keys.delete(key);
+
+    if (this.messagePublisher) {
+      this.messagePublisher.addMessage({
+        type: MessageType.REMOVE_INPUT,
+        body: key
+      });
+    }
+  }
+
+  public update(_dt: number, game: Game) {
+    game.forEachEntityWithComponent(ComponentNames.Control, (entity) =>
+      this.handleInput(entity)
+    );
+  }
+
+  public handleInput(entity: Entity) {
+    const controlComponent = entity.getComponent<Control>(
+      ComponentNames.Control
+    );
+    controlComponent.isControllable =
+      controlComponent.controllableBy === this.clientId;
+
+    if (!controlComponent.isControllable) return;
+
+    if (this.hasSomeKey(KeyConstants.ActionKeys.get(Action.MOVE_RIGHT))) {
+      controlComponent.controlVelocityComponent.velocity.dCartesian.dx +=
+        PhysicsConstants.PLAYER_MOVE_VEL;
+    }
+
+    if (this.hasSomeKey(KeyConstants.ActionKeys.get(Action.MOVE_LEFT))) {
+      controlComponent.controlVelocityComponent.velocity.dCartesian.dx +=
+        -PhysicsConstants.PLAYER_MOVE_VEL;
+    }
+
+    if (
+      entity.hasComponent(ComponentNames.Jump) &&
+      this.hasSomeKey(KeyConstants.ActionKeys.get(Action.JUMP))
+    ) {
+      this.performJump(entity);
+    }
+  }
+
+  private performJump(entity: Entity) {
+    const velocity = entity.getComponent<Velocity>(
+      ComponentNames.Velocity
+    ).velocity;
+    const jump = entity.getComponent<Jump>(ComponentNames.Jump);
+
+    if (jump.canJump) {
+      this.actionTimeStamps.set(Action.JUMP, performance.now());
+
+      velocity.dCartesian.dy += PhysicsConstants.PLAYER_JUMP_INITIAL_VEL;
+      jump.canJump = false;
+    }
+
+    if (
+      performance.now() - (this.actionTimeStamps.get(Action.JUMP) || 0) <
+      PhysicsConstants.MAX_JUMP_TIME_MS
+    ) {
+      const mass = entity.getComponent<Mass>(ComponentNames.Mass).mass;
+
+      const jumpForce = {
+        fCartesian: {
+          fy: mass * PhysicsConstants.PLAYER_JUMP_ACC,
+          fx: 0
+        },
+        torque: 0
+      };
+      entity
+        .getComponent<Forces>(ComponentNames.Forces)
+        ?.forces.push(jumpForce);
+    }
   }
 
   private hasSomeKey(keys?: string[]): boolean {
@@ -36,48 +123,4 @@ export class Input extends System {
     }
     return false;
   }
-
-  public update(_dt: number, game: Game) {
-    game.forEachEntityWithComponent(ComponentNames.Control, (entity) => {
-      const control = entity.getComponent<Control>(ComponentNames.Control);
-
-      if (this.hasSomeKey(KeyConstants.ActionKeys.get(Action.MOVE_RIGHT))) {
-        control.controlVelocity.dCartesian.dx +=
-          PhysicsConstants.PLAYER_MOVE_VEL;
-      }
-
-      if (this.hasSomeKey(KeyConstants.ActionKeys.get(Action.MOVE_LEFT))) {
-        control.controlVelocity.dCartesian.dx +=
-          -PhysicsConstants.PLAYER_MOVE_VEL;
-      }
-
-      if (entity.hasComponent(ComponentNames.Jump)) {
-        const velocity = entity.getComponent<Velocity>(ComponentNames.Velocity);
-        const jump = entity.getComponent<Jump>(ComponentNames.Jump);
-
-        if (this.hasSomeKey(KeyConstants.ActionKeys.get(Action.JUMP))) {
-          if (jump.canJump) {
-            this.actionTimeStamps.set(Action.JUMP, performance.now());
-
-            velocity.dCartesian.dy += PhysicsConstants.PLAYER_JUMP_INITIAL_VEL;
-            jump.canJump = false;
-          }
-
-          if (
-            performance.now() - (this.actionTimeStamps.get(Action.JUMP) || 0) <
-            PhysicsConstants.MAX_JUMP_TIME_MS
-          ) {
-            const mass = entity.getComponent<Mass>(ComponentNames.Mass).mass;
-            entity.getComponent<Forces>(ComponentNames.Forces)?.forces.push({
-              fCartesian: {
-                fy: mass * PhysicsConstants.PLAYER_JUMP_ACC,
-                fx: 0,
-              },
-              torque: 0,
-            });
-          }
-        }
-      }
-    });
-  }
 }