view: add support for non-square, non-power-of-2 sprites

1 files changed, 5 insertions, 3 deletions

diff --git a/src/view/map.ts b/src/view/map.ts
index ff37737..9bdbd30 100644
--- a/src/view/map.ts
+++ b/src/view/map.ts
@@ -16,7 +16,7 @@ function loadTiles(tiles: string[]): Promise<HTMLImageElement[]> {
 }
 
 function mkTileset(
-	gl: WebGLRenderingContext,
+	r: Renderer,
 	tiles: HTMLImageElement[],
 ): Tileset {
 	const tileSize = 32;
@@ -42,8 +42,10 @@ function mkTileset(
 		}
 	}
 
+	const [texture] = mkTexture(r, canvas);
+
 	return {
-		texture: mkTexture(gl, canvas),
+		texture,
 		tiles: tileCoords,
 	};
 }
@@ -58,7 +60,7 @@ function addSprite(builder: SpriteViewBuilder, tileset: Tileset, x: number, y: n
 
 export async function loadMap(r: Renderer, map: MapData): Promise<SpriteView> {
 	const tiles = await loadTiles(map.tiles);
-	const tileset = mkTileset(r.getContext(), tiles);
+	const tileset = mkTileset(r, tiles);
 
 	const builder = new SpriteViewBuilder(r, tileset.texture);