X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemosys.c;h=41bfda190a6807a55739a3a80773f9036b04de58;hb=313480bbe9994a200ed9a4355d97a033bf0d6151;hp=7cefce57b24780100816015609bd557671177b35;hpb=ef6f5c2822eb91ea7df55e88018f566be04ad287;p=andemo

diff --git a/src/demosys.c b/src/demosys.c
index 7cefce5..41bfda1 100644
--- a/src/demosys.c
+++ b/src/demosys.c
@@ -1,15 +1,23 @@
 #include <stdio.h>
 #include <string.h>
+#include "demo.h"
 #include "demosys.h"
-
-static struct demoscreen *act_tail;
+#include "treestore.h"
+#include "assfile.h"
 
 void regscr_testa(void);
 void regscr_testb(void);
 
+static void proc_screen_script(struct demoscreen *scr, struct ts_node *node);
+static long io_read(void *buf, size_t bytes, void *uptr);
+
+
 int dsys_init(const char *fname)
 {
 	int i;
+	struct ts_io io = {0};
+	struct ts_node *ts, *tsnode;
+	struct demoscreen *scr;
 
 	regscr_testa();
 	regscr_testb();
@@ -21,14 +29,57 @@ int dsys_init(const char *fname)
 		}
 	}
 
+	if(!fname || !(io.data = ass_fopen(fname, "rb"))) {
+		dsys_run_screen(dsys_screens[0]);
+		return 0;
+	}
+	io.read = io_read;
+
+	if(!(ts = ts_load_io(&io)) || strcmp(ts->name, "demo") != 0) {
+		ass_fclose(io.data);
+		fprintf(stderr, "failed to read demoscript\n");
+		return -1;
+	}
+
+	tsnode = ts->child_list;
+	while(tsnode) {
+		if(strcmp(tsnode->name, "screen") == 0 &&
+				(scr = dsys_find_screen(ts_get_attr_str(tsnode, "name", 0)))) {
+			proc_screen_script(scr, tsnode);
+		}
+		tsnode = tsnode->next;
+	}
+
+	ass_fclose(io.data);
 	return 0;
 }
 
+static void proc_screen_script(struct demoscreen *scr, struct ts_node *node)
+{
+	struct ts_attr *attr;
+	long tm;
+
+	attr = node->attr_list;
+	while(attr) {
+		if(sscanf(attr->name, "key_%ld", &tm) == 1 && attr->val.type == TS_NUMBER) {
+			anm_set_value(&scr->track, tm, attr->val.fnum);
+		}
+		attr = attr->next;
+	}
+}
+
+static long io_read(void *buf, size_t bytes, void *uptr)
+{
+	return ass_fread(buf, 1, bytes, uptr);
+}
+
+
 void dsys_destroy(void)
 {
 	int i;
 
 	for(i=0; i<dsys_num_screens; i++) {
+		anm_destroy_track(&dsys_screens[i]->track);
 		if(dsys_screens[i]->destroy) {
 			dsys_screens[i]->destroy();
 		}
@@ -36,32 +87,57 @@ void dsys_destroy(void)
 	dsys_num_screens = 0;
 }
 
-struct demoscreen *dsys_find_screen(const char *name)
+void dsys_update(void)
 {
-	int i;
+	int i, j, sort_needed = 0;
+	struct demoscreen *scr;
 
+	dsys_time = time_msec;
+
+	dsys_num_act = 0;
 	for(i=0; i<dsys_num_screens; i++) {
-		if(strcmp(dsys_screens[i]->name, name) == 0) {
-			return dsys_screens[i];
+		scr = dsys_screens[i];
+		scr->vis = anm_get_value(&scr->track, dsys_time);
+
+		if(scr->vis > 0.0f) {
+			if(!scr->active) {
+				if(scr->start) scr->start();
+				scr->active = 1;
+			}
+			if(scr->update) scr->update(dsys_time);
+
+			if(dsys_num_act && scr->prio != dsys_act[dsys_num_act - 1]->prio) {
+				sort_needed = 1;
+			}
+			dsys_act[dsys_num_act++] = scr;
+		} else {
+			if(scr->active) {
+				if(scr->stop) scr->stop();
+				scr->active = 0;
+			}
+		}
+	}
+
+	if(sort_needed) {
+		for(i=0; i<dsys_num_act; i++) {
+			for(j=i+1; j<dsys_num_act; j++) {
+				if(dsys_act[j]->prio > dsys_act[j - 1]->prio) {
+					void *tmp = dsys_act[j];
+					dsys_act[j] = dsys_act[j - 1];
+					dsys_act[j - 1] = tmp;
+				}
+			}
 		}
 	}
-	return 0;
 }
 
-void dsys_run_screen(struct demoscreen *scr)
+/* TODO: do something about draw ordering of the active screens */
+void dsys_draw(void)
 {
-	struct demoscreen *act;
-
-	if(!scr) return;
-	if(dsys_act_scr == scr && act_tail == scr) return;
-
-	act = dsys_act_scr;
-	while(act) {
-		if(act->stop) act->stop();
-		act = act->next;
+	int i;
+	for(i=0; i<dsys_num_act; i++) {
+		dsys_act[i]->draw();
 	}
-	dsys_act_scr = act_tail = scr;
-	if(scr->start) scr->start();
 }
 
 void dsys_run(void)
@@ -84,12 +160,55 @@ void dsys_seek_norm(float t)
 {
 }
 
+
+struct demoscreen *dsys_find_screen(const char *name)
+{
+	int i;
+
+	if(!name) return 0;
+
+	for(i=0; i<dsys_num_screens; i++) {
+		if(strcmp(dsys_screens[i]->name, name) == 0) {
+			return dsys_screens[i];
+		}
+	}
+	return 0;
+}
+
+void dsys_run_screen(struct demoscreen *scr)
+{
+	int i;
+
+	if(!scr) return;
+	if(dsys_num_act == 1 && dsys_act[0] == scr) return;
+
+	for(i=0; i<dsys_num_act; i++) {
+		if(dsys_act[i]->stop) dsys_act[i]->stop();
+		dsys_act[i]->active = 0;
+	}
+
+	dsys_act[0] = scr;
+	dsys_num_act = 1;
+
+	if(scr->start) scr->start();
+	scr->active = 1;
+}
+
+
 int dsys_add_screen(struct demoscreen *scr)
 {
 	if(!scr->name || !scr->init || !scr->draw) {
 		fprintf(stderr, "dsys_add_screen: invalid screen\n");
 		return -1;
 	}
+	if(anm_init_track(&scr->track) == -1) {
+		fprintf(stderr, "dsys_add_screen: failed to initialize keyframe track\n");
+		return -1;
+	}
+	anm_set_track_interpolator(&scr->track, ANM_INTERP_LINEAR);
+	anm_set_track_extrapolator(&scr->track, ANM_EXTRAP_EXTEND);
+	anm_set_track_default(&scr->track, 0);
+
 	dsys_screens[dsys_num_screens++] = scr;
 	return 0;
 }