#include <time.h>
#include "gaw/gaw.h"
#include "app.h"
+#include "rend.h"
#include "options.h"
#include "font.h"
#include "util.h"
static void gui_blit(int x, int y, rtk_icon *icon);
static void gui_drawtext(int x, int y, const char *str);
static void gui_textrect(const char *str, rtk_rect *rect);
-static void txdraw(struct dtx_vertex *v, int vcount, struct dtx_pixmap *pixmap, void *cls);
int mouse_x, mouse_y, mouse_state[3];
unsigned int modkeys;
static rtk_draw_ops guigfx = {gui_fill, gui_blit, gui_drawtext, gui_textrect};
#if !defined(NDEBUG) && defined(DBG_FPEXCEPT)
- printf("floating point exceptions enabled\n");
+ infomsg("floating point exceptions enabled\n");
enable_fpexcept();
#endif
#ifdef GFX_SW
gaw_sw_init();
#endif
+ rend_init();
load_options("retroray.cfg");
app_resize(opt.xres, opt.yres);
app_fullscreen(1);
}
- dtx_target_user(txdraw, 0);
+ /*dtx_target_user(txdraw, 0);*/
+ dtx_target_raster((unsigned char*)framebuf, win_width, win_height);
+ dtx_set(DTX_RASTER_THRESHOLD, 127);
uifont = malloc_nf(sizeof *uifont);
- if(load_font(uifont, "data/uifont12.gmp") == -1) {
+ if(load_font(uifont, "data/uifont14.gmp") == -1) {
free(uifont);
return -1;
}
time_msec = app_getmsec();
cur_scr->display();
-
- app_swap_buffers();
}
void app_reshape(int x, int y)
int numpix = x * y;
int prev_numpix = win_width * win_height;
- printf("reshape(%d, %d)\n", x, y);
+ dbgmsg("reshape(%d, %d)\n", x, y);
if(!framebuf || numpix > prev_numpix) {
void *tmp;
#ifdef GFX_SW
gaw_sw_framebuffer(x, y, framebuf);
#endif
+ dtx_target_raster((unsigned char*)framebuf, x, y);
win_width = x;
win_height = y;
return;
#endif
+ case 'q':
+ if(modkeys & KEY_MOD_CTRL) {
+ app_quit();
+ return;
+ }
+ break;
+
case '\n':
case '\r':
if(modkeys & KEY_MOD_ALT) {
rect->width = 20;
rect->height = 10;/* TODO */
}
-
-static void txdraw(struct dtx_vertex *v, int vcount, struct dtx_pixmap *pixmap, void *cls)
-{
-}