Final reorg; all projects build into a unified disk image for testing

This commit is contained in:
Lucas Scharenbroich 2021-08-26 17:15:44 -05:00
parent dc8697af30
commit f55192436a
10 changed files with 900 additions and 6619 deletions

View File

@ -13,9 +13,9 @@ REM Cadius does not overwrite files, so clear the root folder first
%CADIUS% CREATEFOLDER %IMAGE% %FOLDER%
REM Now copy files and folders as needed
%CADIUS% ADDFILE %IMAGE% %FOLDER% src\\GTETestApp
%CADIUS% ADDFILE %IMAGE% %FOLDER% emu\\test.pic
%CADIUS% ADDFILE %IMAGE% %FOLDER% emu\\bg1a.bin
%CADIUS% ADDFILE %IMAGE% %FOLDER% emu\\bg1b.bin
%CADIUS% ADDFILE %IMAGE% %FOLDER% emu\\fg1.bin
%CADIUS% ADDFILE %IMAGE% %FOLDER% assets\\music\\main.ntp
%CADIUS% ADDFILE %IMAGE% %FOLDER% .\GTETestApp
%CADIUS% ADDFILE %IMAGE% %FOLDER% gen\test.pic
%CADIUS% ADDFILE %IMAGE% %FOLDER% gen\bg1a.bin
%CADIUS% ADDFILE %IMAGE% %FOLDER% gen\bg1b.bin
%CADIUS% ADDFILE %IMAGE% %FOLDER% gen\fg1.bin
%CADIUS% ADDFILE %IMAGE% %FOLDER% assets\music\main.ntp

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,4 @@
bg1a.bin=Type(06),Access(E3)
bg1b.bin=Type(06),Access(E3)
fg1.bin=Type(06),Access(E3)
test.pic=Type(C0),Access(E3)

BIN
demos/shell/gen/bg1a.bin Normal file

Binary file not shown.

BIN
demos/shell/gen/bg1b.bin Normal file

Binary file not shown.

BIN
demos/shell/gen/fg1.bin Normal file

Binary file not shown.

View File

@ -24,7 +24,7 @@
"build:assets-woz-fatbits": "node %npm_package_config_png2iigs% ./assets/woz-pixelated.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
"build:assets-color-cycle": "node %npm_package_config_png2iigs% ./assets/rotopattern.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
"build:map": "node %npm_package_config_tiled2iigs% ./assets/tiled/world_1-1.json --output-dir ./gen",
"build:tiles": "node %npm_package_config_png2iigs% ./assets/tilesets/smb-16.png --as-tile-data > ./gen/App.TileSet.s"
"build:tiles": "node %npm_package_config_png2iigs% ./assets/tilesets/smb-16.png --as-tile-data --transparent-color-index 3 > ./gen/App.TileSet.s"
},
"repository": {
"type": "git",

View File

@ -1 +0,0 @@
GTETestApp=Type(B3),AuxType(0000),VersionCreate(70),MinVersion(BE),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)

View File

@ -7,6 +7,7 @@ const StringBuilder = require('string-builder');
// Starting color index
let startIndex = 0;
let transparentColor = 0;
let transparentIndex = -1;
main(process.argv.slice(2)).then(
() => process.exit(0),
@ -133,7 +134,8 @@ async function main(argv) {
startIndex = getArg(argv, '--start-index', x => parseInt(x, 10), 0);
asTileData = getArg(argv, '--as-tile-data', null, 0);
transparentColor = getArg(argv, '--transparent-color-index', x => parseInt(x, 10), 0);
transparentColor = getArg(argv, '--transparent-color-index', x => parseInt(x, 10), -1);
transparentIndex = transparentColor;
console.info(`; startIndex = ${startIndex}`);