X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=f2487cfe238b7c60064ecc41416190bc42014691;hp=3165e314001dd32ccb042365c40fa999477a2f55;hb=e8b26db00c934d141f16652cb8dcbeae23b17e48;hpb=1442212ba0ff24b868dd29facc2278a26c8a9a18 diff --git a/src/sdl/main.c b/src/sdl/main.c index 3165e31..f2487cf 100644 --- a/src/sdl/main.c +++ b/src/sdl/main.c @@ -1,15 +1,24 @@ #include #include +#include #include #include #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,42 +26,57 @@ 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; + int s; char *env; - unsigned short *sptr, *dptr; if((env = getenv("FBSCALE")) && (s = atoi(env))) { fbscale = s; printf("Framebuffer scaling x%d\n", fbscale); } - xsz = fb_width * fbscale; - ysz = fb_height * fbscale; + xsz = FB_WIDTH * fbscale; + ysz = FB_HEIGHT * fbscale; + /* now start_loadscr sets up fb_pixels to the space used by the loading image, + * so no need to allocate another framebuffer + */ +#if 0 /* allocate 1 extra row as a guard band, until we fucking fix the rasterizer */ - if(!(fb_pixels = malloc(fb_width * (fb_height + 1) * fb_bpp / CHAR_BIT))) { + if(!(fb_pixels = malloc(FB_WIDTH * (FB_HEIGHT + 1) * FB_BPP / CHAR_BIT))) { fprintf(stderr, "failed to allocate virtual framebuffer\n"); return 1; } - vmem_front = vmem_back = fb_pixels; +#endif - SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER); - if(!(fbsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, sdl_flags))) { - fprintf(stderr, "failed to set video mode %dx%d %dbpp\n", fb_width, fb_height, fb_bpp); - free(fb_pixels); + SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE); + if(!(fbsurf = SDL_SetVideoMode(xsz, ysz, FB_BPP, sdl_flags))) { + fprintf(stderr, "failed to set video mode %dx%d %dbpp\n", FB_WIDTH, FB_HEIGHT, FB_BPP); + /*free(fb_pixels);*/ SDL_Quit(); return 1; } SDL_WM_SetCaption("dosdemo/SDL", 0); + SDL_ShowCursor(0); time_msec = 0; if(demo_init(argc, argv) == -1) { - free(fb_pixels); + /*free(fb_pixels);*/ SDL_Quit(); return 1; } + vmem = fb_pixels; + + if(opt.sball && sball_init() == 0) { + use_sball = 1; + } + reset_timer(); while(!quit) { @@ -62,35 +86,17 @@ int main(int argc, char **argv) if(quit) goto break_evloop; } - time_msec = get_msec(); - demo_draw(); - drawFps(fb_pixels); - - if(SDL_MUSTLOCK(fbsurf)) { - SDL_LockSurface(fbsurf); - } - - sptr = fb_pixels; - dptr = (unsigned short*)fbsurf->pixels + (fbsurf->w - xsz) / 2; - for(i=0; iw + x] = pixel; - } - } - dptr += fbscale; + if(use_sball) { + while(sball_pending()) { + sball_event ev; + sball_getevent(&ev); + handle_sball_event(&ev); } - dptr += (fbsurf->w - fb_width) * fbscale; + recalc_sball_matrix(sball_matrix); } - if(SDL_MUSTLOCK(fbsurf)) { - SDL_UnlockSurface(fbsurf); - } - SDL_Flip(fbsurf); + time_msec = get_msec(); + demo_draw(); } break_evloop: @@ -113,14 +119,61 @@ void wait_vsync(void) void swap_buffers(void *pixels) { - /* do nothing, all pointers point to the same buffer */ + int i, j; + unsigned short *sptr, *dptr; + + demo_post_draw(pixels ? pixels : fb_pixels); + if(opt.vsync) { wait_vsync(); } + + if(SDL_MUSTLOCK(fbsurf)) { + SDL_LockSurface(fbsurf); + } + + sptr = fb_pixels; + dptr = (unsigned short*)fbsurf->pixels + (fbsurf->w - xsz) / 2; + for(i=0; iw + x] = pixel; + } + } + dptr += fbscale; + } + dptr += (fbsurf->w - FB_WIDTH) * fbscale; + } + + if(SDL_MUSTLOCK(fbsurf)) { + SDL_UnlockSurface(fbsurf); + } + SDL_Flip(fbsurf); +} + +static int bnmask(int sdlbn) +{ + switch(sdlbn) { + case SDL_BUTTON_LEFT: + return MOUSE_BN_LEFT; + case SDL_BUTTON_RIGHT: + return MOUSE_BN_RIGHT; + case SDL_BUTTON_MIDDLE: + return MOUSE_BN_MIDDLE; + default: + break; + } + return 0; } static void handle_event(SDL_Event *ev) { + int key; + switch(ev->type) { case SDL_QUIT: quit = 1; @@ -133,7 +186,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: @@ -142,10 +196,10 @@ static void handle_event(SDL_Event *ev) break; case SDL_MOUSEBUTTONDOWN: - mouse_bmask |= 1 << (ev->button.button - SDL_BUTTON_LEFT); + mouse_bmask |= bnmask(ev->button.button); if(0) { case SDL_MOUSEBUTTONUP: - mouse_bmask &= ~(1 << (ev->button.button - SDL_BUTTON_LEFT)); + mouse_bmask &= ~bnmask(ev->button.button); } mouse_x = ev->button.x / fbscale; mouse_y = ev->button.y / fbscale; @@ -161,7 +215,7 @@ static void toggle_fullscreen(void) SDL_Surface *newsurf; unsigned int newflags = sdl_flags ^ SDL_FULLSCREEN; - if(!(newsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, newflags))) { + if(!(newsurf = SDL_SetVideoMode(xsz, ysz, FB_BPP, newflags))) { fprintf(stderr, "failed to go %s\n", newflags & SDL_FULLSCREEN ? "fullscreen" : "windowed"); return; } @@ -169,3 +223,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; +}