X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdemo.c;h=8ad984cd0a9c187e891b5640c87c18702da0cba0;hp=2ff25a749a4dfe146fb63d4c41d28d14847c4912;hb=c912e59b898fe1ac461a1468e4a2e1937de286d7;hpb=00a81988c5c6c91997f2f9346ac94858622490bd diff --git a/src/demo.c b/src/demo.c index 2ff25a7..8ad984c 100644 --- a/src/demo.c +++ b/src/demo.c @@ -10,13 +10,17 @@ #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; -uint16_t *fb_pixels, *vmem_back, *vmem_front; +uint16_t *fb_pixels, *vmem; unsigned long time_msec; int mouse_x, mouse_y; unsigned int mouse_bmask; @@ -24,7 +28,7 @@ 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 int console_active; +static int con_active; int demo_init(int argc, char **argv) { @@ -41,6 +45,7 @@ int demo_init(int argc, char **argv) return -1; } + con_init(); initFpsFonts(); if(g3d_init() == -1) { @@ -102,25 +107,109 @@ void demo_draw(void) ++nframes; } -static void change_screen(int idx) +/* called by swap_buffers just before the actual swap */ +void demo_post_draw(void *pixels) +{ + 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); } -#define CBUF_SIZE 64 -#define CBUF_MASK (CBUF_SIZE - 1) void demo_keyboard(int key, int press) { - static char cbuf[CBUF_SIZE]; - static int rd, wr; - char inp[CBUF_SIZE + 1], *dptr; - int i, nscr; + int nscr; if(press) { switch(key) { case 27: - demo_quit(); + if(con_active) { + con_stop(); + con_active = 0; + } else { + demo_quit(); + } return; case 127: @@ -128,71 +217,34 @@ void demo_keyboard(int key, int press) return; case '`': - console_active = !console_active; - if(console_active) { - printf("> "); - fflush(stdout); + con_active = !con_active; + if(con_active) { + con_start(); } else { - putchar('\n'); + con_stop(); } return; - case '\b': - if(console_active) { - if(wr != rd) { - printf("\b \b"); - fflush(stdout); - wr = (wr + CBUF_SIZE - 1) & CBUF_MASK; - } + case '/': + if(!con_active) { + con_start(); + con_active = con_input('/'); return; } - break; - - case '\n': - case '\r': - if(console_active) { - dptr = inp; - while(rd != wr) { - *dptr++ = cbuf[rd]; - rd = (rd + 1) & CBUF_MASK; - } - *dptr = 0; - if(inp[0]) { - printf("\ntrying to match: %s\n", inp); - nscr = scr_num_screens(); - for(i=0; iname, inp)) { - change_screen(i); - break; - } - } - } - console_active = 0; + + default: + if(con_active) { + con_active = con_input(key); return; } - break; - default: 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); - } - - if(console_active) { - if(key < 256 && isprint(key)) { - putchar(key); - fflush(stdout); - - cbuf[wr] = key; - wr = (wr + 1) & CBUF_MASK; - if(wr == rd) { /* overflow */ - rd = (rd + 1) & CBUF_MASK; - } - } return; } - break; } scr_keypress(key); @@ -211,7 +263,7 @@ void mouse_orbit_update(float *theta, float *phi, float *dist) int dy = mouse_y - prev_my; if(dx || dy) { - if(mouse_bmask & MOUSE_LEFT) { + if(mouse_bmask & MOUSE_BN_LEFT) { float p = *phi; *theta += dx * 1.0; p += dy * 1.0; @@ -220,7 +272,7 @@ void mouse_orbit_update(float *theta, float *phi, float *dist) if(p > 90) p = 90; *phi = p; } - if(mouse_bmask & MOUSE_RIGHT) { + if(mouse_bmask & MOUSE_BN_RIGHT) { *dist += dy * 0.5; if(*dist < 0) *dist = 0; @@ -228,6 +280,7 @@ void mouse_orbit_update(float *theta, float *phi, float *dist) } } } + prev_mx = mouse_x; prev_my = mouse_y; prev_bmask = mouse_bmask;