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

Save_2GS(): optimize by filling up non full palettes

Browse Source
This commit is contained in:
Thomas Bernard 2023-04-09 10:04:24 +02:00
parent ade3c54f02
commit 3529859a9c
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/2gsformats.c
View File

@ -393,12 +393,44 @@ void Save_2GS(T_IO_Context * context)
if (x == 32) if (x == 32)
{ {
lines[y].palette_index = i; lines[y].palette_index = i;
GFX2_Log(GFX2_DEBUG, "line#%u => pal#%u\n", y, lines[y].palette_index); GFX2_Log(GFX2_DEBUG, " line#%u => pal#%u\n", y, lines[y].palette_index);
break; break;
} }
} }
// évolution : chercher parmi les palettes avec moins de 16 couleurs s'il y en a une qui convient // évolution : chercher parmi les palettes avec moins de 16 couleurs s'il y en a une qui convient
if (lines[y].palette_index == 0xffff) if (lines[y].palette_index == 0xffff)
{
for (i = 0; i < palette_count; i++)
{
word freeslots = 0;
while (freeslots <= 15 && palette_mapping[i * 16 + 15 - freeslots] == 0)
freeslots++;
if (freeslots > 0)
{
word to_add_count = 0;
byte to_add[16];
for (x = 0; x < 256; x++)
if ((lines[y].used_colors[x >> 3] & ~palette_used_colors[i * (256 / 8) + (x >> 3)]) & (1 << (x & 7)))
{
// color used on the line but not in the palette
to_add[to_add_count++] = (byte)x;
}
if (to_add_count <= freeslots)
{
GFX2_Log(GFX2_DEBUG, " add %u colors from line#%u to pal#%u\n",
(unsigned)to_add_count, (unsigned)y, (unsigned)i);
lines[y].palette_index = i;
for (x = 0; x < to_add_count; x++)
{
// add the color to the palette
palette_used_colors[i * (256 / 8) + (to_add[x] >> 3)] |= (1 << (to_add[x] & 7));
palette_mapping[i * 16 + 16 - freeslots + x] = to_add[x];
}
break;
}
}
}
if (lines[y].palette_index == 0xffff)
{ {
word index; word index;
lines[y].palette_index = palette_count; lines[y].palette_index = palette_count;
@ -406,12 +438,14 @@ void Save_2GS(T_IO_Context * context)
if (lines[y].used_colors[x >> 3] & (1 << (x & 7))) if (lines[y].used_colors[x >> 3] & (1 << (x & 7)))
palette_mapping[palette_count * 16 + index++] = x; palette_mapping[palette_count * 16 + index++] = x;
memcpy(palette_used_colors + palette_count * (256 / 8), lines[y].used_colors, 256 / 8); memcpy(palette_used_colors + palette_count * (256 / 8), lines[y].used_colors, 256 / 8);
GFX2_Log(GFX2_DEBUG, " line#%u => pal#%u (new, %ucolors)\n", (unsigned)y, (unsigned)palette_count, (unsigned)index); GFX2_Log(GFX2_DEBUG, " line#%u => pal#%u (new, %ucolors)\n",
(unsigned)y, (unsigned)palette_count, (unsigned)index);
palette_count++; palette_count++;
} }
} }
} }
} }
}
GFX2_Log(GFX2_DEBUG, "%u palette(s) (16 colors each).\n", (unsigned)palette_count); GFX2_Log(GFX2_DEBUG, "%u palette(s) (16 colors each).\n", (unsigned)palette_count);
// packing // packing
file = Open_file_write(context); file = Open_file_write(context);