diff options
Diffstat (limited to 'src/view/MapLoader.ts')
-rw-r--r-- | src/view/MapLoader.ts | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/view/MapLoader.ts b/src/view/MapLoader.ts index a35eeec..c3504e3 100644 --- a/src/view/MapLoader.ts +++ b/src/view/MapLoader.ts @@ -1,4 +1,5 @@ -import { mapValues, mapValuesAsync, nextPowerOf2 } from '../util'; +import { loadImages, mkTexture } from 'util/image'; +import { mapValues, nextPowerOf2 } from '../util'; import { TileCoords } from './tile'; @@ -11,38 +12,10 @@ export interface TileMap { tiles: Map<string, TileCoords>; } -function loadImage(url: string): Promise<HTMLImageElement> { - return new Promise((resolve, reject) => { - const img = new Image(); - img.addEventListener('load', () => { resolve(img); }); - img.addEventListener('error', () => { reject(Error('failed to load ' + url)); }); - img.src = url; - }); -} - -function loadImages(urls: Map<string, string>): Promise<Map<string, HTMLImageElement>> { - return mapValuesAsync(loadImage, urls); -} - function loadTiles(tiles: Map<string, string>): Promise<Map<string, HTMLImageElement>> { return loadImages(mapValues((t) => `resources/sprite/tile/${t}.png`, tiles)); } -function mkTexture(gl: WebGLRenderingContext, src: HTMLCanvasElement|HTMLImageElement): WebGLTexture { - const texture = gl.createTexture(); - if (!texture) - throw new Error('unable to create texture'); - - gl.bindTexture(gl.TEXTURE_2D, texture); - gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, src); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST); - - return texture; -} - function mkTileMap( gl: WebGLRenderingContext, tiles: Map<string, HTMLImageElement>, |