slightly saner renderer import hierarchy

jeffanddom · Dec 25, 2020 · cf80bd6 · cf80bd6
1 parent b6eacb7
commit cf80bd6
Show file tree

Hide file tree

Showing 8 changed files with 162 additions and 162 deletions.
diff --git a/src/ClientSim.ts b/src/ClientSim.ts
@@ -18,8 +18,8 @@ import { ClientMessage, ClientMessageType } from '~/network/ClientMessage'
 import { IServerConnection } from '~/network/ServerConnection'
 import { ServerMessage, ServerMessageType } from '~/network/ServerMessage'
 import { ParticleEmitter } from '~/particles/ParticleEmitter'
+import { IModelLoader } from '~/renderer/ModelLoader'
 import { Primitive2d, Renderable2d, TextAlign } from '~/renderer/Renderer2d'
-import { IModelLoader } from '~/renderer/Renderer3d'
 import { simulate } from '~/simulate'
 import * as systems from '~/systems'
 import { CursorMode } from '~/systems/client/playerInput'

diff --git a/src/ClientView.ts b/src/ClientView.ts
@@ -3,8 +3,9 @@ import { mat2d } from 'gl-matrix'
 import { vec2 } from 'gl-matrix'
 
 import { IDebugDrawReader, IDebugDrawWriter } from '~/DebugDraw'
+import { IModelLoader } from '~/renderer/ModelLoader'
 import { Renderer2d } from '~/renderer/Renderer2d'
-import { IModelLoader, Renderer3d } from '~/renderer/Renderer3d'
+import { Renderer3d } from '~/renderer/Renderer3d'
 import { Immutable } from '~/types/immutable'
 import { RunningAverage } from '~/util/RunningAverage'
 import * as time from '~/util/time'

diff --git a/src/models/index.ts b/src/models/index.ts
@@ -6,11 +6,7 @@ import { model as tank } from '~/models/tank'
 import { model as tree } from '~/models/tree'
 import { model as turret } from '~/models/turret'
 import { model as wall } from '~/models/wall'
-
-export enum ModelPrimitive {
-  Lines,
-  Triangles,
-}
+import { ModelDef, ModelPrimitive } from '~/renderer/common'
 
 const models: {
   [key: string]: {
@@ -38,16 +34,10 @@ const materials: { [key: string]: [number, number, number, number] } = {
 }
 
 type ModelTypes = keyof typeof models
-export type Model = {
-  primitive: ModelPrimitive
-  positions: Float32Array
-  colors?: Float32Array
-  normals?: Float32Array
-}
 
 const defaultColor = [1.0, 0, 1.0, 1.0]
 
-export const getModel: (modelType: ModelTypes) => Model = (modelType) => {
+export const getModel: (modelType: ModelTypes) => ModelDef = (modelType) => {
   const obj = models[modelType]
 
   const vertices: number[] = []

diff --git a/src/renderer/ModelLoader.ts b/src/renderer/ModelLoader.ts
@@ -0,0 +1,11 @@
+import { ModelDef } from '~/renderer/common'
+
+export interface IModelLoader {
+  loadModel: (modelName: string, model: ModelDef, shaderName: string) => void
+}
+
+export class StubModelLoader implements IModelLoader {
+  loadModel(_modelName: string, _model: ModelDef, _shaderName: string): void {
+    /* do nothing */
+  }
+}