Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-12-27 06:29:19 +00:00
Code Issues Projects Releases Wiki Activity

Show disk track sector change animations

Browse Source
This commit is contained in:
Aaron Culliney 2015-12-07 23:03:44 -08:00
parent 74c951f64f
commit 943b8842f7
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/disk.c
View File

@ -463,6 +463,23 @@ static void save_track_data(int drive) {
disk6.disk[drive].track_dirty = false; disk6.disk[drive].track_dirty = false;
} }
static inline void animate_disk_track_sector(void) {
if (video_backend && video_backend->animation_showTrackSector) {
static int previous_sect = 0;
int sect_width = disk6.disk[disk6.drive].track_width>>4; // div-by-16
do {
if (UNLIKELY(sect_width <= 0)) {
break;
}
int sect = disk6.disk[disk6.drive].run_byte/sect_width;
if (sect != previous_sect) {
previous_sect = sect;
video_backend->animation_showTrackSector(disk6.drive, disk6.disk[disk6.drive].phase>>1, sect);
}
} while (0);
}
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Emulator hooks // Emulator hooks
@ -536,6 +553,9 @@ GLUE_C_READ(disk_read_write_byte)
if (disk6.disk[disk6.drive].run_byte >= disk6.disk[disk6.drive].track_width) { if (disk6.disk[disk6.drive].run_byte >= disk6.disk[disk6.drive].track_width) {
disk6.disk[disk6.drive].run_byte = 0; disk6.disk[disk6.drive].run_byte = 0;
} }
animate_disk_track_sector();
#if DISK_TRACING #if DISK_TRACING
if ((disk6.disk[disk6.drive].run_byte % NIB_SEC_SIZE) == 0) { if ((disk6.disk[disk6.drive].run_byte % NIB_SEC_SIZE) == 0) {
if (disk6.ddrw) { if (disk6.ddrw) {
@ -615,6 +635,8 @@ GLUE_C_READ(disk_read_phase)
fprintf(test_write_fp, "NEW TRK:%d\n", (disk6.disk[disk6.drive].phase>>1)); fprintf(test_write_fp, "NEW TRK:%d\n", (disk6.disk[disk6.drive].phase>>1));
} }
#endif #endif
animate_disk_track_sector();
} }
return ea == 0xE0 ? 0xFF : floating_bus_hibit(1); return ea == 0xE0 ? 0xFF : floating_bus_hibit(1);

37
src/video/glalert.c
View File

@ -233,7 +233,6 @@ static void _animation_showMessage(char *messageTemplate, unsigned int cols, uns
nextMessage = message; nextMessage = message;
nextMessageCols = framedCols; nextMessageCols = framedCols;
nextMessageRows = framedRows; nextMessageRows = framedRows;
LOG("New message with %d cols %d rows", nextMessageCols, nextMessageRows);
pthread_mutex_unlock(&messageMutex); pthread_mutex_unlock(&messageMutex);
} }
@ -314,6 +313,41 @@ static void _animation_showDiskChosen(int drive) {
_animation_showMessage(template, shownCols, DISK_ANIMATION_ROWS); _animation_showMessage(template, shownCols, DISK_ANIMATION_ROWS);
} }
static void _animation_showTrackSector(int drive, int track, int sect) {
#define DISK_TRACK_SECTOR_ROWS 3
#define DISK_TRACK_SECTOR_COLS 9
static char diskTrackSectorTemplate[DISK_TRACK_SECTOR_ROWS][DISK_TRACK_SECTOR_COLS+1] = {
" ",
"D / TT/SS",
" ",
};
char *template = diskTrackSectorTemplate[0];
char c = diskTrackSectorTemplate[1][2];
switch (c) {
case '/':
c = '-';
break;
case '-':
c = '\\';
break;
case '\\':
c = '|';
break;
case '|':
c = '/';
break;
default:
assert(false && "should not happen");
break;
}
snprintf(&diskTrackSectorTemplate[1][0], DISK_TRACK_SECTOR_COLS+1, "%d %c %02X/%02X", drive+1, c, track, sect);
_animation_showMessage(template, DISK_TRACK_SECTOR_COLS, DISK_TRACK_SECTOR_ROWS);
}
__attribute__((constructor(CTOR_PRIORITY_LATE))) __attribute__((constructor(CTOR_PRIORITY_LATE)))
static void _init_glalert(void) { static void _init_glalert(void) {
LOG("Initializing message animation subsystem"); LOG("Initializing message animation subsystem");
@ -322,6 +356,7 @@ static void _init_glalert(void) {
video_backend->animation_showPaused = &_animation_showPaused; video_backend->animation_showPaused = &_animation_showPaused;
video_backend->animation_showCPUSpeed = &_animation_showCPUSpeed; video_backend->animation_showCPUSpeed = &_animation_showCPUSpeed;
video_backend->animation_showDiskChosen = &_animation_showDiskChosen; video_backend->animation_showDiskChosen = &_animation_showDiskChosen;
video_backend->animation_showTrackSector = &_animation_showTrackSector;
glnode_registerNode(RENDER_MIDDLE, (GLNode){ glnode_registerNode(RENDER_MIDDLE, (GLNode){
.setup = &alert_init, .setup = &alert_init,