saner keyboard interface

jeffanddom · Dec 21, 2020 · d191e28 · d191e28
1 parent 6de5148
commit d191e28
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 45 deletions.
diff --git a/src/Client.ts b/src/Client.ts
@@ -12,7 +12,7 @@ import {
 import { EntityId } from '~/entities/EntityId'
 import { EntityManager } from '~/entities/EntityManager'
 import { GameState, gameProgression, initMap } from '~/Game'
-import { IKeyboard } from '~/input/Keyboard'
+import { IKeyboard } from '~/input/interfaces'
 import { Mouse } from '~/input/Mouse'
 import { Map } from '~/map/interfaces'
 import { getModel, loadGrid } from '~/models'
@@ -65,7 +65,7 @@ export class Client {
   framesAheadOfServer: RunningAverage
   serverInputsPerFrame: RunningAverage
 
-  keyboard?: IKeyboard
+  keyboard: IKeyboard
   mouse?: Mouse
 
   // Common game state
@@ -80,6 +80,7 @@ export class Client {
   constructor(config: {
     canvas3d: HTMLCanvasElement
     canvas2d: HTMLCanvasElement
+    keyboard: IKeyboard
   }) {
     this.entityManager = new EntityManager([
       [0, 0],
@@ -106,6 +107,8 @@ export class Client {
     this.renderer3d = new Renderer3d(config.canvas3d)
     this.renderer2d = new Renderer2d(config.canvas2d)
 
+    this.keyboard = config.keyboard
+
     this.lastUpdateAt = time.current()
     this.lastTickAt = time.current()
     this.lastRenderAt = time.current()

diff --git a/src/clientMain.tsx b/src/clientMain.tsx
@@ -2,7 +2,7 @@ import { vec2 } from 'gl-matrix'
 
 import { Client } from '~/Client'
 import * as clientHotReload from '~/clientHotReload'
-import { Keyboard } from '~/input/Keyboard'
+import { DocumentEventKeyboard } from '~/input/DocumentEventKeyboard'
 import { Mouse } from '~/input/Mouse'
 import { createServerConnectionWs } from '~/network/ServerConnection'
 
@@ -33,10 +33,13 @@ canvas2d.width = window.innerWidth
 canvas2d.height = window.innerHeight
 document.body.appendChild(canvas2d)
 
-const client = new Client({ canvas3d, canvas2d })
+const client = new Client({
+  canvas3d,
+  canvas2d,
+  keyboard: new DocumentEventKeyboard(document),
+})
 
 // Set up local input
-client.keyboard = new Keyboard()
 client.mouse = new Mouse(document.body)
 
 // Development-related globals

diff --git a/src/input/Keyboard.ts → src/input/DocumentEventKeyboard.ts b/src/input/Keyboard.ts → src/input/DocumentEventKeyboard.ts
@@ -3,19 +3,13 @@
  * to internal state on a frame-by-frame basis.
  */
 
-import { keyMap } from '~/systems/client/playerInput'
+import { IKeyboard } from '~/input/interfaces'
 
-export interface IKeyboard {
-  downKeys: Set<number>
-  upKeys: Set<number>
-  update: () => void
-}
-
-export class Keyboard implements IKeyboard {
+export class DocumentEventKeyboard implements IKeyboard {
   downKeys: Set<number>
   upKeys: Set<number>
 
-  constructor() {
+  constructor(document: Document) {
     this.downKeys = new Set()
     this.upKeys = new Set()
 
@@ -37,25 +31,3 @@ export class Keyboard implements IKeyboard {
     this.upKeys.clear()
   }
 }
-
-export class SimulatedKeyboard implements IKeyboard {
-  downKeys: Set<number>
-  upKeys: Set<number>
-  frameCount: number
-
-  constructor() {
-    this.frameCount = 0
-    this.downKeys = new Set()
-    this.upKeys = new Set()
-  }
-
-  update(): void {
-    this.frameCount++
-
-    this.downKeys = new Set(
-      Math.floor(this.frameCount / 60) % 2 === 1
-        ? [keyMap.moveLeft]
-        : [keyMap.moveRight],
-    )
-  }
-}
diff --git a/src/input/interfaces.ts b/src/input/interfaces.ts
@@ -8,3 +8,9 @@ export enum DirectionMove {
   W = Math.PI / 2,
   NW = Math.PI / 4,
 }
+
+export interface IKeyboard {
+  downKeys: Set<number>
+  upKeys: Set<number>
+  update: () => void
+}
diff --git a/src/systems/client/playerInput.ts b/src/systems/client/playerInput.ts
@@ -44,10 +44,6 @@ export const update = (client: Client, frame: number): void => {
 // }
 
 const handleMoveInput = (client: Client, frame: number): void => {
-  if (!client.keyboard) {
-    return
-  }
-
   let direction
   if (client.keyboard.downKeys.has(keyMap.moveUp)) {
     if (client.keyboard.downKeys.has(keyMap.moveLeft)) {

diff --git a/src/tools/map/Editor.ts b/src/tools/map/Editor.ts
@@ -6,7 +6,7 @@ import * as _ from 'lodash'
 import { Camera } from '~/Camera'
 import { TILE_SIZE } from '~/constants'
 import * as entities from '~/entities'
-import { Keyboard } from '~/input/Keyboard'
+import { IKeyboard } from '~/input/interfaces'
 import { Mouse, MouseButton } from '~/input/Mouse'
 import { Map } from '~/map/interfaces'
 import { Primitive2d, Renderer2d } from '~/renderer/Renderer2d'
@@ -51,7 +51,7 @@ export class Editor {
   terrain: terrain.Layer
 
   camera: Camera
-  keyboard: Keyboard
+  keyboard: IKeyboard
   mouse: Mouse
 
   cursorTilePos: vec2 | null
@@ -65,7 +65,11 @@ export class Editor {
   showEntities: boolean
   showGrid: boolean
 
-  constructor(params: { canvas: HTMLCanvasElement; map: Map }) {
+  constructor(params: {
+    canvas: HTMLCanvasElement
+    map: Map
+    keyboard: IKeyboard
+  }) {
     this.renderer = new Renderer2d(params.canvas)
     this.events = new EventEmitter()
 
@@ -85,7 +89,7 @@ export class Editor {
       vec2.scale(vec2.create(), this.map.origin, TILE_SIZE),
       vec2.scale(vec2.create(), this.map.dimensions, TILE_SIZE),
     )
-    this.keyboard = new Keyboard()
+    this.keyboard = params.keyboard
     this.mouse = new Mouse(params.canvas)
 
     this.cursorTilePos = null

diff --git a/src/tools/map/index.tsx b/src/tools/map/index.tsx
@@ -4,6 +4,7 @@ import * as ReactDOM from 'react-dom'
 
 import { loadMap } from './storage'
 
+import { DocumentEventKeyboard } from '~/input/DocumentEventKeyboard'
 import { Map } from '~/map/interfaces'
 import { Controls } from '~/tools/map/Controls'
 import { Editor } from '~/tools/map/Editor'
@@ -22,7 +23,11 @@ if (map) {
   map = new Map(vec2.fromValues(64, 64))
 }
 
-const editor = new Editor({ canvas, map })
+const editor = new Editor({
+  canvas,
+  map,
+  keyboard: new DocumentEventKeyboard(document),
+})
 
 let prevFrameTime = time.current()
 function gameLoop() {