@city41/gba-convertpng 0.0.21 → 0.0.23

package/dist/background.js

@@ -31,8 +31,14 @@ function extractMap(allTilesThatFormImage, dedupedTiles) {
     return map;
 }
 async function processBackground(bg) {
-    const canvas = await (0, canvas_1.reduceColors)(await (0, canvas_1.createCanvasFromPath)(bg.file), 16);
+    // const canvas = await reduceColors(await createCanvasFromPath(bg.file), 16);
+    let canvas = await (0, canvas_1.createCanvasFromPath)(bg.file);
+    if (typeof bg.reduceColors === "undefined" || bg.reduceColors === true) {
+        canvas = await (0, canvas_1.reduceColors)(canvas, 16);
+    }
+    canvas = (0, canvas_1.roundUpToTileSize)(canvas);
     const palette = (0, palette_1.extractPalette)(canvas, !bg.trimPalette);
+    console.log("palette size", palette.length);
     const allTilesThatFormImage = (0, tile_1.extractTiles)(canvas, palette, 1);
     const dedupedTiles = (0, tile_1.dedupeTiles)(allTilesThatFormImage);
     const map = extractMap(allTilesThatFormImage, dedupedTiles);
@@ -40,6 +46,7 @@ async function processBackground(bg) {
         palette[0] = bg.transparentColor;
     }
     return {
+        canvas,
         background: bg,
         tiles: dedupedTiles.flat(1),
         palette,

package/dist/c.d.ts

@@ -1,5 +1,5 @@
-import { Width } from "./types";
-declare function toCinc(data: number[], width: Width, numbersPerRow: number, bracketsOnOwnLine?: boolean): string;
+import { DataWidth } from "./types";
+declare function toCinc(data: number[], width: DataWidth, numbersPerRow: number, bracketsOnOwnLine?: boolean): string;
 declare function toCc(data: number[], width: "b" | "w" | "dw", numbersPerRow: number, variableName: string, fileNameRoot: string): string;
-declare function toCh(data: number[], width: Width, variableName: string, extraContent?: string): string;
+declare function toCh(data: number[], dataWidth: DataWidth, variableName: string, extraContent?: string): string;
 export { toCinc, toCc, toCh };

package/dist/c.js

@@ -48,9 +48,9 @@ function toCc(data, width, numbersPerRow, variableName, fileNameRoot) {
 const ${dataType} ${variableName}[${variableName.toUpperCase()}_COUNT] = ${entries}; `;
     return src;
 }
-function toCh(data, width, variableName, extraContent) {
-    const dataType = widthToDataType[width];
-    const dataSize = widthToSize[width];
+function toCh(data, dataWidth, variableName, extraContent) {
+    const dataType = widthToDataType[dataWidth];
+    const dataSize = widthToSize[dataWidth];
     const count = data.length;
     const src = `#pragma once
 #include <tonc.h>

package/dist/canvas.d.ts

@@ -2,4 +2,5 @@ import { Canvas } from "canvas";
 declare function reduceColors(c: Canvas, maxColors: number): Promise<Canvas>;
 declare function createCanvasFromPath(pngPath: string): Promise<Canvas>;
 declare function forceCanvasToPalette(canvas: Canvas, palette: Canvas): Promise<Canvas>;
-export { createCanvasFromPath, reduceColors, forceCanvasToPalette };
+declare function roundUpToTileSize(canvas: Canvas): Canvas;
+export { createCanvasFromPath, reduceColors, forceCanvasToPalette, roundUpToTileSize, };

package/dist/canvas.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCanvasFromPath = createCanvasFromPath;
 exports.reduceColors = reduceColors;
 exports.forceCanvasToPalette = forceCanvasToPalette;
+exports.roundUpToTileSize = roundUpToTileSize;
 const path = __importStar(require("node:path"));
 const os = __importStar(require("node:os"));
 const fsp = __importStar(require("node:fs/promises"));
@@ -130,7 +131,7 @@ async function forceCanvasToPalette(canvas, palette) {
         .getImageData(0, 0, palette.width, palette.height);
     for (let p = 0; p < canvasImageData.data.length; p += 4) {
         const pixel = canvasImageData.data.slice(p, p + 4);
-        if (isMagenta(pixel)) {
+        if (isMagenta(pixel) || pixel[3] !== 255) {
             continue;
         }
         const nearestPixel = findNearestColor(pixel, paletteImageData.data);
@@ -139,4 +140,12 @@ async function forceCanvasToPalette(canvas, palette) {
     canvas.getContext("2d").putImageData(canvasImageData, 0, 0);
     return canvas;
 }
+// given an input canvas, returns it with additional pixels to
+// the left and bottom such that the canvas size is a multiple of 8
+function roundUpToTileSize(canvas) {
+    const roundedCanvas = (0, canvas_1.createCanvas)(Math.ceil(canvas.width / 8) * 8, Math.ceil(canvas.height / 8) * 8);
+    const context = roundedCanvas.getContext("2d");
+    context.drawImage(canvas, 0, 0);
+    return roundedCanvas;
+}
 //# sourceMappingURL=canvas.js.map

package/dist/main.js

@@ -96,6 +96,13 @@ function getBitmapDefines(result) {
     return `#define ${name.toUpperCase()}_WIDTH ${result.width}
 #define ${name.toUpperCase()}_HEIGHT ${result.height}`;
 }
+function getTileWidthHeightDefines(result, file) {
+    const name = path.basename(file, ".png");
+    let tileWidth = result.canvas.width / 8;
+    let tileHeight = result.canvas.height / 8;
+    return `#define ${name.toUpperCase()}_TILE_WIDTH ${tileWidth}
+#define ${name.toUpperCase()}_TILE_HEIGHT ${tileHeight}`;
+}
 function toSrcFiles(result, format) {
     let file;
     if ((0, sprite_1.isProcessBasicSpriteResult)(result)) {
@@ -206,7 +213,7 @@ function toSrcFiles(result, format) {
                             extension: "c",
                         },
                         {
-                            src: (0, c_1.toCh)(result.tiles, "b", fileRoot + "_tiles"),
+                            src: (0, c_1.toCh)(result.tiles, "b", fileRoot + "_tiles", getTileWidthHeightDefines(result, file)),
                             extension: "h",
                         },
                     ],

package/dist/palette.js

@@ -62,6 +62,7 @@ function reduceCanvases(canvases) {
     const paletteColors = Object.values(fullRgbColorMap);
     const paletteSize = paletteColors.length;
     if (paletteSize > 16) {
+        console.error(JSON.stringify(paletteColors));
         throw new Error(`reduceCanvasees: final palette is too large: ${paletteSize}`);
     }
     // strip out transparency/magenta
@@ -83,7 +84,7 @@ function reduceCanvases(canvases) {
     });
     context.putImageData(imageData, 0, 0);
     return {
-        palette: extractPalette(paletteCanvas),
+        palette: getForcedPalette(paletteCanvas),
         canvas: paletteCanvas,
     };
 }

package/dist/sprite.js

@@ -34,6 +34,7 @@ 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);
+    canvas = (0, canvas_1.roundUpToTileSize)(canvas);
     let palette;
     if (forcedPaletteOverride || sprite.forcePalette) {
         const forcedPaletteCanvas = forcedPaletteOverride ??
@@ -75,7 +76,7 @@ async function processSharedPaletteSprites(sharedPaletteSprite) {
     }
     const { palette: commonPalette, canvas: forcedPaletteCanvas } = forcedPalette
         ? {
-            palette: (0, palette_1.extractPalette)(forcedPalette, false),
+            palette: (0, palette_1.getForcedPalette)(forcedPalette),
             canvas: forcedPalette,
         }
         : (0, palette_1.reduceCanvases)(canvases);

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import { Canvas } from "canvas";
 export type Format = "C" | "C.inc" | "z80" | "pyz80" | "asz80" | "bin";
-export type Width = "b" | "w" | "dw";
+export type DataWidth = "b" | "w" | "dw";
 export type BasicSpriteSpec = {
     file: string;
     frames: number;
@@ -20,6 +20,7 @@ export type BackgroundSpec = {
     file: string;
     trimPalette?: boolean;
     transparentColor?: number;
+    reduceColors?: boolean;
 };
 export type BitmapSpec = {
     file: string;
@@ -44,6 +45,7 @@ export type ProcessSharedPaletteSpritesResult = {
     palette: number[];
 };
 export type ProcessBackgroundResult = {
+    canvas: Canvas;
     background: BackgroundSpec;
     tiles: number[];
     palette: number[];

package/package.json

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