X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdemo.c;h=2479c424798ed52bdf78263e1c2e290224904899;hp=7067ccdc9ae94d97808718ffa79a7c15f1c82695;hb=HEAD;hpb=e8b26db00c934d141f16652cb8dcbeae23b17e48

diff --git a/src/demo.c b/src/demo.c
index 7067ccd..2479c42 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -8,7 +8,7 @@
 #include "demo.h"
 #include "screen.h"
 #include "3dgfx.h"
-#include "music.h"
+#include "audio.h"
 #include "cfgopt.h"
 #include "console.h"
 #include "tinyfps.h"
@@ -16,19 +16,21 @@
 
 #define MOUSE_TIMEOUT	1200
 
-/*
-#define FB_WIDTH	320
-#define FB_HEIGHT	240
+#define GUARD_XPAD	0
+#define GUARD_YPAD	64
 
-int fb_width = FB_WIDTH;
-int fb_height = FB_HEIGHT;
-int fb_bpp = 16;
-*/
+int fb_width, fb_height, fb_bpp, fb_scan_size;
+float fb_aspect;
+long fb_size, fb_buf_size;
 uint16_t *fb_pixels, *vmem;
+uint16_t *fb_buf;
+
 unsigned long time_msec;
 int mouse_x, mouse_y;
 unsigned int mouse_bmask;
 
+static struct au_module *mod;
+
 float sball_matrix[] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1};
 
 static unsigned long last_mouse_move;
@@ -40,10 +42,21 @@ static int con_active;
 
 extern uint16_t loading_pixels[];	/* data.asm */
 
-
 int demo_init(int argc, char **argv)
 {
-	struct screen *scr;
+	if(demo_init1(argc, argv) == -1) {
+		return -1;
+	}
+	if(demo_init2() == -1) {
+		return -1;
+	}
+	return 0;
+}
+
+static struct screen *scr;
+
+int demo_init1(int argc, char **argv)
+{
 	char *env;
 
 	if(load_config("demo.cfg") == -1) {
@@ -55,13 +68,11 @@ int demo_init(int argc, char **argv)
 	if(parse_args(argc, argv) == -1) {
 		return -1;
 	}
+	return 0;
+}
 
-	/* reuse the loading image as our back buffer.
-	 * adjust fb_pixels to leave 4 pixels guard band top/bottom. We have enough
-	 * space since the loading image is 8 pixels taller.
-	 */
-	fb_pixels = loading_pixels + 320 * 4;
-
+int demo_init2(void)
+{
 	con_init();
 	initFpsFonts();
 
@@ -71,7 +82,7 @@ int demo_init(int argc, char **argv)
 	g3d_framebuffer(FB_WIDTH, FB_HEIGHT, fb_pixels);
 
 	if(opt.music) {
-		if(music_open("data/test.mod") == -1) {
+		if(!(mod = au_load_module("data/test.mod"))) {
 			return -1;
 		}
 	}
@@ -79,6 +90,7 @@ int demo_init(int argc, char **argv)
 	if(scr_init() == -1) {
 		return -1;
 	}
+
 	if(opt.start_scr) {
 		scr = scr_lookup(opt.start_scr);
 	} else {
@@ -94,7 +106,7 @@ int demo_init(int argc, char **argv)
 	memset(fb_pixels, 0, FB_WIDTH * FB_HEIGHT * FB_BPP / CHAR_BIT);
 
 	if(opt.music) {
-		music_play();
+		au_play_module(mod);
 	}
 	return 0;
 }
@@ -102,7 +114,7 @@ int demo_init(int argc, char **argv)
 void demo_cleanup(void)
 {
 	if(opt.music) {
-		music_close();
+		au_free_module(mod);
 	}
 	scr_shutdown();
 	g3d_destroy();
@@ -113,6 +125,43 @@ void demo_cleanup(void)
 	}
 }
 
+int demo_resizefb(int width, int height, int bpp)
+{
+	int newsz, new_scansz;
+
+	if(!width || !height || !bpp) {
+		free(fb_buf);
+		fb_buf = fb_pixels = 0;
+		fb_size = fb_buf_size = fb_scan_size = 0;
+		fb_width = fb_height = fb_bpp = 0;
+		return 0;
+	}
+
+	new_scansz = ((width + GUARD_XPAD * 2) * bpp + 7) / 8;
+	newsz = (height + GUARD_YPAD * 2) * new_scansz;
+
+	if(!fb_buf || newsz > fb_buf_size) {
+		void *tmp = malloc(newsz);
+		if(!tmp) return -1;
+
+		free(fb_buf);
+		fb_buf = tmp;
+		fb_buf_size = newsz;
+	}
+
+	fb_scan_size = new_scansz;
+	fb_pixels = (uint16_t*)((char*)fb_buf + GUARD_YPAD * fb_scan_size + (GUARD_XPAD * bpp + 7) / 8);
+	fb_width = width;
+	fb_height = height;
+	fb_bpp = bpp;
+	fb_size = fb_scan_size * fb_height;
+
+	fb_aspect = (float)fb_width / (float)fb_height;
+
+	return 0;
+}
+
+
 void demo_draw(void)
 {
 	if(opt.mouse) {
@@ -128,7 +177,7 @@ void demo_draw(void)
 	}
 
 	if(opt.music) {
-		music_update();
+		au_update();
 	}
 	scr_update();
 	scr_draw();