X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdemo.c;h=072b6cead434c16ea9cd80f583871b5b01e459a7;hp=472da328519603287ff4b3ea29673f60166fb33c;hb=77e0277af0c00dae78c7a739b2ca70cc19fd041a;hpb=493e590908a39324651cd2c81323e6969c0b4c4f

diff --git a/src/demo.c b/src/demo.c
index 472da32..072b6ce 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include "demo.h"
@@ -9,6 +10,8 @@
 #include "3dgfx.h"
 #include "music.h"
 #include "cfgopt.h"
+#include "tinyfps.h"
+#include "util.h"
 
 int fb_width = 320;
 int fb_height = 240;
@@ -18,7 +21,10 @@ 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 int console_active;
 
 int demo_init(int argc, char **argv)
 {
@@ -35,6 +41,8 @@ int demo_init(int argc, char **argv)
 		return -1;
 	}
 
+	initFpsFonts();
+
 	if(g3d_init() == -1) {
 		return -1;
 	}
@@ -94,21 +102,133 @@ void demo_draw(void)
 	++nframes;
 }
 
-void demo_keyboard(int key, int state)
+static 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)
 {
-	if(state) {
+	static char cbuf[CBUF_SIZE];
+	static int rd, wr;
+	char inp[CBUF_SIZE + 1], *dptr;
+	int i, nscr;
+
+	if(press) {
 		switch(key) {
 		case 27:
 			demo_quit();
+			return;
+
+		case 127:
+			debug_break();
+			return;
+
+		case '`':
+			console_active = !console_active;
+			if(console_active) {
+				printf("> ");
+				fflush(stdout);
+			} else {
+				putchar('\n');
+			}
+			return;
+
+		case '\b':
+			if(console_active) {
+				if(wr != rd) {
+					printf("\b \b");
+					fflush(stdout);
+					wr = (wr + CBUF_SIZE - 1) & CBUF_MASK;
+				}
+				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;
+				return;
+			}
 			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);
+			if(key >= '1' && key <= '9' && key <= '1' + scr_num_screens()) {
+				change_screen(key - '1');
+			} 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);
+	}
+}
+
+
+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 & 1) {
+					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 & 4) {
+					*dist += dy * 0.5;
+
+					if(*dist < 0) *dist = 0;
+				}
+			}
+		}
 	}
+	prev_mx = mouse_x;
+	prev_my = mouse_y;
+	prev_bmask = mouse_bmask;
 }