Separate non-WebGL specific stuff out to common renderer code.

Author: tritao

src/mapviewer/MapViewer.ts

@@ -21,7 +21,7 @@ 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 { RendererType, createRenderer } from "../renderer/Renderers";
 import { NpcSpawn } from "../data/npc/NpcSpawn";
 import { ObjSpawn } from "../data/obj/ObjSpawn";
 import { RenderDataWorkerPool } from "../worker/RenderDataWorkerPool";
@@ -95,7 +95,7 @@ export class MapViewer {
         readonly objSpawns: ObjSpawn[],
         public npcSpawns: NpcSpawn[],
         readonly mapImageCache: Cache,
-        rendererType: MapViewerRendererType,
+        rendererType: RendererType,
         cache: LoadedCache,
     ) {
         this.renderer = createRenderer(rendererType, this);

src/mapviewer/MapViewerApp.tsx

@@ -10,7 +10,7 @@ import { isIos, isWallpaperEngine } from "../util/DeviceUtil";
 import { fetchCacheList, loadCacheFiles } from "../util/Caches";
 import { MapViewer } from "./MapViewer";
 import { MapViewerContainer } from "./MapViewerContainer";
-import { getAvailableRenderers } from "./MapViewerRenderers";
+import { getAvailableRenderers } from "../renderer/Renderers";
 import { fetchNpcSpawns, getNpcSpawnsUrl } from "../data/npc/NpcSpawn";
 import { fetchObjSpawns } from "../data/obj/ObjSpawn";
 import { renderDataLoaderSerializer } from "../worker/RenderDataLoader";

src/mapviewer/MapViewerControls.tsx

@@ -11,11 +11,11 @@ import { CameraView, ProjectionType } from "../renderer/Camera";
 import { MapViewer } from "./MapViewer";
 import { MapViewerRenderer } from "./MapViewerRenderer";
 import {
-    MapViewerRendererType,
+    RendererType,
     createRenderer,
     getAvailableRenderers,
     getRendererName,
-} from "./MapViewerRenderers";
+} from "../renderer/Renderers";
 import { fetchNpcSpawns, getNpcSpawnsUrl } from "../data/npc/NpcSpawn";
 import FileSaver from "file-saver";
 
@@ -196,7 +196,7 @@ export const MapViewerControls = memo(
             };
         }, [mapViewer, cameraPoints, animationDuration, isCameraRunning]);
 
-        const rendererOptions: Record<string, MapViewerRendererType> = {};
+        const rendererOptions: Record<string, RendererType> = {};
         for (let v of getAvailableRenderers()) {
             rendererOptions[getRendererName(v)] = v;
         }
@@ -322,7 +322,7 @@ export const MapViewerControls = memo(
                         Renderer: {
                             value: renderer.type,
                             options: rendererOptions,
-                            onChange: (v: MapViewerRendererType) => {
+                            onChange: (v: RendererType) => {
                                 if (renderer.type !== v) {
                                     const renderer = createRenderer(v, mapViewer);
                                     mapViewer.setRenderer(renderer);

src/mapviewer/MapViewerRenderer.ts

@@ -5,10 +5,10 @@ import { SceneBuilder } from "../rs/scene/SceneBuilder";
 import { clamp } from "../util/MathUtil";
 import { MapManager, MapSquare } from "../renderer/MapManager";
 import { MapViewer } from "./MapViewer";
-import { MapViewerRendererType } from "./MapViewerRenderers";
+import { RendererType } from "../renderer/Renderers";
 
 export abstract class MapViewerRenderer<T extends MapSquare = MapSquare> extends Renderer {
-    abstract type: MapViewerRendererType;
+    abstract type: RendererType;
 
     mapManager: MapManager<T>;
 

src/mapviewer/MapViewerRenderers.ts

@@ -0,0 +1,47 @@
+import { MapViewer } from "../mapviewer/MapViewer";
+import { MapViewerRenderer } from "../mapviewer/MapViewerRenderer";
+import { WebGLRenderer } from "./webgl/WebGLRenderer";
+import { WebGPURenderer } from "./webgpu/WebGPURenderer";
+
+export type RendererType = "webgl" | "webgpu";
+export const WEBGL: RendererType = "webgl";
+export const WEBGPU: RendererType = "webgpu";
+
+export function getRendererName(type: RendererType): string {
+    switch (type) {
+        case WEBGL:
+            return "WebGL";
+        case WEBGPU:
+            return "WebGPU";
+        default:
+            throw new Error("Unknown renderer type");
+    }
+}
+
+export function createRenderer(
+    type: RendererType,
+    mapViewer: MapViewer,
+): MapViewerRenderer {
+    switch (type) {
+        case WEBGL:
+            return new WebGLRenderer(mapViewer);
+        case WEBGPU:
+            return new WebGPURenderer(mapViewer);
+        default:
+            throw new Error("Unknown renderer type");
+    }
+}
+
+export function getAvailableRenderers(): RendererType[] {
+    const renderers: RendererType[] = [];
+
+    if (WebGLRenderer.isSupported()) {
+        renderers.push(WEBGL);
+    }
+
+    if (WebGPURenderer.isSupported()) {
+        renderers.push(WEBGPU);
+    }
+
+    return renderers;
+}