X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=tools%2Fdunger%2Fsrc%2Fmain.c;h=847d00c3b2e58072538b227b336fec217f9c441a;hb=8d36df2b04dfa5d747dd21ae2ddf7d349524674a;hp=1fad989ca4d18cf90c4026c30d65a42f5b842ddf;hpb=b9a0ca8d193fff1c168182c62ce9d364e48b558d;p=vrlugburz diff --git a/tools/dunger/src/main.c b/tools/dunger/src/main.c index 1fad989..847d00c 100644 --- a/tools/dunger/src/main.c +++ b/tools/dunger/src/main.c @@ -17,11 +17,13 @@ static void mouse(int bn, int st, int x, int y); static void motion(int x, int y); static void cb_new(utk_event *ev, void *data); +static void cb_new_ok(utk_event *ev, void *data); static void cb_open(utk_event *ev, void *data); +static void cb_open_ok(utk_event *ev, void *data); static void cb_save(utk_event *ev, void *data); +static void cb_save_ok(utk_event *ev, void *data); static void cb_cancel(utk_event *ev, void *data); -static void cb_new_ok(utk_event *ev, void *data); static int parse_args(int argc, char **argv); @@ -45,13 +47,15 @@ int mousex, mousey, clickx, clicky; static float uiscale = 1.0f; #define UISPLIT 150 -int splitx; +static int splitx; #define FONTSZ 16 static struct dtx_font *uifont; static utk_widget *uiroot, *uiwin_new; +static utk_widget *uigrab; +static utk_widget *cbox_newsz; -static struct level *lvl; +static struct level lvl; int main(int argc, char **argv) @@ -89,7 +93,8 @@ int main(int argc, char **argv) static int init(void) { - utk_widget *win, *box; + int pad; + utk_widget *win, *hbox, *vbox; glEnable(GL_MULTISAMPLE); @@ -121,20 +126,26 @@ static int init(void) utk_button(win, "Open ...", 0, 0, cb_open, 0); utk_button(win, "Save ...", 0, 0, cb_save, 0); - uiwin_new = utk_window(uiroot, 10, 10, 300, 200, "New level"); + uiwin_new = utk_window(uiroot, (win_width - 220) / 2, (win_height - 150) / 2, + 220, 150, "New level"); + vbox = utk_vbox(uiwin_new, UTK_DEF_PADDING, UTK_DEF_SPACING); { - const char *items[] = {"small (8x8)", "medium (16x16)", "large (32x32)"}; - utk_combobox_items(uiwin_new, items, sizeof items / sizeof *items, 0, 0); + const char *items[] = {"small (16x16)", "medium (24x24)", "large (32x32)"}; + cbox_newsz = utk_combobox_items(vbox, items, sizeof items / sizeof *items, 0, 0); + utk_select(cbox_newsz, 2); } - box = utk_hbox(uiwin_new, UTK_DEF_PADDING, UTK_DEF_SPACING); - utk_button(box, "OK", 0, 0, cb_new_ok, 0); - utk_button(box, "Cancel", 0, 0, cb_cancel, uiwin_new); + hbox = utk_hbox(vbox, UTK_DEF_PADDING, UTK_DEF_SPACING); + utk_button(hbox, "OK", 0, 0, cb_new_ok, 0); + utk_button(hbox, "Cancel", 0, 0, cb_cancel, uiwin_new); + pad = utk_get_padding(uiwin_new); + utk_set_size(uiwin_new, utk_get_width(vbox) + pad * 2.0f, utk_get_height(vbox) + pad * 2.0f); - if(!(lvl = create_level(32, 32))) { + + if(init_level(&lvl, 32, 32) == -1) { fprintf(stderr, "failed to create level\n"); return -1; } - if(init_lview(lvl) == -1) { + if(init_lview(&lvl) == -1) { return -1; } @@ -148,7 +159,7 @@ static int init(void) static void cleanup(void) { destroy_lview(); - free_level(lvl); + destroy_level(&lvl); dtx_close_font(uifont); utk_close(uiroot); } @@ -160,22 +171,6 @@ static void display(void) glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - /* draw UI */ - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, splitx, win_height, 0, -1, 1); - glViewport(0, 0, splitx, win_height); - - glBegin(GL_QUADS); - glColor3f(0.25, 0.25, 0.25); - glVertex2f(0, 0); - glVertex2f(splitx, 0); - glVertex2f(splitx, win_height); - glVertex2f(0, win_height); - glEnd(); - utk_draw(uiroot); - /* draw view */ glMatrixMode(GL_PROJECTION); @@ -193,6 +188,27 @@ static void display(void) draw_lview(); + /* draw UI */ + + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(0, win_width, win_height, 0, -1, 1); + glViewport(0, 0, win_width, win_height); + + glBegin(GL_QUADS); + glColor3f(0.25, 0.25, 0.25); + glVertex2f(0, 0); + glVertex2f(splitx, 0); + glVertex2f(splitx, win_height); + glVertex2f(0, win_height); + glEnd(); + + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + utk_draw(uiroot); + glDisable(GL_BLEND); + + glutSwapBuffers(); } @@ -210,7 +226,24 @@ static void reshape(int x, int y) static void keyb(unsigned char key, int x, int y) { - if(key == 27) exit(0); + switch(key) { + case 27: + if(uigrab) { + if(utk_is_dialog(uigrab)) { + utk_destroy_window(uigrab); + } else { + utk_hide(uigrab); + } + uigrab = 0; + } else { + exit(0); + } + return; + + default: + break; + } + utk_keyboard_event(key, 1); glutPostRedisplay(); } @@ -238,12 +271,14 @@ static void mouse(int bn, int st, int x, int y) clickx = clicky = -1; } } else if(bn == 3) { - if(press) view_zoom += 0.1; + if(press) zoom_lview(0.1); } else if(bn == 4) { - if(press) view_zoom -= 0.1; + if(press) zoom_lview(-0.1); } - lview_mbutton(bidx, press, x, y); + if(!uigrab) { + lview_mbutton(bidx, press, x, y); + } utk_mbutton_event(bidx, press, x / uiscale, y / uiscale); glutPostRedisplay(); @@ -259,12 +294,13 @@ static void motion(int x, int y) if(clickx >= splitx) { if(bnstate[1]) { - view_panx -= dx; - view_pany += dy; + pan_lview(-dx, dy); } } - lview_mouse(x, y); + if(!uigrab) { + lview_mouse(x, y); + } utk_mmotion_event(x / uiscale, y / uiscale); glutPostRedisplay(); @@ -273,23 +309,69 @@ static void motion(int x, int y) static void cb_new(utk_event *ev, void *data) { utk_show(uiwin_new); + uigrab = uiwin_new; +} + +static void cb_new_ok(utk_event *ev, void *data) +{ + static int levsz[] = {16, 24, 32}; + int sz; + struct level newlvl; + + sz = levsz[utk_get_selected(cbox_newsz)]; + + if(init_level(&newlvl, sz, sz) == -1) { + utk_message_dialog("failed to create new level", UTK_MSG_TYPE_ERROR, + UTK_MSG_BN_OK, cb_cancel, 0); + return; + } + + destroy_level(&lvl); + destroy_lview(); + + lvl = newlvl; + init_lview(&lvl); + + utk_hide(uiwin_new); + uigrab = 0; } static void cb_open(utk_event *ev, void *data) { + uigrab = utk_file_dialog(UTK_FILE_DIALOG_OPEN, 0, "Level file (*.lvl) [.lvl]", 0, cb_open_ok, 0); +} + +static void cb_open_ok(utk_event *ev, void *data) +{ + utk_widget *dlg = utk_event_widget(ev); + printf("selected: %s\n", utk_file_dialog_file(dlg)); + utk_destroy_window(dlg); + if(uigrab == dlg) uigrab = 0; } static void cb_save(utk_event *ev, void *data) { + uigrab = utk_file_dialog(UTK_FILE_DIALOG_SAVE, 0, "Level file (*.lvl) [.lvl]", 0, cb_save_ok, 0); } -static void cb_cancel(utk_event *ev, void *data) +static void cb_save_ok(utk_event *ev, void *data) { - utk_hide(data); + utk_widget *dlg = utk_event_widget(ev); + printf("selected: %s\n", utk_file_dialog_file(dlg)); + utk_destroy_window(dlg); + if(uigrab == dlg) uigrab = 0; } -static void cb_new_ok(utk_event *ev, void *data) +static void cb_cancel(utk_event *ev, void *data) { + if(!data) data = utk_get_window(utk_event_widget(ev)); + + if(utk_is_dialog(data)) { + utk_destroy_window(data); + } else { + utk_hide(data); + } + uigrab = 0; } static int parse_args(int argc, char **argv)