Skip to content

Commit

Permalink
rename ClientView to ClientRenderManager
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffomatic committed Dec 26, 2020
1 parent 4dd55c3 commit 1371efd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/client/Client.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vec2 } from 'gl-matrix'

import { ClientRenderManager } from '~/client/ClientRenderManager'
import { ClientSim } from '~/client/ClientSim'
import { ClientView } from '~/client/ClientView'
import { DebugDraw } from '~/DebugDraw'
import { GameState } from '~/Game'
import { DocumentEventKeyboard } from '~/input/DocumentEventKeyboard'
Expand All @@ -21,7 +21,7 @@ export class Client {
keyboard: IKeyboard
mouse: IMouse
debugDraw: DebugDraw
view: ClientView
renderManager: ClientRenderManager
sim: ClientSim

constructor(params: {
Expand Down Expand Up @@ -58,7 +58,7 @@ export class Client {
this.mouse = new DocumentEventMouse(this.document)
this.debugDraw = new DebugDraw()

this.view = new ClientView({
this.renderManager = new ClientRenderManager({
canvas3d: this.canvas3d,
canvas2d: this.canvas2d,
debugDraw: this.debugDraw,
Expand All @@ -67,7 +67,7 @@ export class Client {
this.sim = new ClientSim({
keyboard: this.keyboard,
mouse: this.mouse,
modelLoader: this.view.getModelLoader(),
modelLoader: this.renderManager.getModelLoader(),
debugDraw: this.debugDraw,
viewportDimensions: this.viewportDimensions,
})
Expand All @@ -84,7 +84,7 @@ export class Client {
// Maybe: getRenderables3d() should not return renderables for models that
// haven't been loaded yet!
if (this.sim.state !== GameState.Connecting) {
this.view.update({
this.renderManager.update({
world2ViewTransform: this.sim.camera.getWvTransform(),
renderables3d: this.sim.getRenderables3d(),
})
Expand All @@ -101,7 +101,7 @@ export class Client {
this.canvas3d.height = this.canvas2d.height = this.viewportDimensions[1]

this.sim.setViewportDimensions(this.viewportDimensions)
this.view.setViewportDimensions(this.viewportDimensions)
this.renderManager.setViewportDimensions(this.viewportDimensions)
}

connectToServer(): Promise<void> {
Expand All @@ -119,7 +119,7 @@ export class Client {
this.mouse = new DocumentEventMouse(this.document)
this.debugDraw = new DebugDraw()

this.view = new ClientView({
this.renderManager = new ClientRenderManager({
canvas3d: this.canvas3d,
canvas2d: this.canvas2d,
debugDraw: this.debugDraw,
Expand All @@ -128,7 +128,7 @@ export class Client {
this.sim = new ClientSim({
keyboard: this.keyboard,
mouse: this.mouse,
modelLoader: this.view.getModelLoader(),
modelLoader: this.renderManager.getModelLoader(),
debugDraw: this.debugDraw,
viewportDimensions: this.viewportDimensions,
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface Renderable3d {
rotXY: number
}

export class ClientView {
export class ClientRenderManager {
renderer3d: Renderer3d
renderer2d: Renderer2d
debugDraw: IDebugDrawWriter & IDebugDrawReader
Expand Down
2 changes: 1 addition & 1 deletion src/client/ClientSim.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { quat, vec2, vec3, vec4 } from 'gl-matrix'

import { Camera3d } from '~/camera/Camera3d'
import { Renderable3d } from '~/client/ClientView'
import { Renderable3d } from '~/client/ClientRenderManager'
import {
MAX_PREDICTED_FRAMES,
SIMULATION_PERIOD_S,
Expand Down

0 comments on commit 1371efd

Please sign in to comment.