X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemosys.c;h=67455b2973f933f6b004b4ed5988a668cf1e45fe;hb=6bdfcf4ad3daddcd9d689deb15798403c89ce42b;hp=41bfda190a6807a55739a3a80773f9036b04de58;hpb=313480bbe9994a200ed9a4355d97a033bf0d6151;p=andemo diff --git a/src/demosys.c b/src/demosys.c index 41bfda1..67455b2 100644 --- a/src/demosys.c +++ b/src/demosys.c @@ -4,11 +4,14 @@ #include "demosys.h" #include "treestore.h" #include "assfile.h" +#include "rbtree.h" +#include "darray.h" void regscr_testa(void); void regscr_testb(void); static void proc_screen_script(struct demoscreen *scr, struct ts_node *node); +static void proc_track(struct ts_node *node, struct demoscreen *pscr); static long io_read(void *buf, size_t bytes, void *uptr); @@ -19,18 +22,25 @@ int dsys_init(const char *fname) struct ts_node *ts, *tsnode; struct demoscreen *scr; + memset(&dsys, 0, sizeof dsys); + if(!(dsys.trackmap = rb_create(RB_KEY_STRING))) { + return -1; + } + + dsys.ev = darr_alloc(0, sizeof *dsys.ev); + regscr_testa(); regscr_testb(); - for(i=0; iinit() == -1) { - fprintf(stderr, "failed to initialize demo screen: %s\n", dsys_screens[i]->name); + for(i=0; iinit() == -1) { + fprintf(stderr, "failed to initialize demo screen: %s\n", dsys.screens[i]->name); return -1; } } if(!fname || !(io.data = ass_fopen(fname, "rb"))) { - dsys_run_screen(dsys_screens[0]); + dsys_run_screen(dsys.screens[0]); return 0; } io.read = io_read; @@ -46,6 +56,9 @@ int dsys_init(const char *fname) if(strcmp(tsnode->name, "screen") == 0 && (scr = dsys_find_screen(ts_get_attr_str(tsnode, "name", 0)))) { proc_screen_script(scr, tsnode); + + } else if(strcmp(tsnode->name, "track") == 0) { + proc_track(tsnode, 0); } tsnode = tsnode->next; } @@ -56,6 +69,7 @@ int dsys_init(const char *fname) static void proc_screen_script(struct demoscreen *scr, struct ts_node *node) { + struct ts_node *sub; struct ts_attr *attr; long tm; @@ -66,6 +80,46 @@ static void proc_screen_script(struct demoscreen *scr, struct ts_node *node) } attr = attr->next; } + + sub = node->child_list; + while(sub) { + if(strcmp(sub->name, "track") == 0) { + proc_track(sub, scr); + } + sub = sub->next; + } +} + +static void proc_track(struct ts_node *node, struct demoscreen *pscr) +{ + char *name, *buf; + struct ts_attr *attr; + long tm; + int idx; + struct demoevent *ev; + + if(!(name = (char*)ts_get_attr_str(node, "name", 0))) { + return; + } + if(pscr) { + buf = alloca(strlen(name) + strlen(pscr->name) + 2); + sprintf(buf, "%s.%s", pscr->name, name); + name = buf; + } + + if((idx = dsys_add_event(name)) == -1) { + return; + } + ev = dsys.ev + idx; + ev->scr = pscr; + + attr = node->attr_list; + while(attr) { + if(sscanf(attr->name, "key_%ld", &tm) == 1 && attr->val.type == TS_NUMBER) { + anm_set_value(&ev->track, tm, attr->val.fnum); + } + attr = attr->next; + } } static long io_read(void *buf, size_t bytes, void *uptr) @@ -78,53 +132,73 @@ void dsys_destroy(void) { int i; - for(i=0; itrack); - if(dsys_screens[i]->destroy) { - dsys_screens[i]->destroy(); + for(i=0; itrack); + if(dsys.screens[i]->destroy) { + dsys.screens[i]->destroy(); } } - dsys_num_screens = 0; + dsys.num_screens = 0; + + darr_free(dsys.ev); + rb_free(dsys.trackmap); } void dsys_update(void) { int i, j, sort_needed = 0; + long tm; struct demoscreen *scr; - dsys_time = time_msec; + dsys.tmsec = time_msec; - dsys_num_act = 0; - for(i=0; ivis = anm_get_value(&scr->track, dsys_time); + /* evaluate tracks */ + for(i=0; istart_time >= 0) { + tm -= dsys.ev[i].scr->start_time; + } + dsys.ev[i].value = anm_get_value(&dsys.ev[i].track, tm); + } + + if(dsys.scr_override) { + scr = dsys.scr_override; + scr->vis = 1; + if(scr->update) scr->update(dsys.tmsec); + return; + } + + dsys.num_act = 0; + for(i=0; ivis = anm_get_value(&scr->track, dsys.tmsec); if(scr->vis > 0.0f) { - if(!scr->active) { + if(scr->start_time < 0) { if(scr->start) scr->start(); - scr->active = 1; + scr->start_time = dsys.tmsec; } - if(scr->update) scr->update(dsys_time); + if(scr->update) scr->update(dsys.tmsec); - if(dsys_num_act && scr->prio != dsys_act[dsys_num_act - 1]->prio) { + if(dsys.num_act && scr->prio != dsys.act[dsys.num_act - 1]->prio) { sort_needed = 1; } - dsys_act[dsys_num_act++] = scr; + dsys.act[dsys.num_act++] = scr; } else { - if(scr->active) { + if(scr->start_time >= 0) { if(scr->stop) scr->stop(); - scr->active = 0; + scr->start_time = -1; } } } if(sort_needed) { - for(i=0; iprio > dsys_act[j - 1]->prio) { - void *tmp = dsys_act[j]; - dsys_act[j] = dsys_act[j - 1]; - dsys_act[j - 1] = tmp; + for(i=0; iprio > dsys.act[j - 1]->prio) { + void *tmp = dsys.act[j]; + dsys.act[j] = dsys.act[j - 1]; + dsys.act[j - 1] = tmp; } } } @@ -135,8 +209,14 @@ void dsys_update(void) void dsys_draw(void) { int i; - for(i=0; idraw(); + + if(dsys.scr_override) { + dsys.scr_override->draw(); + return; + } + + for(i=0; idraw(); } } @@ -167,9 +247,9 @@ struct demoscreen *dsys_find_screen(const char *name) if(!name) return 0; - for(i=0; iname, name) == 0) { - return dsys_screens[i]; + for(i=0; iname, name) == 0) { + return dsys.screens[i]; } } return 0; @@ -179,19 +259,25 @@ void dsys_run_screen(struct demoscreen *scr) { int i; - if(!scr) return; - if(dsys_num_act == 1 && dsys_act[0] == scr) return; + if(!scr) { + if(dsys.scr_override) { + scr = dsys.scr_override; + if(scr->stop) scr->stop(); + } + dsys.scr_override = 0; + return; + } - for(i=0; istop) dsys_act[i]->stop(); - dsys_act[i]->active = 0; + for(i=0; istop) dsys.act[i]->stop(); + dsys.act[i]->start_time = -1; } + dsys.num_act = 0; - dsys_act[0] = scr; - dsys_num_act = 1; + dsys.scr_override = scr; if(scr->start) scr->start(); - scr->active = 1; + scr->start_time = dsys.tmsec; } @@ -206,9 +292,51 @@ int dsys_add_screen(struct demoscreen *scr) return -1; } anm_set_track_interpolator(&scr->track, ANM_INTERP_LINEAR); - anm_set_track_extrapolator(&scr->track, ANM_EXTRAP_EXTEND); + anm_set_track_extrapolator(&scr->track, ANM_EXTRAP_CLAMP); anm_set_track_default(&scr->track, 0); - dsys_screens[dsys_num_screens++] = scr; + dsys.screens[dsys.num_screens++] = scr; return 0; } + +int dsys_add_event(const char *name) +{ + struct demoevent ev = {0}; + int idx; + + if(rb_find(dsys.trackmap, (char*)name)) { + fprintf(stderr, "ignoring duplicate track: %s\n", name); + return -1; + } + + ev.name = strdup_nf(name); + anm_init_track(&ev.track); + anm_set_track_interpolator(&ev.track, ANM_INTERP_LINEAR); + anm_set_track_extrapolator(&ev.track, ANM_EXTRAP_CLAMP); + anm_set_track_default(&ev.track, 0); + + idx = darr_size(dsys.ev); + darr_push(dsys.ev, &ev); + + + if(rb_insert(dsys.trackmap, ev.name, (void*)(intptr_t)idx) == -1) { + fprintf(stderr, "failed to insert to track map: %s\n", name); + abort(); + } + dsys.num_ev = idx + 1; + return idx; +} + +int dsys_find_event(const char *name) +{ + struct rbnode *n = rb_find(dsys.trackmap, (char*)name); + if(!n) return -1; + + return (intptr_t)n->data; +} + +float dsys_value(const char *name) +{ + int idx = dsys_find_event(name); + return idx == -1 ? 0.0f : dsys.ev[idx].value; +}