dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added OVR palette

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2017-11-30 16:23:37 +03:00
parent a2e97b018a
commit 68a89c7421
8 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/console.c
View File

@@ -291,7 +291,7 @@ static s32 writeGifData(const tic_mem* tic, u8* dst, const u8* src, s32 width, s
if(palette)
{
const tic_rgb* pal = tic->cart.palette.colors;
const tic_rgb* pal = tic->cart.palettes.bg.colors;
for(s32 i = 0; i < TIC_PALETTE_SIZE; i++, pal++)
palette[i].r = pal->r, palette[i].g = pal->g, palette[i].b = pal->b;
@@ -308,7 +308,10 @@ static void loadCart(tic_mem* tic, tic_cartridge* cart, const u8* buffer, s32 si
tic->api.load(cart, buffer, size, palette);
if(!palette)
memcpy(cart->palette.data, tic->config.palette.data, sizeof(tic_palette));
{
memcpy(cart->palettes.bg.data, tic->config.palettes.bg.data, sizeof(tic_palette));
memcpy(cart->palettes.ovr.data, tic->config.palettes.ovr.data, sizeof(tic_palette));
}
}
static bool loadRom(tic_mem* tic, const void* data, s32 size, bool palette)
@@ -367,7 +370,7 @@ static bool onConsoleLoadSectionCommand(Console* console, const char* param)
case 3: memcpy(&tic->cart.code, &cart->code, sizeof cart->code); break;
case 4: memcpy(&tic->cart.sound.sfx, &cart->sound.sfx, sizeof cart->sound.sfx); break;
case 5: memcpy(&tic->cart.sound.music, &cart->sound.music, sizeof cart->sound.music); break;
case 6: memcpy(&tic->cart.palette, &cart->palette, sizeof cart->palette); break;
case 6: memcpy(&tic->cart.palettes, &cart->palettes, sizeof cart->palettes); break;
}
studioRomLoaded();
@@ -604,7 +607,7 @@ static char* saveBinarySection(char* ptr, const char* comment, const char* tag,
typedef struct {char* tag; s32 count; s32 offset; s32 size; bool flip;} BinarySection;
static const BinarySection BinarySections[] =
{
{"PALETTE", 1, offsetof(tic_cartridge, palette.data), sizeof(tic_palette), false},
{"PALETTE", 2, offsetof(tic_cartridge, palettes), sizeof(tic_palette), false},
{"TILES", TIC_BANK_SPRITES, offsetof(tic_cartridge, gfx.tiles), sizeof(tic_tile), true},
{"SPRITES", TIC_BANK_SPRITES, offsetof(tic_cartridge, gfx.sprites), sizeof(tic_tile), true},
{"MAP", TIC_MAP_HEIGHT, offsetof(tic_cartridge, gfx.map), TIC_MAP_WIDTH, true},
@@ -735,7 +738,8 @@ static bool loadProject(Console* console, const char* name, const char* data, s3
if(cart)
{
SDL_memset(cart, 0, sizeof(tic_cartridge));
SDL_memcpy(&cart->palette, &tic->config.palette.data, sizeof(tic_palette));
SDL_memcpy(&cart->palettes.bg, &tic->config.palettes.bg, sizeof cart->palettes.bg);
SDL_memcpy(&cart->palettes.ovr, &tic->config.palettes.ovr, sizeof cart->palettes.ovr);
const char* comment = projectComment(name);
@@ -1329,7 +1333,7 @@ static void onImportSprites(const char* name, const void* buffer, size_t size, v
u8 src = image->buffer[x + y * image->width];
const gif_color* c = &image->palette[src];
tic_rgb rgb = {c->r, c->g, c->b};
u8 color = tic_tool_find_closest_color(console->tic->cart.palette.colors, &rgb);
u8 color = tic_tool_find_closest_color(console->tic->cart.palettes.bg.colors, &rgb);
setSpritePixel(console->tic->cart.gfx.tiles, x, y, color);
}
@@ -2741,7 +2745,7 @@ static void cmdInjectSprites(Console* console, const char* param, const char* na
u8 src = image->buffer[x + y * image->width];
const gif_color* c = &image->palette[src];
tic_rgb rgb = {c->r, c->g, c->b};
u8 color = tic_tool_find_closest_color(embed.file.palette.colors, &rgb);
u8 color = tic_tool_find_closest_color(embed.file.palettes.bg.colors, &rgb);
setSpritePixel(embed.file.gfx.tiles, x, y, color);
}
@@ -2847,7 +2851,7 @@ void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config,
if(argc > 1)
{
memcpy(embed.file.palette.data, tic->config.palette.data, sizeof(tic_palette));
memcpy(&embed.file.palettes, &tic->config.palettes, sizeof embed.file.palettes);
if (argc == 2) cmdLoadCart(console, argv[1]);
else if (argc == 3)