Introduce RendererStats to WebGLMapRenderer.

Author: tritao

src/mapviewer/MapViewerRenderer.ts

@@ -13,44 +13,21 @@ import { InputManager } from "../util/InputManager";
 import { WebGLMapSquare } from "../renderer/webgl/WebGLMapSquare";
 import { SdMapData } from "../renderer/loader/SdMapData";
 import { Pathfinder } from "../rs/pathfinder/Pathfinder";
-
-export class MapViewerRendererStats {
-    frameStart: number;
-    interactionsTime: number;
-
-    opaquePassTime: number;
-    opaqueNpcPassTime: number;
-    transparentPassTime: number;
-    transparentNpcPassTime: number;
-
-    constructor() {
-        this.frameStart = 0;
-        this.interactionsTime = 0;
-        this.opaquePassTime = 0;
-        this.opaqueNpcPassTime = 0;
-        this.transparentPassTime = 0;
-        this.transparentNpcPassTime = 0;
-    }
-};
+import { RendererStats } from "../renderer/webgl/RendererStats";
 
 export abstract class MapViewerRenderer extends RendererMainLoop {
     inputManager: InputManager;
     pathfinder: Pathfinder;
 
-    tickTime: number;
-    rendererStats: MapViewerRendererStats;
-
     // Temporary, will be cleaned up in the following commits.
     abstract getMapManager(): MapManager<WebGLMapSquare>;
     abstract getMapManagerTime(): number;
+    abstract getRendererStats(): RendererStats;
 
     constructor(public mapViewer: MapViewer) {
         super();
         this.inputManager = mapViewer.inputManager;
         this.pathfinder = mapViewer.pathfinder;
-
-        this.tickTime = 0;
-        this.rendererStats = new MapViewerRendererStats();
     }
 
     override async init() {
@@ -214,28 +191,28 @@ export abstract class MapViewerRenderer extends RendererMainLoop {
     override onFrameEnd(): void {
         super.onFrameEnd();
 
-        const frameTime = performance.now() - this.rendererStats.frameStart;
+        const frameTime = performance.now() - this.getRendererStats().frameStart;
 
         if (this.inputManager.isKeyDown("KeyH")) {
             this.mapViewer.debugText = `MapManager: ${this.getMapManagerTime().toFixed(2)}ms`;
         }
         if (this.inputManager.isKeyDown("KeyJ")) {
-            this.mapViewer.debugText = `Interactions: ${this.rendererStats.interactionsTime.toFixed(2)}ms`;
+            this.mapViewer.debugText = `Interactions: ${this.getRendererStats().interactionsTime.toFixed(2)}ms`;
         }
         if (this.inputManager.isKeyDown("KeyK")) {
-            this.mapViewer.debugText = `Tick: ${this.tickTime.toFixed(2)}ms`;
+            this.mapViewer.debugText = `Tick: ${this.getRendererStats().tickTime.toFixed(2)}ms`;
         }
         if (this.inputManager.isKeyDown("KeyL")) {
-            this.mapViewer.debugText = `Opaque Pass: ${this.rendererStats.opaquePassTime.toFixed(2)}ms`;
+            this.mapViewer.debugText = `Opaque Pass: ${this.getRendererStats().opaquePassTime.toFixed(2)}ms`;
         }
         if (this.inputManager.isKeyDown("KeyB")) {
-            this.mapViewer.debugText = `Opaque Npc Pass: ${this.rendererStats.opaqueNpcPassTime.toFixed(2)}ms`;
+            this.mapViewer.debugText = `Opaque Npc Pass: ${this.getRendererStats().opaqueNpcPassTime.toFixed(2)}ms`;
         }
         if (this.inputManager.isKeyDown("KeyN")) {
-            this.mapViewer.debugText = `Transparent Pass: ${this.rendererStats.transparentPassTime.toFixed(2)}ms`;
+            this.mapViewer.debugText = `Transparent Pass: ${this.getRendererStats().transparentPassTime.toFixed(2)}ms`;
         }
         if (this.inputManager.isKeyDown("KeyM")) {
-            this.mapViewer.debugText = `Transparent Npc Pass: ${this.rendererStats.transparentNpcPassTime.toFixed(
+            this.mapViewer.debugText = `Transparent Npc Pass: ${this.getRendererStats().transparentNpcPassTime.toFixed(
                 2,
             )}ms`;
         }

src/renderer/webgl/RendererStats.ts

@@ -0,0 +1,20 @@
+export class RendererStats {
+    frameStart: number;
+    tickTime: number;
+    interactionsTime: number;
+
+    opaquePassTime: number;
+    opaqueNpcPassTime: number;
+    transparentPassTime: number;
+    transparentNpcPassTime: number;
+
+    constructor() {
+        this.frameStart = 0;
+        this.tickTime = 0;
+        this.interactionsTime = 0;
+        this.opaquePassTime = 0;
+        this.opaqueNpcPassTime = 0;
+        this.transparentPassTime = 0;
+        this.transparentNpcPassTime = 0;
+    }
+};

src/renderer/webgl/WebGLMapRenderer.ts

@@ -39,6 +39,7 @@ import { MapManager } from "../MapManager";
 import { SceneBuilder } from "../../rs/scene/SceneBuilder";
 import { Camera } from "../Camera";
 import { Pathfinder } from "../../rs/pathfinder/Pathfinder";
+import { RendererStats } from "./RendererStats";
 
 const MAX_TEXTURES = 2048;
 const TEXTURE_SIZE = 128;
@@ -90,6 +91,8 @@ export class WebGLMapRenderer extends MapViewerRenderer {
     camera: Camera;
     pathfinder: Pathfinder;
 
+    rendererStats: RendererStats;
+
     app!: PicoApp;
     gl!: WebGL2RenderingContext;
 
@@ -184,6 +187,10 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         return this.mapManagerTime;
     }
 
+    getRendererStats(): RendererStats {
+        return this.rendererStats;
+    }
+
     constructor(public mapViewer: MapViewer, cacheLoaders: CacheLoaders,
         inputManager: InputManager, workerPool: RenderDataWorkerPool,
         renderDistance: number, unloadDistance: number, lodDistance: number,
@@ -201,6 +208,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         );
         this.camera = camera;
         this.pathfinder = pathfinder;
+        this.rendererStats = new RendererStats();
         this.interactions = new Array(INTERACT_BUFFER_COUNT);
         for (let i = 0; i < INTERACT_BUFFER_COUNT; i++) {
             this.interactions[i] = new Interactions(INTERACTION_RADIUS);
@@ -908,7 +916,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
 
         const tickStart = performance.now();
         this.tickPass(timeSec, ticksElapsed, clientTicksElapsed);
-        this.tickTime = performance.now() - tickStart;
+        this.rendererStats.tickTime = performance.now() - tickStart;
 
         const npcDataTextureIndex = this.updateNpcDataTexture();
         const npcDataTexture = this.npcDataTextureBuffer[npcDataTextureIndex];