Move shader initialization out of renderer

Avoid public fields and ! overrides, make almost all fields readonly.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/view/MapLoader.ts b/src/view/MapLoader.ts
index f178c69..31e6484 100644
--- a/src/view/MapLoader.ts
+++ b/src/view/MapLoader.ts
@@ -2,7 +2,7 @@ import {mapValues, mapValuesAsync, nextPowerOf2} from '../util';
 
 import MapData from '../model/MapData';
 import MapView from './MapView';
-import Renderer from './Renderer';
+import Renderer from './renderer/Renderer';
 
 function loadImage(url: string): Promise<HTMLImageElement> {
 	return new Promise((resolve, reject) => {
@@ -56,7 +56,7 @@ function mkTileTexture(gl: WebGLRenderingContext, tiles: Map<string, HTMLImageEl
 
 export async function loadMap(r: Renderer, mapData: MapData): Promise<MapView> {
 	const tiles = await loadTiles(mapData.tiles);
-	const [tileTexture, tileMap] = mkTileTexture(r.gl, tiles);
+	const [tileTexture, tileMap] = mkTileTexture(r.getContext(), tiles);
 
 	return new MapView(r, mapData, tileTexture, tileMap);
 }