Renderer2d: keep own copy of viewport dimensions

jeffanddom · Dec 21, 2020 · 1233304 · 1233304
1 parent 866894f
commit 1233304
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Camera.ts b/src/Camera.ts
@@ -5,7 +5,7 @@ import { Immutable } from '~/types/immutable'
 
 export class Camera {
   private position: vec2
-  viewportDimensions: vec2
+  private viewportDimensions: vec2
   minWorldPos: vec2
   worldDimensions: vec2
   private zoom: number // ratio of view distance to world distance

diff --git a/src/Client.ts b/src/Client.ts
@@ -149,6 +149,7 @@ export class Client {
   setViewportDimensions(d: vec2): void {
     this.camera.setViewportDimensions(d)
     this.renderer3d.setViewportDimensions(d)
+    this.renderer2d.setViewportDimensions(d)
   }
 
   startPlay(): void {
@@ -435,7 +436,7 @@ export class Client {
         this.waitingForServer ? 'WAITING FOR SERVER' : '',
       ]
 
-      const x = this.camera.viewportDimensions[0] - 10
+      const x = this.renderer2d.getViewportDimensions()[0] - 10
       let y = 10
       const res: Renderable2d[] = []
       for (const t of text) {

diff --git a/src/renderer/Renderer2d.ts b/src/renderer/Renderer2d.ts
@@ -1,5 +1,6 @@
 import { mat2d, vec2 } from 'gl-matrix'
 
+import { Immutable } from '~/types/immutable'
 import { transformCircle } from '~/util/math'
 
 export enum Primitive2d {
@@ -61,10 +62,12 @@ export type Renderable2d = Path | Rect | Circle | Line | Text
 export class Renderer2d {
   private ctx: CanvasRenderingContext2D
   private transform: mat2d
+  private viewportDimensions: vec2
 
   constructor(canvas: HTMLCanvasElement) {
     this.ctx = canvas.getContext('2d')!
     this.transform = mat2d.identity(mat2d.create())
+    this.viewportDimensions = vec2.fromValues(canvas.width, canvas.height)
   }
 
   clear(): void {
@@ -75,6 +78,14 @@ export class Renderer2d {
     this.transform = mat2d.clone(t)
   }
 
+  setViewportDimensions(dimensions: Immutable<vec2>): void {
+    this.viewportDimensions = vec2.clone(dimensions)
+  }
+
+  getViewportDimensions(): Immutable<vec2> {
+    return this.viewportDimensions
+  }
+
   setGlobalOpacity(alpha: number): void {
     this.ctx.globalAlpha = alpha
   }