m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved comments / readability of Save_C64_multi() + add debug log

Browse Source 
The algorithm to choose the background color is improved.
This commit is contained in:
Thomas Bernard 2018-11-06 20:54:37 +01:00
parent 06f8809337
commit 5f6c1a2c55
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/miscfileformats.c
View File

@ -2605,13 +2605,13 @@ int Save_C64_window(byte *saveWhat, byte *loadAddr)
int button; int button;
unsigned int i; unsigned int i;
T_Dropdown_button *what, *addr; T_Dropdown_button *what, *addr;
char * what_label[] = { static const char * what_label[] = {
"All", "All",
"Bitmap", "Bitmap",
"Screen", "Screen",
"Color" "Color"
}; };
char * address_label[] = { static const char * address_label[] = {
"None", "None",
"$2000", "$2000",
"$4000", "$4000",
@ -2653,7 +2653,7 @@ int Save_C64_window(byte *saveWhat, byte *loadAddr)
case 4: // Load addr case 4: // Load addr
*loadAddr=Window_attribute2*32; *loadAddr=Window_attribute2*32;
//printf("addr=$%02x00 (%d)\n",loadAddr,Window_attribute2); GFX2_Log(GFX2_DEBUG, "Save_C64_Window() : addr=$%02x00 (%d)\n",*loadAddr,Window_attribute2);
break; break;
case 0: break; case 0: break;
@ -2779,7 +2779,7 @@ int Save_C64_multi(T_IO_Context *context, byte saveWhat, byte loadAddr)
byte i,background=0; byte i,background=0;
FILE *file; FILE *file;
// Detect the ackground color the image should be using. It's the one that's // Detect the background color the image should be using. It's the one that's
// used on all tiles having 4 colors. // used on all tiles having 4 colors.
for(y=0;y<200;y=y+8) for(y=0;y<200;y=y+8)
{ {
@ -2791,8 +2791,15 @@ int Save_C64_multi(T_IO_Context *context, byte saveWhat, byte loadAddr)
for (cy=0;cy<8;cy++) for (cy=0;cy<8;cy++)
for (cx=0;cx<4;cx++) for (cx=0;cx<4;cx++)
{ {
pixel=Get_pixel(context, x+cx,y+cy); pixel=Get_pixel(context, x+cx,y+cy);
cols |= (1 << pixel); if(pixel>15)
{
Warning_message("Color above 15 used");
// TODO hilite as in hires, you should stay to
// the fixed 16 color palette
return 1;
}
cols |= (1 << pixel);
} }
cand = 0; cand = 0;
@ -2806,21 +2813,24 @@ int Save_C64_multi(T_IO_Context *context, byte saveWhat, byte loadAddr)
if (used>3) if (used>3)
{ {
GFX2_Log(GFX2_DEBUG, "(%3d,%3d) used=%d cols=%04x\n", x, y, used,(unsigned)cols);
// This is a tile that uses the background color (and 3 others) // This is a tile that uses the background color (and 3 others)
// Try to guess which color is most likely the background one // Try to guess which color is most likely the background one
for (n = 0; n<16; n++) for (n = 0; n<16; n++)
{ {
if ((cols & (1 << n)) && !((candidates | invalids) & (1 << n))) { if ((cols & (1 << n)) && !((candidates | invalids) & (1 << n))) {
// This color was not used in any other tile yet, // This color is used in this tile but
// but it could be the background one. // was not used in any other tile yet,
// so it could be the background one.
candidates |= 1 << n; candidates |= 1 << n;
} }
if ((cols & 1 << n) == 0 ) { if ((cols & (1 << n)) == 0 ) {
// This color isn't used at all in this tile: // This color isn't used at all in this tile:
// Can't be the global // Can't be the global background
invalids |= 1 << n; invalids |= 1 << n;
candidates &= ~(1 << n);
} }
if (candidates & (1 << n)) { if (candidates & (1 << n)) {
@ -2848,12 +2858,13 @@ int Save_C64_multi(T_IO_Context *context, byte saveWhat, byte loadAddr)
break; break;
} }
} }
GFX2_Log(GFX2_DEBUG, "Save_C64_multi() background=%d ($%x) candidates=%x invalid=%x\n",
(int)background, (int)background, (unsigned)candidates, (unsigned)invalids);
// Now that we know which color is the background, we can encode the cells // Now that we know which color is the background, we can encode the cells
for(cy=0; cy<25; cy++) for(cy=0; cy<25; cy++)
{ {
//printf("\ny:%2d ",cy);
for(cx=0; cx<40; cx++) for(cx=0; cx<40; cx++)
{ {
numcolors=Count_used_colors_area(cusage,cx*4,cy*8,4,8); numcolors=Count_used_colors_area(cusage,cx*4,cy*8,4,8);
@ -2891,19 +2902,10 @@ int Save_C64_multi(T_IO_Context *context, byte saveWhat, byte loadAddr)
bits=0; bits=0;
for(x=0;x<4;x++) for(x=0;x<4;x++)
{ {
pixel=Get_pixel(context, cx*4+x,cy*8+y); pixel = Get_pixel(context, cx*4+x,cy*8+y);
if(pixel>15) bits = (bits << 2) | lut[pixel];
{
Warning_message("Color above 15 used");
// TODO hilite as in hires, you should stay to
// the fixed 16 color palette
return 1;
}
bits=bits<<2;
bits|=lut[pixel];
} }
//Write_byte(file,bits&255);
bitmap[pos++]=bits; bitmap[pos++]=bits;
} }
} }
@ -2939,7 +2941,6 @@ int Save_C64_multi(T_IO_Context *context, byte saveWhat, byte loadAddr)
Write_byte(file,background); Write_byte(file,background);
fclose(file); fclose(file);
//printf("\nbg:%d\n",background);
return 0; return 0;
} }