X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fapp.c;h=fdcbe118dd2c7342e580c23bd73f33380b1a6174;hb=b0088adf036a53139f67ebf96f1bbb55abf199f4;hp=0a0af71e5d675c6d204769b2260b0b6bf48cf148;hpb=7fccf8b3543c8cdb993252f0cf9a6b9ed826408e;p=retroray

diff --git a/src/app.c b/src/app.c
index 0a0af71..fdcbe11 100644
--- a/src/app.c
+++ b/src/app.c
@@ -25,7 +25,17 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "app.h"
 #include "options.h"
 #include "font.h"
+#include "util.h"
+#include "rtk.h"
 
+#ifdef GFX_SW
+#include "gaw/gaw_sw.h"
+#endif
+
+static void gui_fill(rtk_rect *rect, uint32_t color);
+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];
@@ -38,7 +48,10 @@ long time_msec;
 
 struct app_screen *cur_scr;
 
-struct font *font;
+struct font *uifont;
+
+uint32_t *framebuf;
+
 
 /* available screens */
 #define MAX_SCREENS	8
@@ -50,6 +63,9 @@ int app_init(void)
 {
 	int i;
 	char *start_scr_name;
+	static rtk_draw_ops guigfx = {gui_fill, gui_blit, gui_drawtext, gui_textrect};
+
+	init_logger();
 
 #if !defined(NDEBUG) && defined(DBG_FPEXCEPT)
 	printf("floating point exceptions enabled\n");
@@ -65,12 +81,14 @@ int app_init(void)
 
 	dtx_target_user(txdraw, 0);
 
-	font = malloc_nf(sizeof *font);
-	if(load_font(uifont, "data/uifont.gmp") == -1) {
+	uifont = malloc_nf(sizeof *uifont);
+	if(load_font(uifont, "data/uifont12.gmp") == -1) {
 		free(uifont);
 		return -1;
 	}
 
+	rtk_setup(&guigfx);
+
 	/* initialize screens */
 	screens[num_screens++] = &scr_model;
 	screens[num_screens++] = &scr_rend;
@@ -92,7 +110,7 @@ int app_init(void)
 		}
 	}
 	if(!cur_scr) {
-		app_chscr(&scr_logo);
+		app_chscr(&scr_model);
 	}
 
 	return 0;
@@ -104,7 +122,7 @@ void app_shutdown(void)
 
 	putchar('\n');
 
-	save_options(GAME_CFG_FILE);
+	save_options("retroray.cfg");
 
 	for(i=0; i<num_screens; i++) {
 		if(screens[i]->destroy) {
@@ -114,12 +132,12 @@ void app_shutdown(void)
 
 	destroy_font(uifont);
 	free(uifont);
+
+	cleanup_logger();
 }
 
 void app_display(void)
 {
-	static long nframes, interv, prev_msec;
-
 	time_msec = app_getmsec();
 
 	cur_scr->display();
@@ -129,6 +147,21 @@ void app_display(void)
 
 void app_reshape(int x, int y)
 {
+	int numpix = x * y;
+	int prev_numpix = win_width * win_height;
+
+	if(numpix > prev_numpix) {
+		void *tmp;
+		if(!(tmp = realloc(framebuf, numpix * sizeof *framebuf))) {
+			errormsg("failed to resize framebuffer to %dx%d\n", x, y);
+			return;
+		}
+		framebuf = tmp;
+	}
+#ifdef GFX_SW
+	gaw_sw_framebuffer(x, y, framebuf);
+#endif
+
 	win_width = x;
 	win_height = y;
 	win_aspect = (float)x / (float)y;
@@ -151,8 +184,8 @@ void app_keyboard(int key, int press)
 
 		case '\n':
 		case '\r':
-			if(modkeys & GKEY_MOD_ALT) {
-		case GKEY_F11:
+			if(modkeys & KEY_MOD_ALT) {
+		case KEY_F11:
 				app_fullscreen(-1);
 				return;
 			}
@@ -227,55 +260,50 @@ void app_chscr(struct app_screen *scr)
 	cur_scr = scr;
 }
 
-static void txdraw(struct dtx_vertex *v, int vcount, struct dtx_pixmap *pixmap, void *cls)
+static void gui_fill(rtk_rect *rect, uint32_t color)
 {
-	int i, aref, npix;
-	unsigned char *src, *dest;
-	struct texture *tex = pixmap->udata;
-
-	if(!tex) {
-		struct img_pixmap *img = img_create();
-		img_set_pixels(img, pixmap->width, pixmap->height, IMG_FMT_RGBA32, 0);
-
-		npix = pixmap->width * pixmap->height;
-		src = pixmap->pixels;
-		dest = img->pixels;
-		for(i=0; i<npix; i++) {
-			dest[0] = dest[1] = dest[2] = 0xff;
-			dest[3] = *src++;
-			dest += 4;
-		}
+	int i, j;
+	uint32_t *fb = framebuf + rect->y * win_width + rect->x;
 
-		if(!(tex = tex_image(img))) {
-			return;
+	for(i=0; i<rect->height; i++) {
+		for(j=0; j<rect->width; j++) {
+			fb[j] = color;
 		}
-		pixmap->udata = tex;
+		fb += win_width;
 	}
+}
 
-	gaw_save();
-	if(dtx_get(DTX_GL_BLEND)) {
-		gaw_enable(GAW_BLEND);
-		gaw_blend_func(GAW_SRC_ALPHA, GAW_ONE_MINUS_SRC_ALPHA);
-	} else {
-		gaw_disable(GAW_BLEND);
-	}
-	if((aref = dtx_get(DTX_GL_ALPHATEST))) {
-		gaw_enable(GAW_ALPHA_TEST);
-		gaw_alpha_func(GAW_GREATER, aref);
-	} else {
-		gaw_disable(GAW_ALPHA_TEST);
+static void gui_blit(int x, int y, rtk_icon *icon)
+{
+	int i, j;
+	uint32_t *dest, *src;
+
+	dest = framebuf + y * win_width + x;
+	src = icon->pixels;
+
+	for(i=0; i<icon->height; i++) {
+		for(j=0; j<icon->width; j++) {
+			int r = src[j] & 0xff;
+			int g = (src[j] >> 8) & 0xff;
+			int b = (src[j] >> 16) & 0xff;
+			dest[j] = 0xff000000 | (r << 16) | (g << 8) | b;
+		}
+		dest += win_width;
+		src += icon->scanlen;
 	}
+}
 
-	gaw_set_tex2d(tex->texid);
+static void gui_drawtext(int x, int y, const char *str)
+{
+}
 
-	gaw_begin(GAW_TRIANGLES);
-	for(i=0; i<vcount; i++) {
-		gaw_texcoord2f(v->s, v->t);
-		gaw_vertex2f(v->x, v->y);
-		v++;
-	}
-	gaw_end();
+static void gui_textrect(const char *str, rtk_rect *rect)
+{
+	rect->x = rect->y = 0;
+	rect->width = 20;
+	rect->height = 10;/* TODO */
+}
 
-	gaw_restore();
-	gaw_set_tex2d(0);
+static void txdraw(struct dtx_vertex *v, int vcount, struct dtx_pixmap *pixmap, void *cls)
+{
 }