#include <limits.h>
#include <SDL/SDL.h>
#include "demo.h"
+#include "tinyfps.h"
+#include "timer.h"
+#include "cfgopt.h"
static void handle_event(SDL_Event *ev);
static void toggle_fullscreen(void);
static int quit;
-static long start_time;
static SDL_Surface *fbsurf;
static int fbscale = 2;
xsz = fb_width * fbscale;
ysz = fb_height * fbscale;
- if(!(fb_pixels = malloc(fb_width * fb_height * fb_bpp / CHAR_BIT))) {
+ /* 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))) {
fprintf(stderr, "failed to allocate virtual framebuffer\n");
return 1;
}
SDL_Quit();
return 1;
}
- start_time = SDL_GetTicks();
+ reset_timer();
while(!quit) {
SDL_Event ev;
if(quit) goto break_evloop;
}
- time_msec = SDL_GetTicks() - start_time;
+ time_msec = get_msec();
demo_draw();
+ drawFps(fb_pixels);
if(SDL_MUSTLOCK(fbsurf)) {
SDL_LockSurface(fbsurf);
quit = 1;
}
+void wait_vsync(void)
+{
+ unsigned long start = SDL_GetTicks();
+ unsigned long until = (start | 0xf) + 1;
+ while(SDL_GetTicks() <= until);
+}
+
void swap_buffers(void *pixels)
{
/* do nothing, all pointers point to the same buffer */
+ if(opt.vsync) {
+ wait_vsync();
+ }
}
static void handle_event(SDL_Event *ev)
case SDL_KEYDOWN:
case SDL_KEYUP:
- if(ev->key.keysym.sym == 'f') {
- if(ev->key.state == SDL_PRESSED) {
- toggle_fullscreen();
- }
+ if(ev->key.keysym.sym == SDLK_RETURN && (SDL_GetModState() & KMOD_ALT) &&
+ ev->key.state == SDL_PRESSED) {
+ toggle_fullscreen();
break;
}
demo_keyboard(ev->key.keysym.sym, ev->key.state == SDL_PRESSED ? 1 : 0);
break;
case SDL_MOUSEBUTTONDOWN:
- mouse_bmask |= 1 << ev->button.button;
+ mouse_bmask |= 1 << (ev->button.button - SDL_BUTTON_LEFT);
if(0) {
case SDL_MOUSEBUTTONUP:
- mouse_bmask &= ~(1 << ev->button.button);
+ mouse_bmask &= ~(1 << (ev->button.button - SDL_BUTTON_LEFT));
}
mouse_x = ev->button.x / fbscale;
mouse_y = ev->button.y / fbscale;