rename SimState to FrameState

jeffanddom · May 17, 2021 · a6e2d5c · a6e2d5c
1 parent 7ef44f8
commit a6e2d5c
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
     "codemirror": "^5.59.1",
     "file-saver": "^2.0.2",
     "gl-matrix": "^3.3.0",
+    "hash-wasm": "^4.6.0",
     "l1-path-finder": "^1.0.0",
     "ndarray": "^1.0.19",
     "rc-slider": "^9.7.2",

diff --git a/src/simulate.ts b/src/simulate.ts
@@ -31,7 +31,7 @@ export function simulationPhaseDebugColor(
   }
 }
 
-export type SimState = {
+export type FrameState = {
   entityManager: EntityManager
   messages: ClientMessage[]
   frameEvents: FrameEvent[]
@@ -46,7 +46,7 @@ export type SimState = {
 }
 
 export const simulate = (
-  simState: SimState,
+  simState: FrameState,
   gameState: GameState,
   dt: number,
 ): void => {

diff --git a/src/systems/builder.ts b/src/systems/builder.ts
@@ -5,7 +5,7 @@ import { BUILDER_SPEED } from '~/constants'
 // import { TILE_SIZE } from '~/constants'
 // import { make } from '~/entities/builder'
 // import { Entity } from '~/entities/Entity'
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 // import { makeTurret } from '~/entities/turret'
 // import { makeWall } from '~/entities/wall'
 // import { pathfind } from '~/map/PathFinder'
@@ -51,7 +51,7 @@ const tilePos = vec2.create()
 const destTilePos = vec2.create()
 const nextTilePos = vec2.create()
 
-export const update = (simState: SimState, dt: number): void => {
+export const update = (simState: FrameState, dt: number): void => {
   for (const [id, builder] of simState.entityManager.builders) {
     const pos = simState.entityManager.transforms.get(id)!.position
     tileCoords(tilePos, pos)

diff --git a/src/systems/damageable.ts b/src/systems/damageable.ts
@@ -3,9 +3,9 @@ import { vec2 } from 'gl-matrix'
 import { FrameEventType } from './FrameEvent'
 
 import { PickupConstructors } from '~/entities/pickups'
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 
-export const update = (simState: SimState): void => {
+export const update = (simState: FrameState): void => {
   for (const [id, damageable] of simState.entityManager.damageables) {
     const transform = simState.entityManager.transforms.get(id)!
 

diff --git a/src/systems/damager.ts b/src/systems/damager.ts
@@ -10,7 +10,7 @@ import { DebugDrawObject } from '~/DebugDraw'
 import { EntityId } from '~/entities/EntityId'
 import { UnlitObjectType } from '~/renderer/Renderer3d'
 import {
-  SimState,
+  FrameState,
   SimulationPhase,
   simulationPhaseDebugColor,
 } from '~/simulate'
@@ -135,7 +135,7 @@ export function clone(d: Immutable<Damager>): Damager {
   }
 }
 
-export const update = (simState: SimState): void => {
+export const update = (simState: FrameState): void => {
   simState.debugDraw.draw3d(() => {
     const objects: DebugDrawObject[] = []
 

diff --git a/src/systems/explosion.ts b/src/systems/explosion.ts
@@ -8,7 +8,7 @@ import {
   EntityComponents,
   makeDefaultEntity,
 } from '~/entities/EntityComponents'
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 import { Immutable } from '~/types/immutable'
 
 export const makeExplosion = (pos: Immutable<vec2>): EntityComponents => {
@@ -32,7 +32,7 @@ export const makeExplosion = (pos: Immutable<vec2>): EntityComponents => {
   return e
 }
 
-export function update(simState: SimState): void {
+export function update(simState: FrameState): void {
   for (const id of simState.entityManager.explosions) {
     simState.frameEvents.push({
       type: FrameEventType.MortarExplosion,

diff --git a/src/systems/shooter.ts b/src/systems/shooter.ts
@@ -5,7 +5,7 @@ import { BulletConfig } from '~/components/Bullet'
 import { TILE_SIZE } from '~/constants'
 import { makeBuilder } from '~/entities/builder'
 import { makeBullet } from '~/entities/bullet'
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 import * as emitter from '~/systems/emitter'
 import { FrameEventType } from '~/systems/FrameEvent'
 import { WEAPON_TYPE_LENGTH, WeaponType } from '~/systems/WeaponType'
@@ -53,7 +53,7 @@ export function clone(s: ShooterComponent): ShooterComponent {
   }
 }
 
-export const update = (simState: SimState): void => {
+export const update = (simState: FrameState): void => {
   simState.messages.forEach((message) => {
     const id = simState.entityManager.getPlayerId(message.playerNumber)!
     const shooter = simState.entityManager.shooters.get(id)!

diff --git a/src/systems/tankMover.ts b/src/systems/tankMover.ts
@@ -12,7 +12,7 @@ import {
 } from '~/constants'
 import { DirectionMove } from '~/input/interfaces'
 import { ClientMoveUpdate } from '~/network/ClientMessage'
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 import { FrameEventType } from '~/systems/FrameEvent'
 import { WeaponType } from '~/systems/WeaponType'
 import { North2, Zero2, radialTranslate2, rotateUntil } from '~/util/math'
@@ -38,7 +38,7 @@ export function clone(t: TankMoverComponent): TankMoverComponent {
   }
 }
 
-export const update = (simState: SimState, dt: number): void => {
+export const update = (simState: FrameState, dt: number): void => {
   const messages = new Map<number, ClientMoveUpdate>()
   simState.messages.forEach((m) => {
     if (m.move !== undefined) {

diff --git a/src/systems/transformInit.ts b/src/systems/transformInit.ts
@@ -1,8 +1,8 @@
 import { vec2 } from 'gl-matrix'
 
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 
-export const update = (simState: Pick<SimState, 'entityManager'>): void => {
+export const update = (simState: Pick<FrameState, 'entityManager'>): void => {
   for (const id of simState.entityManager.moveables) {
     const transform = simState.entityManager.transforms.get(id)!
     if (!vec2.equals(transform.position, transform.previousPosition)) {

diff --git a/src/systems/turret.ts b/src/systems/turret.ts
@@ -9,7 +9,7 @@ import { Transform } from '~/components/Transform'
 import { TILE_SIZE } from '~/constants'
 import { makeBullet } from '~/entities/bullet'
 import { EntityId } from '~/entities/EntityId'
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 import { FrameEventType } from '~/systems/FrameEvent'
 import { Immutable } from '~/types/immutable'
 import { Aabb2 } from '~/util/aabb2'
@@ -35,7 +35,7 @@ export function clone(t: TurretComponent): TurretComponent {
   return { cooldownTtl: t.cooldownTtl, orientation: t.orientation }
 }
 
-export const update = (simState: SimState, dt: number): void => {
+export const update = (simState: FrameState, dt: number): void => {
   const { entityManager } = simState
 
   const turretIds = new SortedSet<EntityId>()

diff --git a/src/systems/wallCollider.ts b/src/systems/wallCollider.ts
@@ -2,7 +2,7 @@ import { vec2 } from 'gl-matrix'
 
 import { Transform } from '~/components/Transform'
 import { TILE_SIZE } from '~/constants'
-import { SimState } from '~/simulate'
+import { FrameState } from '~/simulate'
 import { Immutable } from '~/types/immutable'
 import * as aabb2 from '~/util/aabb2'
 import { Aabb2 } from '~/util/aabb2'
@@ -15,7 +15,7 @@ enum DirectionCollision {
   West = 'W',
 }
 
-export const update = (simState: Pick<SimState, 'entityManager'>): void => {
+export const update = (simState: Pick<FrameState, 'entityManager'>): void => {
   for (const [id] of simState.entityManager.playerNumbers) {
     const transform = simState.entityManager.transforms.get(id)!
     const position = transform.position

diff --git a/yarn.lock b/yarn.lock
@@ -3409,6 +3409,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hash-wasm@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/hash-wasm/-/hash-wasm-4.6.0.tgz#6944a0dd33696d9ab1245e407af22a3a459a0773"
+  integrity sha512-Wi96tJDftxUQciCUi2Vs/Nw8al3psRATe/FhyezrajJKCXKRHvpiFARTZuUgdlGB7825LiN+FluH7SFoGdiGRA==
+
 hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"