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

Throw in tslint and fix style

Browse source
This commit is contained in:
Matthias Schiffer 2018-10-24 01:26:15 +02:00
parent 06b2c5bec7
commit 9770eaf432
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
9 changed files with 303 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/view/MapLoader.ts
View file

@ -1,63 +1,62 @@
import {mapValues, mapValuesAsync, nextPowerOf2} from '../util';
import Renderer from './Renderer';
import MapView from './MapView';
import MapData from '../model/MapData';
import MapView from './MapView';
import Renderer from './Renderer';
function loadImage(url: string): Promise<HTMLImageElement> {
return new Promise(function(resolve, reject) {
let img = new Image();
img.addEventListener('load', () => { resolve(img); });
img.addEventListener('error', () => { reject(Error('failed to load ' + url)); });
img.src = url;
});
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);
return mapValuesAsync(loadImage, urls);
}
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 {
let texture = gl.createTexture();
if (!texture)
throw new Error('unable to create texture');
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);
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;
return texture;
}
function mkTileTexture(gl: WebGLRenderingContext, tiles: Map<string, HTMLImageElement>): [WebGLTexture, Map<string, number>] {
let canvas = document.createElement('canvas');
canvas.width = nextPowerOf2(tiles.size) * MapView.tileSize;
canvas.height = MapView.tileSize;
function mkTileTexture(gl: WebGLRenderingContext, tiles: Map<string, HTMLImageElement>):
[WebGLTexture, Map<string, number>] {
const canvas = document.createElement('canvas');
canvas.width = nextPowerOf2(tiles.size) * MapView.tileSize;
canvas.height = MapView.tileSize;
let i = 0;
let ret: Map<string, number> = new Map();
let ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
let i = 0;
const ret: Map<string, number> = new Map();
const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
for (let [k, tile] of tiles) {
ctx.drawImage(tile, i * MapView.tileSize, 0);
ret.set(k, i++);
}
for (const [k, tile] of tiles) {
ctx.drawImage(tile, i * MapView.tileSize, 0);
ret.set(k, i++);
}
return [mkTexture(gl, canvas), ret];
return [mkTexture(gl, canvas), ret];
}
export async function loadMap(r: Renderer, mapData: MapData): Promise<MapView> {
let tiles = await loadTiles(mapData.tiles);
let [tileTexture, tileMap] = mkTileTexture(r.gl, tiles);
const tiles = await loadTiles(mapData.tiles);
const [tileTexture, tileMap] = mkTileTexture(r.gl, tiles);
return new MapView(r, mapData, tileTexture, tileMap);
return new MapView(r, mapData, tileTexture, tileMap);
}