github/AmigaExamples
1
0
Fork 0
mirror of https://frontier.innolan.net/github/AmigaExamples.git synced 2025-12-07 23:02:46 +00:00
Code Releases Activity

Changes to imagecon to support dual playfield

Browse Source
This commit is contained in:
alpine9000
2016-03-13 18:06:33 +11:00
parent 1fd19b7844
commit c99f5b79df
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/imagecon/imagecon.c
View File

@ -18,7 +18,8 @@ imagecon_config_t config = {
.slicedHam = 0,
.quantize = 0,
.dither = 0,
.overridePalette = 0
.overridePalette = 0,
.paletteOffset = 0
};
@ -43,6 +44,7 @@ usage()
" --sliced-ham\n"\
" --dither\n"\
" --use-palette <palette file>\n"\
" --palette-offset <index>\n"\
" --verbose\n", config.argv[0]);
exit(1);
}
@ -478,6 +480,7 @@ main(int argc, char **argv)
{"sliced-ham", no_argument, &config.slicedHam, 1},
{"dither", no_argument, &config.dither, 1},
{"use-palette", required_argument, 0, 'p'},
{"palette-offset", required_argument, 0, 'l'},
{"output", required_argument, 0, 'o'},
{"colors", required_argument, 0, 'c'},
{"input", required_argument, 0, 'i'},
@ -503,6 +506,11 @@ main(int argc, char **argv)
case 'p':
config.overridePalette = optarg;
break;
case 'l':
if (sscanf(optarg, "%d", &config.paletteOffset) != 1) {
abort_("invalid palette offset");
}
break;
case 'c':
if (sscanf(optarg, "%d", &config.maxColors) != 1) {
abort_("invalid number of colors");

1
tools/imagecon/imagecon.h
View File

@ -31,6 +31,7 @@ typedef struct {
int slicedHam;
int dither;
char* overridePalette;
int paletteOffset;
int quantize;
int verbose;
char** argv;

2
tools/imagecon/palette.c
View File

@ -66,7 +66,7 @@ palette_output(imagecon_image_t* ic, char* outFilename)
fprintf(paletteFP, "%03x\n", RGB24TORGB12(ic->palette[i].r) << 8 | RGB24TORGB12(ic->palette[i].g) << 4 | RGB24TORGB12(ic->palette[i].b));
}
if (paletteAsmFP) {
fprintf(paletteAsmFP, "\tlea COLOR%02d(a6),a0\n\tmove.w #$%03x,(a0)\n", i, RGB24TORGB12(ic->palette[i].r) << 8 | RGB24TORGB12(ic->palette[i].g) << 4 | RGB24TORGB12(ic->palette[i].b));
fprintf(paletteAsmFP, "\tlea COLOR%02d(a6),a0\n\tmove.w #$%03x,(a0)\n", i+config.paletteOffset, RGB24TORGB12(ic->palette[i].r) << 8 | RGB24TORGB12(ic->palette[i].g) << 4 | RGB24TORGB12(ic->palette[i].b));
}
if (paletteGreyFP) {
// TODO: this is for compat, can be better