X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdemo.c;h=8ad984cd0a9c187e891b5640c87c18702da0cba0;hp=9954cb548cff0baecb8da2b97d88f79d97c1d42e;hb=c912e59b898fe1ac461a1468e4a2e1937de286d7;hpb=ca615218c7fd2c98ced8a0976508a0faab317f81 diff --git a/src/demo.c b/src/demo.c index 9954cb5..8ad984c 100644 --- a/src/demo.c +++ b/src/demo.c @@ -2,44 +2,93 @@ #include #include #include +#include #include #include #include "demo.h" #include "screen.h" +#include "3dgfx.h" +#include "music.h" +#include "cfgopt.h" +#include "console.h" +#include "tinyfps.h" +#include "util.h" -int fb_width = 320; -int fb_height = 240; +#define FB_WIDTH 320 +#define FB_HEIGHT 240 + +int fb_width = FB_WIDTH; +int fb_height = FB_HEIGHT; int fb_bpp = 16; -void *fb_pixels; +uint16_t *fb_pixels, *vmem; unsigned long time_msec; int mouse_x, mouse_y; unsigned int mouse_bmask; +float sball_matrix[] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}; + static unsigned long nframes; -static const char *start_scr_name = "tunnel"; +static int con_active; int demo_init(int argc, char **argv) { - if(argv[1]) { - start_scr_name = argv[1]; + struct screen *scr; + char *env; + + if(load_config("demo.cfg") == -1) { + return -1; + } + if((env = getenv("START_SCR"))) { + opt.start_scr = env; + } + if(parse_args(argc, argv) == -1) { + return -1; + } + + con_init(); + initFpsFonts(); + + if(g3d_init() == -1) { + return -1; + } + g3d_framebuffer(fb_width, fb_height, fb_pixels); + + if(opt.music) { + if(music_open("data/test.mod") == -1) { + 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(opt.start_scr) { + scr = scr_lookup(opt.start_scr); + } else { + scr = scr_screen(0); + } + + if(!scr || scr_change(scr, 4000) == -1) { + fprintf(stderr, "screen %s not found\n", opt.start_scr ? opt.start_scr : "0"); return -1; } /* clear the framebuffer at least once */ memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT); + + if(opt.music) { + music_play(); + } return 0; } void demo_cleanup(void) { + if(opt.music) { + music_close(); + } scr_shutdown(); + g3d_destroy(); if(time_msec) { float fps = (float)nframes / ((float)time_msec / 1000.0f); @@ -49,22 +98,190 @@ void demo_cleanup(void) void demo_draw(void) { + if(opt.music) { + music_update(); + } scr_update(); scr_draw(); ++nframes; } -void demo_keyboard(int key, int state) +/* called by swap_buffers just before the actual swap */ +void demo_post_draw(void *pixels) { - if(state) { + if(opt.dbginfo) { + drawFps(pixels); + if(dbg_curscr_name) { + cs_dputs(pixels, dbg_curscr_name_pos, 240 - 16, dbg_curscr_name); + } + } + + if(con_active) { + con_draw(pixels); + } + + draw_mouse_pointer(pixels); +} + +#define DEST(x, y) dest[(y) * FB_WIDTH + (x)] +void draw_mouse_pointer(uint16_t *fb) +{ + uint16_t *dest = fb + mouse_y * FB_WIDTH + mouse_x; + int ylines = FB_HEIGHT - mouse_y; + + switch(ylines) { + default: + case 10: + DEST(0, 9) = 0xffff; + case 9: + DEST(0, 8) = 0xffff; + DEST(1, 8) = 0xffff; + case 8: + DEST(0, 7) = 0xffff; + DEST(2, 7) = 0xffff; + DEST(1, 7) = 0; + case 7: + DEST(6, 6) = 0xffff; + DEST(0, 6) = 0xffff; + DEST(3, 6) = 0xffff; + DEST(4, 6) = 0xffff; + DEST(5, 6) = 0xffff; + DEST(1, 6) = 0; + DEST(2, 6) = 0; + case 6: + DEST(5, 5) = 0xffff; + DEST(0, 5) = 0xffff; + DEST(1, 5) = 0; + DEST(2, 5) = 0; + DEST(3, 5) = 0; + DEST(4, 5) = 0; + case 5: + DEST(4, 4) = 0xffff; + DEST(0, 4) = 0xffff; + DEST(1, 4) = 0; + DEST(2, 4) = 0; + DEST(3, 4) = 0; + case 4: + DEST(3, 3) = 0xffff; + DEST(0, 3) = 0xffff; + DEST(1, 3) = 0; + DEST(2, 3) = 0; + case 3: + DEST(2, 2) = 0xffff; + DEST(0, 2) = 0xffff; + DEST(1, 2) = 0; + case 2: + DEST(1, 1) = 0xffff; + DEST(0, 1) = 0xffff; + case 1: + DEST(0, 0) = 0xffff; + } +} + +void cs_puts_font(cs_font_func csfont, int sz, void *fb, int x, int y, const char *str) +{ + while(*str) { + int c = *str++; + + if(c > ' ' && c < 128) { + csfont(fb, x, y, c - ' '); + } + x += sz; + } +} + +void change_screen(int idx) +{ + printf("change screen %d\n", idx); + scr_change(scr_screen(idx), 4000); +} + +void demo_keyboard(int key, int press) +{ + int nscr; + + if(press) { switch(key) { case 27: - demo_quit(); - break; + if(con_active) { + con_stop(); + con_active = 0; + } else { + demo_quit(); + } + return; + + case 127: + debug_break(); + return; + + case '`': + con_active = !con_active; + if(con_active) { + con_start(); + } else { + con_stop(); + } + return; + + case '/': + if(!con_active) { + con_start(); + con_active = con_input('/'); + return; + } default: - break; + if(con_active) { + con_active = con_input(key); + return; + } + + if(key >= '1' && key <= '9' && key <= '1' + scr_num_screens()) { + change_screen(key - '1'); + return; + } else if(key == '0' && scr_num_screens() >= 10) { + change_screen(9); + return; + } + } + + scr_keypress(key); + } +} + + +void mouse_orbit_update(float *theta, float *phi, float *dist) +{ + static int prev_mx, prev_my; + static unsigned int prev_bmask; + + if(mouse_bmask) { + if((mouse_bmask ^ prev_bmask) == 0) { + int dx = mouse_x - prev_mx; + int dy = mouse_y - prev_my; + + if(dx || dy) { + if(mouse_bmask & MOUSE_BN_LEFT) { + float p = *phi; + *theta += dx * 1.0; + p += dy * 1.0; + + if(p < -90) p = -90; + if(p > 90) p = 90; + *phi = p; + } + if(mouse_bmask & MOUSE_BN_RIGHT) { + *dist += dy * 0.5; + + if(*dist < 0) *dist = 0; + } + } } } + + prev_mx = mouse_x; + prev_my = mouse_y; + prev_bmask = mouse_bmask; }