X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemo.c;h=fbcc4bebd1c161bcf7a54be4bcc069991a9b7845;hb=633743214adddf6ec20f8b1bee1782e6966023af;hp=32f764c5a831be3ffdd8ca64a7587cfcb1c6d872;hpb=8a64d603ee67cd98070360b40938e123ea845154;p=dosdemo

diff --git a/src/demo.c b/src/demo.c
index 32f764c..fbcc4be 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -3,23 +3,59 @@
 #include <string.h>
 #include <math.h>
 #include <errno.h>
+#include <limits.h>
 #include "demo.h"
+#include "screen.h"
+#include "3dgfx.h"
 
-int fbwidth = 320;
-int fbheight = 240;
-int fbbpp = 8;
-unsigned char *fbpixels;
+int fb_width = 320;
+int fb_height = 240;
+int fb_bpp = 16;
+void *fb_pixels;
 unsigned long time_msec;
+int mouse_x, mouse_y;
+unsigned int mouse_bmask;
 
 static unsigned long nframes;
+static const char *start_scr_name;
 
 int demo_init(int argc, char **argv)
 {
+	struct screen *scr;
+
+	if(argv[1]) {
+		start_scr_name = argv[1];
+	}
+
+	if(g3d_init() == -1) {
+		return -1;
+	}
+	g3d_framebuffer(fb_width, fb_height, fb_pixels);
+
+	if(scr_init() == -1) {
+		return -1;
+	}
+	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);
 	return 0;
 }
 
 void demo_cleanup(void)
 {
+	scr_shutdown();
+	g3d_destroy();
+
 	if(time_msec) {
 		float fps = (float)nframes / ((float)time_msec / 1000.0f);
 		printf("average framerate: %.1f\n", fps);
@@ -28,16 +64,8 @@ void demo_cleanup(void)
 
 void demo_draw(void)
 {
-	int i, j;
-	unsigned char *fbptr = fbpixels;
-
-	for(i=0; i<fbheight; i++) {
-		for(j=0; j<fbwidth; j++) {
-			int val = i^j;
-
-			*fbptr++ = val;
-		}
-	}
+	scr_update();
+	scr_draw();
 
 	++nframes;
 }
@@ -51,6 +79,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;
 		}
 	}