Invert the dependency between MapViewerRenderer and WebGLMapRenderer.

Author: tritao

src/mapviewer/MapViewer.ts

@@ -72,9 +72,7 @@ export class MapViewer {
     ) {
         this.loadedCache = cache;
         this.cacheLoaders = new CacheLoaders(cache);
-        this.renderer = new WebGLMapRenderer(this, this.cacheLoaders, this.inputManager, workerPool,
-            this.renderDistance, this.unloadDistance, this.lodDistance,
-            this.camera, this.pathfinder);
+        this.renderer = new MapViewerRenderer(this);
         this.initCache(cache);
     }
 

src/mapviewer/MapViewerRenderer.ts

@@ -1,48 +1,39 @@
 import { Schema } from "leva/dist/declarations/src/types";
 
-import { RendererMainLoop } from "../components/renderer/RendererMainLoop";
 import { clamp } from "../util/MathUtil";
-import { MapManager } from "../renderer/MapManager";
 import { MapViewer } from "./MapViewer";
 import { OsrsMenuEntry } from "../components/rs/menu/OsrsMenu";
 import { InteractType } from "../renderer/InteractType";
 import { INTERACTION_RADIUS } from "../renderer/Interactions";
 import { MenuTargetType } from "../rs/MenuEntry";
 import { isTouchDevice } from "../util/DeviceUtil";
-import { InputManager } from "../util/InputManager";
-import { WebGLMapSquare } from "../renderer/webgl/WebGLMapSquare";
 import { SdMapData } from "../renderer/loader/SdMapData";
 import { Pathfinder } from "../rs/pathfinder/Pathfinder";
-import { RendererStats } from "../renderer/webgl/RendererStats";
+import { WebGLMapRenderer } from "../renderer/webgl/WebGLMapRenderer";
 
-export abstract class MapViewerRenderer extends RendererMainLoop {
-    inputManager: InputManager;
+export class MapViewerRenderer extends WebGLMapRenderer {
     pathfinder: Pathfinder;
 
-    // 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;
+        super(mapViewer.cacheLoaders, mapViewer.inputManager, mapViewer.workerPool,
+            mapViewer.renderDistance, mapViewer.unloadDistance, mapViewer.lodDistance,
+            mapViewer.camera, mapViewer.pathfinder);
         this.pathfinder = mapViewer.pathfinder;
     }
 
     override async init() {
         this.inputManager.init(this.canvas);
+        super.init();
     }
 
-    override cleanUp(): void {
+    override async cleanUp(): Promise<void> {
         this.inputManager.cleanUp();
+        super.cleanUp();
     }
 
-    abstract rendererUpdate(): void;
-
-    update(time: number, deltaTime: number) {
+    override update(time: number, deltaTime: number) {
         this.handleInput(deltaTime);
-        this.rendererUpdate();
+        super.update(time, deltaTime);
     }
 
     initCache(): void { }
@@ -51,8 +42,6 @@ export abstract class MapViewerRenderer extends RendererMainLoop {
         return {};
     }
 
-    queueLoadMap(mapX: number, mapY: number): void { }
-
     handleInput(deltaTime: number) {
         this.handleKeyInput(deltaTime);
         this.handleMouseInput();
@@ -237,7 +226,7 @@ export abstract class MapViewerRenderer extends RendererMainLoop {
         // this.mapViewer.debugText = `Frame Time Js: ${this.stats.frameTimeJs.toFixed(3)}`;
     }
 
-    onMapLoad(mapData: SdMapData) {
+    override onMapLoad(mapData: SdMapData) {
         this.mapViewer.setMapImageUrl(
             mapData.mapX,
             mapData.mapY,
@@ -247,7 +236,7 @@ export abstract class MapViewerRenderer extends RendererMainLoop {
         );
     }
 
-    checkInteractions(interactReady: boolean, interactBuffer: Float32Array,
+    override checkInteractions(interactReady: boolean, interactBuffer: Float32Array,
         closestInteractIndices: Map<number, number[]>): void {
         const frameCount = this.stats.frameCount;
 

src/renderer/webgl/WebGLMapRenderer.ts

@@ -18,8 +18,6 @@ import {
 import { createTextureArray } from "./PicoTexture";
 import { Scene } from "../../rs/scene/Scene";
 import { isWebGL2Supported, pixelRatio } from "../../util/DeviceUtil";
-import { MapViewer } from "../../mapviewer/MapViewer";
-import { MapViewerRenderer } from "../../mapviewer/MapViewerRenderer";
 import { DrawRange, NULL_DRAW_RANGE } from "../DrawRange";
 import { INTERACTION_RADIUS, INTERACT_BUFFER_COUNT, Interactions } from "../Interactions";
 import { WebGLMapSquare } from "./WebGLMapSquare";
@@ -40,6 +38,7 @@ import { SceneBuilder } from "../../rs/scene/SceneBuilder";
 import { Camera } from "../Camera";
 import { Pathfinder } from "../../rs/pathfinder/Pathfinder";
 import { RendererStats } from "./RendererStats";
+import { RendererMainLoop } from "../../components/renderer/RendererMainLoop";
 
 const MAX_TEXTURES = 2048;
 const TEXTURE_SIZE = 128;
@@ -76,7 +75,7 @@ function getMaxAnisotropy(mode: TextureFilterMode): number {
     }
 }
 
-export class WebGLMapRenderer extends MapViewerRenderer {
+export class WebGLMapRenderer extends RendererMainLoop {
     inputManager: InputManager;
     workerPool: RenderDataWorkerPool;
     dataLoader = new SdMapDataLoader();
@@ -191,11 +190,11 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         return this.rendererStats;
     }
 
-    constructor(public mapViewer: MapViewer, cacheLoaders: CacheLoaders,
+    constructor(cacheLoaders: CacheLoaders,
         inputManager: InputManager, workerPool: RenderDataWorkerPool,
         renderDistance: number, unloadDistance: number, lodDistance: number,
         camera: Camera, pathfinder: Pathfinder) {
-        super(mapViewer);
+        super();
         this.cacheLoaders = cacheLoaders;
         this.inputManager = inputManager;
         this.workerPool = workerPool;
@@ -220,8 +219,6 @@ export class WebGLMapRenderer extends MapViewerRenderer {
     }
 
     async init(): Promise<void> {
-        await super.init();
-
         this.app = PicoGL.createApp(this.canvas);
         this.gl = this.app.gl as WebGL2RenderingContext;
 
@@ -358,9 +355,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         this.needsFramebufferUpdate = false;
     }
 
-    override initCache(): void {
-        super.initCache();
-
+    initCache(): void {
         const cache = this.cacheLoaders.cache;
         this.isNewTextureAnim = cache.info.game === "runescape" && cache.info.revision >= 681;
 
@@ -682,7 +677,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         };
     }
 
-    override async queueLoadMap(mapX: number, mapY: number): Promise<void> {
+    async queueLoadMap(mapX: number, mapY: number): Promise<void> {
         const mapData = await this.workerPool.queueLoad<
             SdMapLoaderInput,
             SdMapData | undefined,
@@ -707,6 +702,8 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         }
     }
 
+    onMapLoad(mapData: SdMapData) {}
+
     loadMap(
         mainProgram: Program,
         mainAlphaProgram: Program,
@@ -814,7 +811,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         this.app.resize(width, height);
     }
 
-    override rendererUpdate() {
+    override update(time: number, deltaTime: number) {
         this.camera.update(this.app.width, this.app.height);
 
         const renderDistance = this.renderDistance;
@@ -1256,6 +1253,9 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         }
     }
 
+    checkInteractions(interactReady: boolean, interactBuffer: Float32Array,
+        closestInteractIndices: Map<number, number[]>): void {}
+
     prepareInteractions(interactions: Interactions): void {
         const interactReady = interactions.check(
             this.gl,
@@ -1274,8 +1274,6 @@ export class WebGLMapRenderer extends MapViewerRenderer {
     }
 
     override async cleanUp(): Promise<void> {
-        super.cleanUp();
-
         this.quadArray?.delete();
         this.quadArray = undefined;