@city41/gba-convertpng 0.0.5 → 0.0.7

package/dist/main.js

@@ -121,8 +121,9 @@ async function main(jsonSpec) {
     for (const bg of jsonSpec.backgrounds) {
         const processResult = await (0, background_1.processBackground)(bg, jsonSpec.format);
         const fileRoot = path.basename(bg.file, path.extname(bg.file));
-        const tilesAsmPath = path.resolve(jsonSpec.outputDir, `${fileRoot}.tiles.asm`);
-        const paletteAsmPath = path.resolve(jsonSpec.outputDir, `${fileRoot}.palette.asm`);
+        const ext = formatToExt[jsonSpec.format];
+        const tilesAsmPath = path.resolve(jsonSpec.outputDir, `${fileRoot}.tiles.${ext}`);
+        const paletteAsmPath = path.resolve(jsonSpec.outputDir, `${fileRoot}.palette.${ext}`);
         const mapAsmPath = path.resolve(jsonSpec.outputDir, `${fileRoot}.map.asm`);
         await fsp.writeFile(tilesAsmPath, processResult.tilesAsmSrc);
         console.log("wrote", tilesAsmPath);

package/dist/palette.d.ts

@@ -1,4 +1,5 @@
 import { Canvas } from "canvas";
+declare function getForcedPalette(c: Canvas): number[];
 declare function extractPalette(c: Canvas, pad?: boolean): number[];
 declare function reducePalettes(palettes: number[][]): number[];
-export { extractPalette, reducePalettes };
+export { getForcedPalette, extractPalette, reducePalettes };

package/dist/palette.js

@@ -1,9 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getForcedPalette = getForcedPalette;
 exports.extractPalette = extractPalette;
 exports.reducePalettes = reducePalettes;
 const colors_1 = require("./colors");
 const MAGENTA = (0, colors_1.rgbToGBA16)(255, 0, 255);
+function getForcedPalette(c) {
+    const imageData = c.getContext("2d").getImageData(0, 0, c.width, c.height);
+    const rawPalette = [];
+    for (let p = 0; p < imageData.data.length; p += 4) {
+        const r = imageData.data[p];
+        const g = imageData.data[p + 1];
+        const b = imageData.data[p + 2];
+        const gbaColor = (0, colors_1.rgbToGBA16)(r, g, b);
+        rawPalette.push(gbaColor);
+    }
+    const paletteWithoutMangenta = rawPalette.filter((c) => c !== MAGENTA);
+    // then append magenta as the first color, to become transparent
+    const palette = [MAGENTA].concat(paletteWithoutMangenta);
+    return palette;
+}
 function extractPalette(c, pad = true) {
     const gbaColors = new Set();
     const imageData = c.getContext("2d").getImageData(0, 0, c.width, c.height);

package/dist/sprite.js

@@ -15,7 +15,7 @@ async function processBasicSprite(sprite, format, forcedPalette) {
     let palette;
     if (forcedPalette) {
         canvas = await (0, canvas_1.forceCanvasToPalette)(canvas, forcedPalette);
-        palette = (0, palette_1.extractPalette)(forcedPalette, false);
+        palette = (0, palette_1.getForcedPalette)(forcedPalette);
     }
     else {
         palette = (0, palette_1.extractPalette)(canvas, !sprite.trimPalette);
@@ -50,7 +50,7 @@ async function processSharedPaletteSprites(sharedPaletteSprite, format, forcedPa
         palettes.push((0, palette_1.extractPalette)(c, !sharedPaletteSprite.trimPalette));
     }
     const commonPalette = forcedPalette
-        ? (0, palette_1.extractPalette)(forcedPalette, false)
+        ? (0, palette_1.getForcedPalette)(forcedPalette)
         : (0, palette_1.reducePalettes)(palettes);
     const tiles = [];
     for (let i = 0; i < sharedPaletteSprite.sharedPalette.length; ++i) {

package/package.json

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