X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=fcaee9bf30ada99f3a38b89d02d97f998255a6dc;hp=358d774bf9ccde3c692ed864e7707c87ab2a121d;hb=efaf4df9a6d3fed46b7ef7f568eb47e43c16462e;hpb=00a81988c5c6c91997f2f9346ac94858622490bd

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 358d774..fcaee9b 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -1,15 +1,24 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>
 #include <limits.h>
 #include <SDL/SDL.h>
 #include "demo.h"
 #include "tinyfps.h"
 #include "timer.h"
 #include "cfgopt.h"
+#include "sball.h"
+#include "vmath.h"
 
 static void handle_event(SDL_Event *ev);
 static void toggle_fullscreen(void);
 
+static int handle_sball_event(sball_event *ev);
+static void recalc_sball_matrix(float *xform);
+
+static int sdlkey_to_demokey(int sdlkey, unsigned int mod);
+
+
 static int quit;
 static SDL_Surface *fbsurf;
 
@@ -17,6 +26,11 @@ static int fbscale = 2;
 static int xsz, ysz;
 static unsigned int sdl_flags = SDL_SWSURFACE;
 
+static int use_sball;
+static vec3_t pos = {0, 0, 0};
+static quat_t rot = {0, 0, 0, 1};
+
+
 int main(int argc, char **argv)
 {
 	int s, i, j;
@@ -36,7 +50,7 @@ int main(int argc, char **argv)
 		fprintf(stderr, "failed to allocate virtual framebuffer\n");
 		return 1;
 	}
-	vmem_front = vmem_back = fb_pixels;
+	vmem = fb_pixels;
 
 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE);
 	if(!(fbsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, sdl_flags))) {
@@ -46,6 +60,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	SDL_WM_SetCaption("dosdemo/SDL", 0);
+	SDL_ShowCursor(0);
 
 	time_msec = 0;
 	if(demo_init(argc, argv) == -1) {
@@ -53,6 +68,11 @@ int main(int argc, char **argv)
 		SDL_Quit();
 		return 1;
 	}
+
+	if(opt.sball && sball_init() == 0) {
+		use_sball = 1;
+	}
+
 	reset_timer();
 
 	while(!quit) {
@@ -62,9 +82,17 @@ int main(int argc, char **argv)
 			if(quit) goto break_evloop;
 		}
 
+		if(use_sball) {
+			while(sball_pending()) {
+				sball_event ev;
+				sball_getevent(&ev);
+				handle_sball_event(&ev);
+			}
+			recalc_sball_matrix(sball_matrix);
+		}
+
 		time_msec = get_msec();
 		demo_draw();
-		drawFps(fb_pixels);
 
 		if(SDL_MUSTLOCK(fbsurf)) {
 			SDL_LockSurface(fbsurf);
@@ -113,6 +141,8 @@ void wait_vsync(void)
 
 void swap_buffers(void *pixels)
 {
+	demo_post_draw(pixels ? pixels : fb_pixels);
+
 	/* do nothing, all pointers point to the same buffer */
 	if(opt.vsync) {
 		wait_vsync();
@@ -123,11 +153,11 @@ static int bnmask(int sdlbn)
 {
 	switch(sdlbn) {
 	case SDL_BUTTON_LEFT:
-		return MOUSE_LEFT;
+		return MOUSE_BN_LEFT;
 	case SDL_BUTTON_RIGHT:
-		return MOUSE_RIGHT;
+		return MOUSE_BN_RIGHT;
 	case SDL_BUTTON_MIDDLE:
-		return MOUSE_MIDDLE;
+		return MOUSE_BN_MIDDLE;
 	default:
 		break;
 	}
@@ -136,6 +166,8 @@ static int bnmask(int sdlbn)
 
 static void handle_event(SDL_Event *ev)
 {
+	int key;
+
 	switch(ev->type) {
 	case SDL_QUIT:
 		quit = 1;
@@ -148,7 +180,8 @@ static void handle_event(SDL_Event *ev)
 			toggle_fullscreen();
 			break;
 		}
-		demo_keyboard(ev->key.keysym.sym, ev->key.state == SDL_PRESSED ? 1 : 0);
+		key = sdlkey_to_demokey(ev->key.keysym.sym, ev->key.keysym.mod);
+		demo_keyboard(key, ev->key.state == SDL_PRESSED ? 1 : 0);
 		break;
 
 	case SDL_MOUSEMOTION:
@@ -184,3 +217,78 @@ static void toggle_fullscreen(void)
 	fbsurf = newsurf;
 	sdl_flags = newflags;
 }
+
+
+
+#define TX(ev)	((ev)->motion.motion[0])
+#define TY(ev)	((ev)->motion.motion[1])
+#define TZ(ev)	((ev)->motion.motion[2])
+#define RX(ev)	((ev)->motion.motion[3])
+#define RY(ev)	((ev)->motion.motion[4])
+#define RZ(ev)	((ev)->motion.motion[5])
+
+static int handle_sball_event(sball_event *ev)
+{
+	switch(ev->type) {
+	case SBALL_EV_MOTION:
+		if(RX(ev) | RY(ev) | RZ(ev)) {
+			float rx = (float)RX(ev);
+			float ry = (float)RY(ev);
+			float rz = (float)RZ(ev);
+			float axis_len = sqrt(rx * rx + ry * ry + rz * rz);
+			if(axis_len > 0.0) {
+				rot = quat_rotate(rot, axis_len * 0.001, -rx / axis_len,
+						-ry / axis_len, -rz / axis_len);
+			}
+		}
+
+		pos.x += TX(ev) * 0.001;
+		pos.y += TY(ev) * 0.001;
+		pos.z += TZ(ev) * 0.001;
+		break;
+
+	case SBALL_EV_BUTTON:
+		if(ev->button.pressed) {
+			pos = v3_cons(0, 0, 0);
+			rot = quat_cons(1, 0, 0, 0);
+		}
+		break;
+	}
+
+	return 0;
+}
+
+static void recalc_sball_matrix(float *xform)
+{
+	quat_to_mat(xform, rot);
+	xform[12] = pos.x;
+	xform[13] = pos.y;
+	xform[14] = pos.z;
+}
+
+#define SSORG	'\''
+#define SSEND	'`'
+static char symshift[] = {
+	'"', 0, 0, 0, 0, '<', '_', '>', '?',
+	')', '!', '@', '#', '$', '%', '^', '&', '*', '(',
+	0, ':', 0, '+', 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'{', '|', '}', 0, 0, '~'
+};
+
+
+static int sdlkey_to_demokey(int sdlkey, unsigned int mod)
+{
+	if(sdlkey < 128) {
+		if(mod & (KMOD_SHIFT)) {
+			if(sdlkey >= 'a' && sdlkey <= 'z') {
+				sdlkey = toupper(sdlkey);
+			} else if(sdlkey >= SSORG && sdlkey <= SSEND) {
+				sdlkey = symshift[sdlkey - SSORG];
+			}
+		}
+		return sdlkey;
+	}
+	if(sdlkey < 256) return 0;
+	return sdlkey - 128;
+}