@city41/gba-convertpng 0.0.32 → 0.0.34

package/dist/background.js

@@ -57,10 +57,33 @@ function buildMap(tiles, bgWidthPx, bgHeightPx) {
     const map = [];
     const bgWidthT = bgWidthPx / 8;
     const bgHeightT = bgHeightPx / 8;
-    for (let y = 0; y < bgHeightT; ++y) {
-        for (let x = 0; x < bgWidthT; ++x) {
-            const tile = tiles[y * bgWidthT + x];
-            map.push((tile.paletteIndex << 12) | tile.tileIndex);
+    if (bgWidthT % 32 !== 0) {
+        throw new Error(`buildMap: bg is of unexpected tile width: ${bgWidthT}`);
+    }
+    if (bgHeightT % 32 !== 0) {
+        throw new Error(`buildMap: bg is of unexpected tile height: ${bgHeightT}`);
+    }
+    // when backgrounds are 64 tiles high/wide
+    // then the map gets divided into quadrants,
+    // the quads are laid out colunm first
+    //
+    // [1][2]
+    //
+    // [1]
+    // [2]
+    //
+    // [1][2]
+    // [3][4]
+    const quadranteColumns = bgWidthT / 32;
+    const quadranteRows = bgHeightT / 32;
+    for (let qc = 0; qc < quadranteColumns; ++qc) {
+        for (let qy = 0; qy < quadranteRows; ++qy) {
+            for (let y = qy * 32; y < (qy + 1) * 32; ++y) {
+                for (let x = qc * 32; x < (qc + 1) * 32; ++x) {
+                    const tile = tiles[y * bgWidthT + x];
+                    map.push((tile.paletteIndex << 12) | tile.tileIndex);
+                }
+            }
         }
     }
     return map;

package/dist/sprite.js

@@ -18,6 +18,9 @@ async function processBasicSprite(sprite, forcedPaletteOverride) {
         throw new Error(`sprite, ${sprite.file}, has no frames defined`);
     }
     let canvas = await (0, canvas_1.reduceColors)(await (0, canvas_1.createCanvasFromPath)(sprite.file), 16);
+    // before rounding up the canvas, grab its actual pixel size
+    const framePixelWidth = Math.ceil(canvas.width / sprite.frames);
+    const framePixelHeight = canvas.height;
     canvas = (0, canvas_1.roundUpToTileSize)(canvas);
     let palette;
     if (forcedPaletteOverride || sprite.forcePalette) {
@@ -39,6 +42,8 @@ async function processBasicSprite(sprite, forcedPaletteOverride) {
         canvas,
         tiles,
         palette,
+        framePixelWidth,
+        framePixelHeight,
     };
 }
 async function processSharedPaletteSprites(sharedPaletteSprite) {

package/dist/types.d.ts

@@ -60,6 +60,8 @@ export type ProcessBasicSpriteResult = {
     type: "BasicSprite";
     spec: BasicSpriteSpec;
     canvas: Canvas;
+    framePixelWidth: number;
+    framePixelHeight: number;
     tiles: number[];
     palette?: number[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@city41/gba-convertpng",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "Converts png images to GBA tile format",
   "main": "index.js",
   "repository": "github.com/city41/gba-convertpng",