From 4eb954e7598983136540b79b46b052a0500f04b3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 11 Nov 2018 13:30:15 +0100 Subject: view: remove support for non-power-of-2 sprites again Sprites with unusual dimensions must be padded with transparency. By only supporting power-of-two sprites, the anchor point can always be specified accurately. --- src/view/util/image.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/view/util') diff --git a/src/view/util/image.ts b/src/view/util/image.ts index 7baeccc..4c5e386 100644 --- a/src/view/util/image.ts +++ b/src/view/util/image.ts @@ -16,18 +16,17 @@ export function mkTexture( src: HTMLCanvasElement|HTMLImageElement, frame: number = 0, total: number = 1, -): [WebGLTexture, [number, number], SpriteCoords] { +): [WebGLTexture, SpriteCoords] { const gl = r.getContext(); const texture = gl.createTexture(); if (!texture) throw new Error('unable to create texture'); const w = src.width, h = src.height / total; - const w2 = nextPowerOf2(w), h2 = nextPowerOf2(h); const canvas = document.createElement('canvas'); - canvas.width = w2; - canvas.height = h2; + canvas.width = w; + canvas.height = h; const ctx = canvas.getContext('2d') as CanvasRenderingContext2D; ctx.drawImage(src, 0, frame * h, w, h, 0, 0, w, h); @@ -39,12 +38,9 @@ export function mkTexture( gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST); - const size: [number, number] = [ - w / r.coordScale, h / r.coordScale, - ]; const coords: SpriteCoords = [ - 0, 0, w2 / r.coordScale, h2 / r.coordScale, + 0, 0, w / r.coordScale, h / r.coordScale, ]; - return [texture, size, coords]; + return [texture, coords]; } -- cgit v1.2.3