X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscreen.c;h=190b19fbe9c3d3ab43ac2a87a867e5d1cd60adb4;hb=HEAD;hp=68a8c7f78a2139ba23c8c56794088f67f7b36f1b;hpb=73f97e0d9dc83cad4aa7b53d900ea28390afed4f;p=dosdemo

diff --git a/src/screen.c b/src/screen.c
index 68a8c7f..190b19f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4,6 +4,15 @@
 #include <assert.h>
 #include "screen.h"
 #include "demo.h"
+#include "gfxutil.h"
+#include "timer.h"
+
+#define DBG_SCRCHG \
+	do { \
+		dbg_curscr_name = cur->name ? cur->name : "<unknown>"; \
+		dbg_curscr_name_len = strlen(dbg_curscr_name); \
+		dbg_curscr_name_pos = 320 - dbg_curscr_name_len * 9; \
+	} while(0)
 
 struct screen *tunnel_screen(void);
 struct screen *fract_screen(void);
@@ -16,6 +25,13 @@ struct screen *metaballs_screen(void);
 struct screen *greets_screen(void);
 struct screen *infcubes_screen(void);
 struct screen *hairball_screen(void);
+struct screen *cybersun_screen(void);
+struct screen *raytrace_screen(void);
+struct screen *minifx_screen(void);
+
+void start_loadscr(void);
+void end_loadscr(void);
+void loadscr(int n, int count);
 
 #define NUM_SCR 32
 static struct screen *scr[NUM_SCR];
@@ -24,10 +40,15 @@ static int num_screens;
 static struct screen *cur, *prev, *next;
 static long trans_start, trans_dur;
 
+const char *dbg_curscr_name;
+int dbg_curscr_name_len, dbg_curscr_name_pos;
+
 int scr_init(void)
 {
 	int i, idx = 0;
 
+	start_loadscr();
+
 	if(!(scr[idx++] = tunnel_screen())) {
 		return -1;
 	}
@@ -61,15 +82,28 @@ int scr_init(void)
 	if(!(scr[idx++] = hairball_screen())) {
 		return -1;
 	}
+	if(!(scr[idx++] = cybersun_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = raytrace_screen())) {
+		return -1;
+	}
+    if (!(scr[idx++] = minifx_screen())) {
+		return -1;
+    }
+    
 	num_screens = idx;
 
 	assert(num_screens <= NUM_SCR);
 
 	for(i=0; i<num_screens; i++) {
+		loadscr(i, num_screens);
 		if(scr[i]->init() == -1) {
 			return -1;
 		}
 	}
+
+	end_loadscr();
 	return 0;
 }
 
@@ -92,6 +126,8 @@ void scr_update(void)
 			prev = 0;
 			cur = next;
 			next = 0;
+
+			DBG_SCRCHG;
 		}
 	}
 }
@@ -101,9 +137,6 @@ void scr_draw(void)
 {
 	if(cur) {
 		cur->draw();
-
-		/* print screen name */
-		cs_puts(fb_pixels, 0, 0, cur->name);
 	}
 }
 
@@ -158,6 +191,72 @@ int scr_change(struct screen *s, long trans_time)
 
 		cur = s;
 		prev = 0;
+
+		DBG_SCRCHG;
 	}
 	return 0;
 }
+
+/* loading screen */
+extern uint16_t loading_pixels[];
+static long prev_load_msec;
+static long load_delay;
+
+void start_loadscr(void)
+{
+	char *env;
+	if((env = getenv("MLAPSE_LOADDELAY"))) {
+		load_delay = atoi(env);
+		printf("load delay: %ld ms\n", load_delay);
+	}
+
+	swap_buffers(loading_pixels);
+	if(load_delay) {
+		sleep_msec(load_delay * 2);
+	}
+	prev_load_msec = get_msec();
+}
+
+#define SPLAT_X 288
+#define SPLAT_Y 104
+
+#define FING_X	217
+#define FING_LAST_X	291
+#define FING_Y	151
+#define FING_W	7
+#define FING_H	8
+
+void end_loadscr(void)
+{
+	blitfb(loading_pixels + SPLAT_Y * 320 + SPLAT_X, loading_pixels + 320 * 240, 32, 72, 32);
+	blit_key(loading_pixels + FING_Y * 320 + FING_LAST_X, 320, loading_pixels + 247 * 320 + 64, FING_W, FING_H, FING_W, 0);
+	swap_buffers(loading_pixels);
+	if(load_delay) {
+		sleep_msec(load_delay * 3);
+	}
+}
+
+void loadscr(int n, int count)
+{
+	int xoffs = 75 * n / (count - 1);
+	static int prev_xoffs;
+	uint16_t *sptr, *dptr;
+	long delta;
+
+	sptr = loading_pixels + 247 * 320 + 64;
+	dptr = loading_pixels + FING_Y * 320 + FING_X + prev_xoffs;
+
+	while(prev_xoffs < xoffs) {
+		blit_key(dptr, 320, sptr, FING_W, FING_H, FING_W, 0);
+		dptr++;
+		prev_xoffs++;
+	}
+
+	swap_buffers(loading_pixels);
+
+	delta = get_msec() - prev_load_msec;
+	if(delta < load_delay) {
+		sleep_msec(load_delay - delta);
+	}
+	prev_load_msec = get_msec();
+}