projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgot to implement mouse calls for djgpp. moved it to mouse.asm
[dosdemo]
/
src
/
dos
/
main.c
diff --git
a/src/dos/main.c
b/src/dos/main.c
index
7564be3
..
018ed51
100644
(file)
--- a/
src/dos/main.c
+++ b/
src/dos/main.c
@@
-3,6
+3,7
@@
#include <math.h>
#include <string.h>
#include <limits.h>
#include <math.h>
#include <string.h>
#include <limits.h>
+#include <conio.h>
#include "demo.h"
#include "keyb.h"
#include "mouse.h"
#include "demo.h"
#include "keyb.h"
#include "mouse.h"
@@
-12,6
+13,9
@@
#include "sball.h"
#include "cfgopt.h"
#include "logger.h"
#include "sball.h"
#include "cfgopt.h"
#include "logger.h"
+#include "tinyfps.h"
+
+#undef NOKEYB
static int handle_sball_event(sball_event *ev);
static void recalc_sball_matrix(float *xform);
static int handle_sball_event(sball_event *ev);
static void recalc_sball_matrix(float *xform);
@@
-31,9
+35,12
@@
int main(int argc, char **argv)
init_logger("demo.log");
init_timer(100);
init_logger("demo.log");
init_timer(100);
+#ifndef NOKEYB
kb_init(32);
kb_init(32);
+#endif
if((use_mouse = have_mouse())) {
if((use_mouse = have_mouse())) {
+ printf("initializing mouse input\n");
set_mouse_limits(0, 0, fb_width, fb_height);
set_mouse(fb_width / 2, fb_height / 2);
}
set_mouse_limits(0, 0, fb_width, fb_height);
set_mouse(fb_width / 2, fb_height / 2);
}
@@
-61,10
+68,16
@@
int main(int argc, char **argv)
reset_timer();
while(!quit) {
reset_timer();
while(!quit) {
+#ifndef NOKEYB
int key;
while((key = kb_getkey()) != -1) {
demo_keyboard(key, 1);
}
int key;
while((key = kb_getkey()) != -1) {
demo_keyboard(key, 1);
}
+#else
+ if(kbhit()) {
+ demo_keyboard(getch(), 1);
+ }
+#endif
if(quit) goto break_evloop;
if(use_mouse) {
if(quit) goto break_evloop;
if(use_mouse) {
@@
-86,7
+99,9
@@
int main(int argc, char **argv)
break_evloop:
set_text_mode();
demo_cleanup();
break_evloop:
set_text_mode();
demo_cleanup();
+#ifndef NOKEYB
kb_shutdown();
kb_shutdown();
+#endif
if(use_sball) {
sball_shutdown();
}
if(use_sball) {
sball_shutdown();
}
@@
-102,11
+117,17
@@
void swap_buffers(void *pixels)
{
/* TODO implement page flipping */
if(pixels) {
{
/* TODO implement page flipping */
if(pixels) {
- /*wait_vsync();*/
+ if(opt.vsync) {
+ wait_vsync();
+ }
drawFps(pixels);
memcpy(vmem_front, pixels, fbsize);
} else {
drawFps(vmem_back);
drawFps(pixels);
memcpy(vmem_front, pixels, fbsize);
} else {
drawFps(vmem_back);
+
+ if(opt.vsync) {
+ wait_vsync();
+ }
}
}
}
}