Move some files around

- ComponentTable, EntitySet, EntityStateContainer move closer to EntityManager - Hitbox is a component - Mouse and Keyboard become input - Test files into subdirectories - Remove unused localstorage
jeffanddom · Dec 21, 2020 · 7da11f5 · 7da11f5
1 parent 1830fcc
commit 7da11f5
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "start": "parcel src/index.html",
     "build": "parcel build src/index.html --public-url ./",
-    "buildServer": "npx ts-node --transpile-only src/build/buildServer.ts",
+    "buildServer": "npx ts-node --transpile-only src/cli/build/buildServer.ts",
     "dev": "npx ts-node --transpile-only src/cli/build/dev.ts",
     "devServer": "node out/server/server.js",
     "typecheck": "tsc -p . --noEmit",
@@ -69,4 +69,4 @@
     "ts-jest": "^26.1.0",
     "typescript": "^3.8.3"
   }
-}
+}
diff --git a/src/Client.ts b/src/Client.ts
@@ -12,10 +12,10 @@ import {
 import { EntityId } from '~/entities/EntityId'
 import { EntityManager } from '~/entities/EntityManager'
 import { GameState, gameProgression, initMap } from '~/Game'
-import { IKeyboard } from '~/Keyboard'
+import { IKeyboard } from '~/input/Keyboard'
+import { Mouse } from '~/input/Mouse'
 import { Map } from '~/map/interfaces'
 import { getModel, loadGrid } from '~/models'
-import { Mouse } from '~/Mouse'
 import { ClientMessage, ClientMessageType } from '~/network/ClientMessage'
 import { IServerConnection } from '~/network/ServerConnection'
 import { ServerMessage, ServerMessageType } from '~/network/ServerMessage'

diff --git a/src/clientMain.tsx b/src/clientMain.tsx
@@ -2,8 +2,8 @@ import { vec2 } from 'gl-matrix'
 
 import { Client } from '~/Client'
 import * as clientHotReload from '~/clientHotReload'
-import { Keyboard } from '~/Keyboard'
-import { Mouse } from '~/Mouse'
+import { Keyboard } from '~/input/Keyboard'
+import { Mouse } from '~/input/Mouse'
 import { createServerConnectionWs } from '~/network/ServerConnection'
 
 declare global {

diff --git a/src/components/Damageable.ts b/src/components/Damageable.ts
@@ -1,7 +1,7 @@
 import { vec2 } from 'gl-matrix'
 
+import * as hitbox from '~/components/Hitbox'
 import { Transform } from '~/components/Transform'
-import * as hitbox from '~/Hitbox'
 import { Immutable } from '~/types/immutable'
 
 export type Damageable = {

diff --git a/src/components/Damager.ts b/src/components/Damager.ts
@@ -1,9 +1,9 @@
 import { vec2 } from 'gl-matrix'
 
+import { Hitbox } from '~/components/Hitbox'
+import * as hitbox from '~/components/Hitbox'
 import { Transform } from '~/components/Transform'
 import { EntityId } from '~/entities/EntityId'
-import { Hitbox } from '~/Hitbox'
-import * as hitbox from '~/Hitbox'
 import { Immutable } from '~/types/immutable'
 
 export type Damager = {

diff --git a/src/Hitbox.ts → src/components/Hitbox.ts b/src/Hitbox.ts → src/components/Hitbox.ts
diff --git a/src/ComponentTable.ts → src/entities/ComponentTable.ts b/src/ComponentTable.ts → src/entities/ComponentTable.ts
@@ -1,5 +1,5 @@
 import { EntityId } from '~/entities/EntityId'
-import { EntityStateContainer } from '~/EntityStateContainer'
+import { EntityStateContainer } from '~/entities/EntityStateContainer'
 import { Immutable } from '~/types/immutable'
 import { SortedMap } from '~/util/SortedMap'
 

diff --git a/src/entities/EntityComponents.ts b/src/entities/EntityComponents.ts
@@ -1,10 +1,10 @@
 import { Bullet } from '~/components/Bullet'
 import { Damageable } from '~/components/Damageable'
 import { Damager } from '~/components/Damager'
+import { Hitbox } from '~/components/Hitbox'
 import { Team } from '~/components/team'
 import { Transform } from '~/components/Transform'
 import { Type } from '~/entities/types'
-import { Hitbox } from '~/Hitbox'
 import { BuilderComponent, BuilderCreator } from '~/systems/builder'
 import { PickupType } from '~/systems/pickups'
 import { ShooterComponent } from '~/systems/shooter'

diff --git a/src/entities/EntityManager.ts b/src/entities/EntityManager.ts
@@ -6,16 +6,16 @@ import * as damageable from '~/components/Damageable'
 import { Damageable } from '~/components/Damageable'
 import * as damager from '~/components/Damager'
 import { Damager } from '~/components/Damager'
+import { Hitbox, clone as hitboxClone } from '~/components/Hitbox'
 import { Team } from '~/components/team'
 import * as transform from '~/components/Transform'
 import { Transform } from '~/components/Transform'
-import { ComponentTable } from '~/ComponentTable'
+import { ComponentTable } from '~/entities/ComponentTable'
 import { EntityComponents } from '~/entities/EntityComponents'
 import { EntityId } from '~/entities/EntityId'
+import { EntitySet } from '~/entities/EntitySet'
+import { EntityStateContainer } from '~/entities/EntityStateContainer'
 import { Type } from '~/entities/types'
-import { EntitySet } from '~/EntitySet'
-import { EntityStateContainer } from '~/EntityStateContainer'
-import { Hitbox, clone as hitboxClone } from '~/Hitbox'
 import { PickupType } from '~/systems/pickups'
 import { ShooterComponent, clone as shooterClone } from '~/systems/shooter'
 import { TurretComponent } from '~/systems/turret'

diff --git a/src/EntitySet.ts → src/entities/EntitySet.ts b/src/EntitySet.ts → src/entities/EntitySet.ts
@@ -1,5 +1,5 @@
 import { EntityId } from '~/entities/EntityId'
-import { EntityStateContainer } from '~/EntityStateContainer'
+import { EntityStateContainer } from '~/entities/EntityStateContainer'
 import { SortedSet } from '~/util/SortedSet'
 
 export class EntitySet implements EntityStateContainer {

diff --git a/src/EntityStateContainer.ts → src/entities/EntityStateContainer.ts b/src/EntityStateContainer.ts → src/entities/EntityStateContainer.ts
diff --git a/src/ComponentTable.test.ts → src/entities/__test__/ComponentTable.test.ts b/src/ComponentTable.test.ts → src/entities/__test__/ComponentTable.test.ts
@@ -1,4 +1,4 @@
-import { ComponentTable } from '~/ComponentTable'
+import { ComponentTable } from '~/entities/ComponentTable'
 import { EntityId } from '~/entities/EntityId'
 
 type TestEntry = {

diff --git a/src/EntitySet.test.ts → src/entities/__test__/EntitySet.test.ts b/src/EntitySet.test.ts → src/entities/__test__/EntitySet.test.ts
@@ -1,6 +1,5 @@
-import { EntitySet } from './EntitySet'
-
 import { EntityId } from '~/entities/EntityId'
+import { EntitySet } from '~/entities/EntitySet'
 
 describe('EntitySet', () => {
   it('#has', () => {

diff --git a/src/Keyboard.ts → src/input/Keyboard.ts b/src/Keyboard.ts → src/input/Keyboard.ts
diff --git a/src/Mouse.ts → src/input/Mouse.ts b/src/Mouse.ts → src/input/Mouse.ts
diff --git a/src/interfaces.ts → src/input/interfaces.ts b/src/interfaces.ts → src/input/interfaces.ts
@@ -1,10 +1,3 @@
-export enum DirectionCollision {
-  North = 'N',
-  South = 'S',
-  East = 'E',
-  West = 'W',
-}
-
 export enum DirectionMove {
   N = 0,
   NE = -Math.PI / 4,

diff --git a/src/network/ClientMessage.ts b/src/network/ClientMessage.ts
@@ -1,6 +1,6 @@
 import { vec2 } from 'gl-matrix'
 
-import { DirectionMove } from '~/interfaces'
+import { DirectionMove } from '~/input/interfaces'
 
 export enum ClientMessageType {
   // Informs the server about the end of a client frame. Sent every frame from

diff --git a/src/storage.ts b/src/storage.ts
diff --git a/src/systems/client/playerInput.ts b/src/systems/client/playerInput.ts
@@ -1,6 +1,6 @@
 import { Client } from '~/Client'
-import { DirectionMove } from '~/interfaces'
-import { MouseButton } from '~/Mouse'
+import { DirectionMove } from '~/input/interfaces'
+import { MouseButton } from '~/input/Mouse'
 import { ClientMessageType } from '~/network/ClientMessage'
 
 export const keyMap = {

diff --git a/src/systems/hiding.ts b/src/systems/hiding.ts
@@ -1,5 +1,5 @@
+import { aabb as hitboxAabb } from '~/components/Hitbox'
 import { EntityManager } from '~/entities/EntityManager'
-import { aabb as hitboxAabb } from '~/Hitbox'
 import { aabbOverlapArea } from '~/util/math'
 
 const REQUIRED_OVERLAP = 0.5

diff --git a/src/systems/wallCollider.ts b/src/systems/wallCollider.ts
@@ -2,12 +2,18 @@ import { vec2 } from 'gl-matrix'
 
 import { Transform } from '~/components/Transform'
 import { TILE_SIZE } from '~/constants'
-import { DirectionCollision } from '~/interfaces'
 import { SimState } from '~/simulate'
 import { Immutable } from '~/types/immutable'
 import { aabbOverlap } from '~/util/math'
 import { tileBox, tileCoords } from '~/util/tileMath'
 
+enum DirectionCollision {
+  North = 'N',
+  South = 'S',
+  East = 'E',
+  West = 'W',
+}
+
 export const update = (simState: Pick<SimState, 'entityManager'>): void => {
   for (const [id] of simState.entityManager.playerNumbers) {
     const transform = simState.entityManager.transforms.get(id)!

diff --git a/src/tools/map/Editor.ts b/src/tools/map/Editor.ts
@@ -6,9 +6,9 @@ import * as _ from 'lodash'
 import { Camera } from '~/Camera'
 import { TILE_SIZE } from '~/constants'
 import * as entities from '~/entities'
-import { Keyboard } from '~/Keyboard'
+import { Keyboard } from '~/input/Keyboard'
+import { Mouse, MouseButton } from '~/input/Mouse'
 import { Map } from '~/map/interfaces'
-import { Mouse, MouseButton } from '~/Mouse'
 import { Canvas2DRenderer } from '~/renderer/Canvas2DRenderer'
 import { Primitive2d } from '~/renderer/interfaces'
 import * as terrain from '~/terrain'
@@ -160,8 +160,8 @@ export class Editor {
       } else {
         this.brush.terrain =
           TERRAIN_TYPES[
-            (TERRAIN_TYPES.indexOf(this.brush.terrain) + 1) %
-              TERRAIN_TYPES.length
+          (TERRAIN_TYPES.indexOf(this.brush.terrain) + 1) %
+          TERRAIN_TYPES.length
           ]
       }
 
@@ -184,7 +184,7 @@ export class Editor {
       } else {
         this.brush.entity =
           ENTITY_TYPES[
-            (ENTITY_TYPES.indexOf(this.brush.entity) + 1) % ENTITY_TYPES.length
+          (ENTITY_TYPES.indexOf(this.brush.entity) + 1) % ENTITY_TYPES.length
           ]
       }
 

diff --git a/src/util/PriorityQueue.test.ts → src/util/__test__/PriorityQueue.test.ts b/src/util/PriorityQueue.test.ts → src/util/__test__/PriorityQueue.test.ts
@@ -1,6 +1,6 @@
 import { shuffle } from 'lodash'
 
-import { PriorityQueue } from './PriorityQueue'
+import { PriorityQueue } from '../PriorityQueue'
 
 const permutations = <T>(values: Array<T>): Array<Array<T>> => {
   if (values.length === 0) {

diff --git a/src/util/quadtree/Quadtree.test.ts → src/util/__test__/Quadtree.test.ts b/src/util/quadtree/Quadtree.test.ts → src/util/__test__/Quadtree.test.ts
diff --git a/src/util/SortedMap.test.ts → src/util/__test__/SortedMap.test.ts b/src/util/SortedMap.test.ts → src/util/__test__/SortedMap.test.ts
@@ -1,4 +1,4 @@
-import { SortedMap } from './SortedMap'
+import { SortedMap } from '../SortedMap'
 
 describe('SortedMap', () => {
   it('basic adds/removes', () => {

diff --git a/src/util/SortedSet.test.ts → src/util/__test__/SortedSet.test.ts b/src/util/SortedSet.test.ts → src/util/__test__/SortedSet.test.ts
@@ -1,4 +1,4 @@
-import { SortedSet } from './SortedSet'
+import { SortedSet } from '../SortedSet'
 
 describe('SortedSet', () => {
   it('basic adds/removes', () => {

diff --git a/src/util/collision.test.ts → src/util/__test__/collision.test.ts b/src/util/collision.test.ts → src/util/__test__/collision.test.ts
@@ -1,6 +1,6 @@
 import { vec2 } from 'gl-matrix'
 
-import { segmentSegment } from './collision'
+import { segmentSegment } from '../collision'
 
 test('perpendicular, intersecting, neither vertical', () => {
   const segment1: [vec2, vec2] = [

diff --git a/src/util/quadtree/helpers.test.ts → src/util/__test__/helpers.test.ts b/src/util/quadtree/helpers.test.ts → src/util/__test__/helpers.test.ts
@@ -1,7 +1,6 @@
 import { vec2 } from 'gl-matrix'
 
 import { aabbOverlap } from '../math'
-
 import {
   ChildList,
   Quadrant,
@@ -12,7 +11,7 @@ import {
   nodeInsert,
   nodeQuery,
   quadrantOfAabb,
-} from './helpers'
+} from '../quadtree/helpers'
 
 type TestItem = {
   id: string