minor performance improvements, optional mouse, mouse cursor now drawn
[dosdemo] / src / demo.c
index a990d5f..7067ccd 100644 (file)
 #include "3dgfx.h"
 #include "music.h"
 #include "cfgopt.h"
+#include "console.h"
 #include "tinyfps.h"
 #include "util.h"
 
+#define MOUSE_TIMEOUT  1200
+
+/*
 #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;
 unsigned long time_msec;
 int mouse_x, mouse_y;
@@ -26,8 +31,15 @@ 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 last_mouse_move;
+static int prev_mx, prev_my, mouse_dx, mouse_dy;
+static unsigned int bmask_diff, prev_bmask;
+
 static unsigned long nframes;
-static int console_active;
+static int con_active;
+
+extern uint16_t loading_pixels[];      /* data.asm */
+
 
 int demo_init(int argc, char **argv)
 {
@@ -44,12 +56,19 @@ int demo_init(int argc, char **argv)
                return -1;
        }
 
+       /* 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;
+
+       con_init();
        initFpsFonts();
 
        if(g3d_init() == -1) {
                return -1;
        }
-       g3d_framebuffer(fb_width, fb_height, fb_pixels);
+       g3d_framebuffer(FB_WIDTH, FB_HEIGHT, fb_pixels);
 
        if(opt.music) {
                if(music_open("data/test.mod") == -1) {
@@ -72,7 +91,7 @@ int demo_init(int argc, char **argv)
        }
 
        /* clear the framebuffer at least once */
-       memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
+       memset(fb_pixels, 0, FB_WIDTH * FB_HEIGHT * FB_BPP / CHAR_BIT);
 
        if(opt.music) {
                music_play();
@@ -96,93 +115,78 @@ void demo_cleanup(void)
 
 void demo_draw(void)
 {
+       if(opt.mouse) {
+               mouse_dx = mouse_x - prev_mx;
+               mouse_dy = mouse_y - prev_my;
+               prev_mx = mouse_x;
+               prev_my = mouse_y;
+               bmask_diff = mouse_bmask ^ prev_bmask;
+               prev_bmask = mouse_bmask;
+               if(mouse_dx | mouse_dy) {
+                       last_mouse_move = time_msec;
+               }
+       }
+
        if(opt.music) {
                music_update();
        }
        scr_update();
        scr_draw();
 
-       draw_mouse_pointer(vmem);
-
        ++nframes;
 }
 
+/* called by swap_buffers just before the actual swap */
+void demo_post_draw(void *pixels)
+{
+       char buf[32];
+       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);
+       }
 
+       if(opt.mouse && time_msec - last_mouse_move < MOUSE_TIMEOUT) {
+               cs_mouseptr(pixels, mouse_x, mouse_y);
+       }
+}
 
-#define DEST(x, y)     dest[(y) * FB_WIDTH + (x)]
-void draw_mouse_pointer(uint16_t *fb)
+void cs_puts_font(cs_font_func csfont, int sz, void *fb, int x, int y, const char *str)
 {
-       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;
+       while(*str) {
+               int c = *str++;
+
+               if(c > ' ' && c < 128) {
+                       csfont(fb, x, y, c - ' ');
+               }
+               x += sz;
        }
 }
 
-static void change_screen(int idx)
+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:
@@ -190,71 +194,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; i<nscr; i++) {
-                                               if(strstr(scr_screen(i)->name, 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);
@@ -264,34 +231,25 @@ void demo_keyboard(int key, int press)
 
 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(bmask_diff == 0) {
 
-                       if(dx || dy) {
+                       if(mouse_dx | mouse_dy) {
                                if(mouse_bmask & MOUSE_BN_LEFT) {
                                        float p = *phi;
-                                       *theta += dx * 1.0;
-                                       p += dy * 1.0;
+                                       *theta += mouse_dx * 1.0;
+                                       p += mouse_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;
+                                       *dist += mouse_dy * 0.5;
 
                                        if(*dist < 0) *dist = 0;
                                }
                        }
                }
        }
-
-       prev_mx = mouse_x;
-       prev_my = mouse_y;
-       prev_bmask = mouse_bmask;
 }