add targeting debug draw

jeffanddom · Dec 22, 2020 · 8b82a5b · 8b82a5b
1 parent 057eb38
commit 8b82a5b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/src/Client.ts b/src/Client.ts
@@ -39,7 +39,7 @@ export class Client {
     cursorMode: CursorMode
   }
   serverConnection: IServerConnection | null
-  playerNumber: number
+  playerNumber: number | undefined
   serverFrameUpdates: {
     frame: number
     inputs: ClientMessage[]
@@ -95,7 +95,7 @@ export class Client {
     this.localMessageHistory = []
     this.playerInputState = { cursorMode: CursorMode.NONE }
     this.serverConnection = null
-    this.playerNumber = -1
+    this.playerNumber = undefined
     this.serverFrameUpdates = []
     this.committedFrame = -1
     this.simulationFrame = 0
@@ -179,7 +179,7 @@ export class Client {
         vec2.scale(vec2.create(), this.map.dimensions, TILE_SIZE),
       ),
     ])
-    this.entityManager.currentPlayer = this.playerNumber
+    this.entityManager.currentPlayer = this.playerNumber!
 
     this.terrainLayer = initMap(this.entityManager, this.map)
     this.renderer3d.loadModel('terrain', this.terrainLayer.getModel())
@@ -316,7 +316,7 @@ export class Client {
           this.emitters = this.emitters.filter((e) => !e.dead)
           this.emitters.forEach((e) => e.update(dt))
 
-          const playerId = this.entityManager.getPlayerId(this.playerNumber)
+          const playerId = this.entityManager.getPlayerId(this.playerNumber!)
           if (playerId) {
             const transform = this.entityManager.transforms.get(playerId)!
             this.camera2d.setPosition(transform.position)

diff --git a/src/systems/client/playerInput.ts b/src/systems/client/playerInput.ts
@@ -72,7 +72,7 @@ const handleMoveInput = (client: Client, frame: number): void => {
     direction = DirectionMove.E
   }
 
-  if (direction !== undefined) {
+  if (direction !== undefined && client.playerNumber !== undefined) {
     client.sendClientMessage({
       frame,
       playerNumber: client.playerNumber,
@@ -105,13 +105,30 @@ const handleAttackInput = (client: Client, frame: number): void => {
     cameraWorldPos[2] - (cameraWorldPos[1] * dz) / dy,
   )
 
-  client.sendClientMessage({
-    frame,
-    playerNumber: client.playerNumber,
-    type: ClientMessageType.TANK_AIM,
-    targetPos,
-    firing: client.mouse.isDown(MouseButton.LEFT),
-  })
+  if (client.playerNumber !== undefined) {
+    client.sendClientMessage({
+      frame,
+      playerNumber: client.playerNumber,
+      type: ClientMessageType.TANK_AIM,
+      targetPos,
+      firing: client.mouse.isDown(MouseButton.LEFT),
+    })
+
+    const playerId = client.entityManager.getPlayerId(client.playerNumber)
+    if (playerId !== undefined) {
+      const playerPos = client.entityManager.transforms.get(playerId)!.position
+      client.debugDraw3d(() => [
+        {
+          // prettier-ignore
+          points: new Float32Array([
+            playerPos[0], 0.5, playerPos[1],
+            targetPos[0], 0.5, targetPos[1],
+          ]),
+          color: vec4.fromValues(1, 0, 0, 1),
+        },
+      ])
+    }
+  }
 
   client.debugDraw3d(() => {
     const halfSize = 0.5