neocturne/rpgedit
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

view: more refactoring

Browse source
This commit is contained in:
Matthias Schiffer 2018-10-31 14:40:20 +01:00
parent af04cbe359
commit da3e93a942
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
2 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/view/MapLoader.ts
View file

@ -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'; import { TileCoords } from './tile';
@ -11,38 +12,10 @@ export interface TileMap {
tiles: Map<string, TileCoords>; 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>> { function loadTiles(tiles: Map<string, string>): Promise<Map<string, HTMLImageElement>> {
return loadImages(mapValues((t) => `resources/sprite/tile/${t}.png`, tiles)); 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( function mkTileMap(
gl: WebGLRenderingContext, gl: WebGLRenderingContext,
tiles: Map<string, HTMLImageElement>, tiles: Map<string, HTMLImageElement>,

29
src/view/util/image.ts Normal file
View file

@ -0,0 +1,29 @@
import { mapValuesAsync } from '../../util';
export function loadImage(url: string): Promise<HTMLImageElement> {
return new Promise((resolve, reject) => {
const img = new Image();
img.addEventListener('load', () => { resolve(img); });
img.addEventListener('error', () => { reject(new Error('failed to load ' + url)); });
img.src = url;
});
}
export function loadImages(urls: Map<string, string>): Promise<Map<string, HTMLImageElement>> {
return mapValuesAsync(loadImage, urls);
}
export 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;
}