X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemo.c;h=9133a2658aa6f1e3b598c186018671c8dfa2372c;hb=a714b8c4811627d874934b0a0387b8cb27fc5921;hp=9954cb548cff0baecb8da2b97d88f79d97c1d42e;hpb=ca615218c7fd2c98ced8a0976508a0faab317f81;p=dosdemo

diff --git a/src/demo.c b/src/demo.c
index 9954cb5..9133a26 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -6,40 +6,65 @@
 #include <limits.h>
 #include "demo.h"
 #include "screen.h"
+#include "3dgfx.h"
+#include "music.h"
 
 int fb_width = 320;
 int fb_height = 240;
 int fb_bpp = 16;
-void *fb_pixels;
+uint16_t *fb_pixels, *vmem_back, *vmem_front;
 unsigned long time_msec;
 int mouse_x, mouse_y;
 unsigned int mouse_bmask;
 
 static unsigned long nframes;
-static const char *start_scr_name = "tunnel";
+static const char *start_scr_name;
 
 int demo_init(int argc, char **argv)
 {
+	struct screen *scr;
+
+	start_scr_name = getenv("START_SCR");
 	if(argv[1]) {
 		start_scr_name = argv[1];
 	}
 
+	if(g3d_init() == -1) {
+		return -1;
+	}
+	g3d_framebuffer(fb_width, fb_height, fb_pixels);
+
+	if(music_open("data/test.mod") == -1) {
+		fprintf(stderr, "failed to open music: data/test.mod\n");
+		return -1;
+	}
+
 	if(scr_init() == -1) {
 		return -1;
 	}
-	if(scr_change(scr_lookup(start_scr_name), 4000) == -1) {
-		fprintf(stderr, "screen %s not found\n", start_scr_name);
+	if(start_scr_name) {
+		scr = scr_lookup(start_scr_name);
+	} else {
+		scr = scr_screen(0);
+	}
+
+	if(!scr || scr_change(scr, 4000) == -1) {
+		fprintf(stderr, "screen %s not found\n", start_scr_name ? start_scr_name : "0");
 		return -1;
 	}
 
 	/* clear the framebuffer at least once */
 	memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
+
+	music_play();
 	return 0;
 }
 
 void demo_cleanup(void)
 {
+	music_close();
 	scr_shutdown();
+	g3d_destroy();
 
 	if(time_msec) {
 		float fps = (float)nframes / ((float)time_msec / 1000.0f);
@@ -49,6 +74,7 @@ void demo_cleanup(void)
 
 void demo_draw(void)
 {
+	music_update();
 	scr_update();
 	scr_draw();
 
@@ -64,6 +90,11 @@ void demo_keyboard(int key, int state)
 			break;
 
 		default:
+			if(key >= '1' && key <= '1' + scr_num_screens()) {
+				int idx = key - '1';
+				printf("change screen %d\n", idx);
+				scr_change(scr_screen(idx), 4000);
+			}
 			break;
 		}
 	}