Refactor common rendering and util code out of map viewer.

Author: tritao

scripts/cache/load-util.ts

@@ -1,6 +1,6 @@
 import fs from "fs";
 
-import { CacheList, LoadedCache, XteaMap } from "../../src/mapviewer/Caches";
+import { CacheList, LoadedCache, XteaMap } from "../../src/util/Caches";
 import { CacheFiles } from "../../src/rs/cache/CacheFiles";
 import { CacheInfo, getLatestCache } from "../../src/rs/cache/CacheInfo";
 import { detectCacheType } from "../../src/rs/cache/CacheType";

src/mapviewer/MapViewer.ts

@@ -16,10 +16,10 @@ import { SeqFrameLoader } from "../rs/model/seq/SeqFrameLoader";
 import { Pathfinder } from "../rs/pathfinder/Pathfinder";
 import { TextureLoader } from "../rs/texture/TextureLoader";
 import { isTouchDevice, isWallpaperEngine } from "../util/DeviceUtil";
-import { CacheList, LoadedCache } from "./Caches";
-import { Camera, CameraView, ProjectionType } from "./Camera";
-import { InputManager } from "./InputManager";
-import { MapManager } from "./MapManager";
+import { CacheList, LoadedCache } from "../util/Caches";
+import { Camera, CameraView, ProjectionType } from "../renderer/Camera";
+import { InputManager } from "../util/InputManager";
+import { MapManager } from "../renderer/MapManager";
 import { MapViewerRenderer } from "./MapViewerRenderer";
 import { MapViewerRendererType, createRenderer } from "./MapViewerRenderers";
 import { NpcSpawn } from "./data/npc/NpcSpawn";

src/mapviewer/MapViewerApp.tsx

@@ -7,7 +7,7 @@ import { OsrsLoadingBar } from "../components/rs/loading/OsrsLoadingBar";
 import { DownloadProgress } from "../rs/cache/CacheFiles";
 import { formatBytes } from "../util/BytesUtil";
 import { isIos, isWallpaperEngine } from "../util/DeviceUtil";
-import { fetchCacheList, loadCacheFiles } from "./Caches";
+import { fetchCacheList, loadCacheFiles } from "../util/Caches";
 import { MapViewer } from "./MapViewer";
 import { MapViewerContainer } from "./MapViewerContainer";
 import { WEBGL, getAvailableRenderers } from "./MapViewerRenderers";

src/mapviewer/MapViewerControls.tsx

@@ -1,4 +1,3 @@
-import FileSaver from "file-saver";
 import { vec3 } from "gl-matrix";
 import { Leva, button, buttonGroup, folder, useControls } from "leva";
 import { ButtonGroupOpts, Schema } from "leva/dist/declarations/src/types";
@@ -7,8 +6,8 @@ import { memo, useEffect, useState } from "react";
 import { DownloadProgress } from "../rs/cache/CacheFiles";
 import { isTouchDevice } from "../util/DeviceUtil";
 import { lerp, slerp } from "../util/MathUtil";
-import { loadCacheFiles } from "./Caches";
-import { CameraView, ProjectionType } from "./Camera";
+import { loadCacheFiles } from "../util/Caches";
+import { CameraView, ProjectionType } from "../renderer/Camera";
 import { MapViewer } from "./MapViewer";
 import { MapViewerRenderer } from "./MapViewerRenderer";
 import {
@@ -18,6 +17,7 @@ import {
     getRendererName,
 } from "./MapViewerRenderers";
 import { fetchNpcSpawns, getNpcSpawnsUrl } from "./data/npc/NpcSpawn";
+import FileSaver from "file-saver";
 
 interface MapViewerControlsProps {
     renderer: MapViewerRenderer;

src/mapviewer/MapViewerRenderer.ts

@@ -3,7 +3,7 @@ import { Schema } from "leva/dist/declarations/src/types";
 import { Renderer } from "../components/renderer/Renderer";
 import { SceneBuilder } from "../rs/scene/SceneBuilder";
 import { clamp } from "../util/MathUtil";
-import { MapManager, MapSquare } from "./MapManager";
+import { MapManager, MapSquare } from "../renderer/MapManager";
 import { MapViewer } from "./MapViewer";
 import { MapViewerRendererType } from "./MapViewerRenderers";
 

src/mapviewer/MapViewerRenderers.ts

@@ -1,7 +1,7 @@
 import { MapViewer } from "./MapViewer";
 import { MapViewerRenderer } from "./MapViewerRenderer";
-import { WebGLMapViewerRenderer } from "./webgl/WebGLMapViewerRenderer";
-import { WebGPUMapViewerRenderer } from "./webgpu/WebGPUMapViewerRenderer";
+import { WebGLMapViewerRenderer } from "../renderer/webgl/WebGLMapViewerRenderer";
+import { WebGPUMapViewerRenderer } from "../renderer/webgpu/WebGPUMapViewerRenderer";
 
 export type MapViewerRendererType = "webgl" | "webgpu";
 export const WEBGL: MapViewerRendererType = "webgl";