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

no message

This commit is contained in:
BADIM-PC\Vadim 2017-11-11 16:41:51 +03:00
parent b3ad8ef8f6
commit af7469a2d7
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/console.c
View File

@ -1606,7 +1606,7 @@ static char* saveTextSection(char* ptr, const char* tag, const char* data)
return ptr; return ptr;
} }
static char* printBuf(char* ptr, const void* data, s32 size, s32 row) static char* saveBinaryBuffer(char* ptr, const void* data, s32 size, s32 row, bool flip)
{ {
if(bufferEmpty(data, size)) if(bufferEmpty(data, size))
return ptr; return ptr;
@ -1614,7 +1614,7 @@ static char* printBuf(char* ptr, const void* data, s32 size, s32 row)
sprintf(ptr, "-- %03i:", row); sprintf(ptr, "-- %03i:", row);
ptr += strlen(ptr); ptr += strlen(ptr);
buf2str(data, size, ptr, true); buf2str(data, size, ptr, flip);
ptr += strlen(ptr); ptr += strlen(ptr);
sprintf(ptr, "\n"); sprintf(ptr, "\n");
@ -1623,7 +1623,7 @@ static char* printBuf(char* ptr, const void* data, s32 size, s32 row)
return ptr; return ptr;
} }
static char* saveBinarySection(char* ptr, const char* tag, s32 count, const u8* data, s32 size) static char* saveBinarySection(char* ptr, const char* tag, s32 count, const void* data, s32 size, bool flip)
{ {
if(bufferEmpty(data, size * count)) if(bufferEmpty(data, size * count))
return ptr; return ptr;
@ -1631,8 +1631,8 @@ static char* saveBinarySection(char* ptr, const char* tag, s32 count, const u8*
sprintf(ptr, "\n-- <%s>\n", tag); sprintf(ptr, "\n-- <%s>\n", tag);
ptr += strlen(ptr); ptr += strlen(ptr);
for(s32 i = 0; i < count; i++, data += size) for(s32 i = 0; i < count; i++, data = (u8*)data + size)
ptr = printBuf(ptr, data, size, i); ptr = saveBinaryBuffer(ptr, data, size, i, flip);
sprintf(ptr, "-- </%s>\n", tag); sprintf(ptr, "-- </%s>\n", tag);
ptr += strlen(ptr); ptr += strlen(ptr);
@ -1640,6 +1640,21 @@ static char* saveBinarySection(char* ptr, const char* tag, s32 count, const u8*
return ptr; return ptr;
} }
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},
{"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},
{"WAVES", ENVELOPES_COUNT, offsetof(tic_cartridge,sound.sfx.waveform.envelopes), sizeof(tic_waveform), true},
{"SFX", SFX_COUNT, offsetof(tic_cartridge, sound.sfx.data), sizeof(tic_sound_effect), true},
{"PATTERNS", MUSIC_PATTERNS, offsetof(tic_cartridge, sound.music.patterns), sizeof(tic_track_pattern), true},
{"TRACKS", MUSIC_TRACKS, offsetof(tic_cartridge, sound.music.tracks), sizeof(tic_track), true},
// TODO: add cover
};
static CartSaveResult saveProject(Console* console, const char* name) static CartSaveResult saveProject(Console* console, const char* name)
{ {
tic_mem* tic = console->tic; tic_mem* tic = console->tic;
@ -1654,17 +1669,11 @@ static CartSaveResult saveProject(Console* console, const char* name)
{ {
char* ptr = saveTextSection(stream, "CODE", tic->cart.code.data); char* ptr = saveTextSection(stream, "CODE", tic->cart.code.data);
// TODO: flip data for palette for(s32 i = 0; i < COUNT_OF(BinarySections); i++)
ptr = saveBinarySection(ptr, "PALETTE", 1, tic->cart.palette.data, sizeof(tic_palette)); {
ptr = saveBinarySection(ptr, "TILES", TIC_BANK_SPRITES, tic->cart.gfx.tiles[0].data, sizeof(tic_tile)); const BinarySection* section = &BinarySections[i];
ptr = saveBinarySection(ptr, "SPRITES", TIC_BANK_SPRITES, tic->cart.gfx.sprites[0].data, sizeof(tic_tile)); ptr = saveBinarySection(ptr, section->tag, section->count, (u8*)&tic->cart + section->offset, section->size, section->flip);
ptr = saveBinarySection(ptr, "MAP", TIC_MAP_HEIGHT, tic->cart.gfx.map.data, TIC_MAP_WIDTH); }
ptr = saveBinarySection(ptr, "WAVES", ENVELOPES_COUNT, tic->cart.sound.sfx.waveform.envelopes[0].data, sizeof(tic_waveform));
ptr = saveBinarySection(ptr, "SFX", SFX_COUNT, (const u8*)&tic->cart.sound.sfx.data, sizeof(tic_sound_effect));
ptr = saveBinarySection(ptr, "PATTERNS", MUSIC_PATTERNS, (const u8*)&tic->cart.sound.music.patterns.data, sizeof(tic_track_pattern));
ptr = saveBinarySection(ptr, "TRACKS", MUSIC_TRACKS, (const u8*)&tic->cart.sound.music.tracks.data, sizeof(tic_track));
// TODO: add cover
name = getProjectName(name); name = getProjectName(name);
@ -1749,7 +1758,7 @@ static void loadTextSection(const char* project, const char* tag, void* dst, s32
} }
} }
static void loadBinarySection(const char* project, const char* tag, s32 count, void* dst, s32 size) static void loadBinarySection(const char* project, const char* tag, s32 count, void* dst, s32 size, bool flip)
{ {
char tagbuf[64]; char tagbuf[64];
sprintf(tagbuf, "-- <%s>\n", tag); sprintf(tagbuf, "-- <%s>\n", tag);
@ -1777,7 +1786,7 @@ static void loadBinarySection(const char* project, const char* tag, s32 count, v
if(index < count) if(index < count)
{ {
ptr += strlen("-- 999:"); ptr += strlen("-- 999:");
str2buf(ptr, size*2, (u8*)dst + size*index, true); str2buf(ptr, size*2, (u8*)dst + size*index, flip);
ptr += size*2 + 1; ptr += size*2 + 1;
} }
} }
@ -1807,15 +1816,12 @@ static bool loadProject(Console* console, const char* data, s32 size)
loadTextSection(project, "CODE", cart->code.data, sizeof(tic_code)); loadTextSection(project, "CODE", cart->code.data, sizeof(tic_code));
loadBinarySection(project, "PALETTE", 1, cart->palette.data, sizeof(tic_palette)); for(s32 i = 0; i < COUNT_OF(BinarySections); i++)
loadBinarySection(project, "TILES", TIC_BANK_SPRITES, &cart->gfx.tiles, sizeof(tic_tile)); {
loadBinarySection(project, "SPRITES", TIC_BANK_SPRITES, &cart->gfx.sprites, sizeof(tic_tile)); const BinarySection* section = &BinarySections[i];
loadBinarySection(project, "MAP", TIC_MAP_HEIGHT, cart->gfx.map.data, TIC_MAP_WIDTH); loadBinarySection(project, section->tag, section->count, (u8*)cart + section->offset, section->size, section->flip);
loadBinarySection(project, "WAVES", ENVELOPES_COUNT, &cart->sound.sfx.waveform.envelopes, sizeof(tic_waveform)); }
loadBinarySection(project, "SFX", SFX_COUNT, cart->sound.sfx.data, sizeof(tic_sound_effect));
loadBinarySection(project, "PATTERNS", MUSIC_PATTERNS, cart->sound.music.patterns.data, sizeof(tic_track_pattern));
loadBinarySection(project, "TRACKS", MUSIC_TRACKS, cart->sound.music.tracks.data, sizeof(tic_track));
SDL_memcpy(&tic->cart, cart, sizeof(tic_cartridge)); SDL_memcpy(&tic->cart, cart, sizeof(tic_cartridge));
SDL_free(cart); SDL_free(cart);
@ -1831,6 +1837,7 @@ static bool loadProject(Console* console, const char* data, s32 size)
static void onConsoleLoadProjectCommandConfirmed(Console* console, const char* param) static void onConsoleLoadProjectCommandConfirmed(Console* console, const char* param)
{ {
// TODO: do we need this???
// if(onConsoleLoadProjectSectionCommand(console, param)) return; // if(onConsoleLoadProjectSectionCommand(console, param)) return;
if(param) if(param)
@ -2140,6 +2147,8 @@ static void onConsoleRamCommand(Console* console, const char* param)
"\n| ADDR | INFO | SIZE |" \ "\n| ADDR | INFO | SIZE |" \
"\n+-------+-------------------+-------+"); "\n+-------+-------------------+-------+");
// TODO: use 'offsetof' here
#define ADDR_RECORD(addr, name) {(s32)((u8*)&addr - (u8*)console->tic), name} #define ADDR_RECORD(addr, name) {(s32)((u8*)&addr - (u8*)console->tic), name}
const struct{s32 addr; const char* info;} Layout[] = const struct{s32 addr; const char* info;} Layout[] =