more renderer code cleanup

jeffanddom · Dec 21, 2020 · 657259c · 657259c
1 parent 8fd3e03
commit 657259c
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 88 deletions.
diff --git a/src/Client.ts b/src/Client.ts
@@ -20,7 +20,7 @@ import { ClientMessage, ClientMessageType } from '~/network/ClientMessage'
 import { IServerConnection } from '~/network/ServerConnection'
 import { ServerMessage, ServerMessageType } from '~/network/ServerMessage'
 import { ParticleEmitter } from '~/particles/ParticleEmitter'
-import { Primitive2d, Renderable2d, TextAlign } from '~/renderer/interfaces'
+import { Primitive2d, Renderable2d, TextAlign } from '~/renderer/Renderer2d'
 import { Renderer3d } from '~/renderer/Renderer3d'
 import { simulate } from '~/simulate'
 import * as systems from '~/systems'

diff --git a/src/components/IRenderable.ts b/src/components/IRenderable.ts
diff --git a/src/entities/EntityManager.ts b/src/entities/EntityManager.ts
@@ -164,22 +164,6 @@ export class EntityManager {
     this.predictedDeletes = new SortedSet()
   }
 
-  // public getRenderables(aabb: [vec2, vec2]): Renderable[] {
-  //   const renderables: Renderable[] = []
-  //   for (const id of this.queryByWorldPos(aabb)) {
-  //     const r = this.renderables.get(id)
-  //     if (!r) {
-  //       continue
-  //     }
-
-  //     // an as-cast is required here to call member variables. Eventually, we
-  //     // should transform this object into a plain-old-data structure instead
-  //     // of a class.
-  //     renderables.push(...(r as IRenderable).getRenderables(this, id))
-  //   }
-  //   return renderables
-  // }
-
   public getPlayerId(playerNumber: number): EntityId | undefined {
     for (const [id, n] of this.playerNumbers) {
       if (n === playerNumber) {

diff --git a/src/particles/ParticleEmitter.ts b/src/particles/ParticleEmitter.ts
@@ -1,7 +1,7 @@
 import { vec2 } from 'gl-matrix'
 import { sample } from 'lodash'
 
-import { Primitive2d, Renderable2d } from '~/renderer/interfaces'
+import { Primitive2d, Renderable2d } from '~/renderer/Renderer2d'
 import { lerp, radialTranslate2 } from '~/util/math'
 
 interface Particle {

diff --git a/src/renderer/Renderer2d.ts b/src/renderer/Renderer2d.ts
@@ -1,8 +1,63 @@
 import { mat2d, vec2 } from 'gl-matrix'
 
-import { Primitive2d, Renderable2d, TextAlign } from '~/renderer/interfaces'
 import { transformCircle } from '~/util/math'
 
+export enum Primitive2d {
+  PATH = 0,
+  RECT = 1,
+  CIRCLE = 2,
+  LINE = 3,
+  TEXT = 4,
+}
+
+export interface Path {
+  primitive: Primitive2d.PATH
+  fillStyle: string
+  mwTransform: mat2d
+  path: Array<vec2> // modelspace coordinates
+}
+
+export interface Rect {
+  primitive: Primitive2d.RECT
+  fillStyle?: string
+  strokeStyle?: string
+  pos: vec2 // worldspace coordinates
+  dimensions: vec2
+}
+
+export interface Circle {
+  primitive: Primitive2d.CIRCLE
+  fillStyle: string
+  pos: vec2 // worldspace coordinates
+  radius: number
+}
+
+export interface Line {
+  primitive: Primitive2d.LINE
+  style: string
+  from: vec2
+  to: vec2
+  width: number
+}
+
+export enum TextAlign {
+  Min,
+  Center,
+  Max,
+}
+
+export interface Text {
+  primitive: Primitive2d.TEXT
+  style: string
+  font: string
+  pos: vec2
+  text: string
+  hAlign: TextAlign
+  vAlign: TextAlign
+}
+
+export type Renderable2d = Path | Rect | Circle | Line | Text
+
 export class Renderer2d {
   private ctx: CanvasRenderingContext2D
   private transform: mat2d

diff --git a/src/renderer/interfaces.ts b/src/renderer/interfaces.ts
diff --git a/src/tools/map/Editor.ts b/src/tools/map/Editor.ts
@@ -9,8 +9,7 @@ import * as entities from '~/entities'
 import { Keyboard } from '~/input/Keyboard'
 import { Mouse, MouseButton } from '~/input/Mouse'
 import { Map } from '~/map/interfaces'
-import { Primitive2d } from '~/renderer/interfaces'
-import { Renderer2d } from '~/renderer/Renderer2d'
+import { Primitive2d, Renderer2d } from '~/renderer/Renderer2d'
 import * as terrain from '~/terrain'
 import * as math from '~/util/math'