Introduce Pathfinder to WebGLMapRenderer.

Author: tritao

src/mapviewer/MapViewer.ts

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

src/mapviewer/MapViewerRenderer.ts

@@ -12,6 +12,7 @@ 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";
 
 export class MapViewerRendererStats {
     frameStart: number;
@@ -34,6 +35,7 @@ export class MapViewerRendererStats {
 
 export abstract class MapViewerRenderer extends RendererMainLoop {
     inputManager: InputManager;
+    pathfinder: Pathfinder;
 
     tickTime: number;
     rendererStats: MapViewerRendererStats;
@@ -45,6 +47,7 @@ export abstract class MapViewerRenderer extends RendererMainLoop {
     constructor(public mapViewer: MapViewer) {
         super();
         this.inputManager = mapViewer.inputManager;
+        this.pathfinder = mapViewer.pathfinder;
 
         this.tickTime = 0;
         this.rendererStats = new MapViewerRendererStats();

src/renderer/webgl/WebGLMapRenderer.ts

@@ -38,6 +38,7 @@ import { RenderDataWorkerPool } from "../../worker/RenderDataWorkerPool";
 import { MapManager } from "../MapManager";
 import { SceneBuilder } from "../../rs/scene/SceneBuilder";
 import { Camera } from "../Camera";
+import { Pathfinder } from "../../rs/pathfinder/Pathfinder";
 
 const MAX_TEXTURES = 2048;
 const TEXTURE_SIZE = 128;
@@ -87,6 +88,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
     lodDistance: number;
 
     camera: Camera;
+    pathfinder: Pathfinder;
 
     app!: PicoApp;
     gl!: WebGL2RenderingContext;
@@ -185,7 +187,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
     constructor(public mapViewer: MapViewer, cacheLoaders: CacheLoaders,
         inputManager: InputManager, workerPool: RenderDataWorkerPool,
         renderDistance: number, unloadDistance: number, lodDistance: number,
-        camera: Camera) {
+        camera: Camera, pathfinder: Pathfinder) {
         super(mapViewer);
         this.cacheLoaders = cacheLoaders;
         this.inputManager = inputManager;
@@ -198,6 +200,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
             this.queueLoadMap.bind(this),
         );
         this.camera = camera;
+        this.pathfinder = pathfinder;
         this.interactions = new Array(INTERACT_BUFFER_COUNT);
         for (let i = 0; i < INTERACT_BUFFER_COUNT; i++) {
             this.interactions[i] = new Interactions(INTERACTION_RADIUS);
@@ -1001,8 +1004,6 @@ export class WebGLMapRenderer extends MapViewerRenderer {
         const seqFrameLoader = this.cacheLoaders.seqFrameLoader;
         const seqTypeLoader = this.cacheLoaders.seqTypeLoader;
 
-        const pathfinder = this.mapViewer.pathfinder;
-
         this.npcRenderCount = 0;
         for (let i = 0; i < this.mapManager.visibleMapCount; i++) {
             const map = this.mapManager.visibleMaps[i];
@@ -1013,7 +1014,7 @@ export class WebGLMapRenderer extends MapViewerRenderer {
 
             for (let t = 0; t < ticksElapsed; t++) {
                 for (const npc of map.npcs) {
-                    npc.updateServerMovement(pathfinder, map.borderSize, map.collisionMaps);
+                    npc.updateServerMovement(this.pathfinder, map.borderSize, map.collisionMaps);
                 }
             }