From c64bd959ffb4034cb288780f13a351b00fb22ca0 Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Mon, 14 Nov 2016 16:49:23 +0200 Subject: [PATCH] ui notifications --- Makefile | 9 ++-- src/app.cc | 133 ++++++++++++++++++++++++++++++++++++--------- src/app.h | 2 + src/main.cc | 173 ++++++++++++++++++++++++++++++++++------------------------- src/ui.cc | 120 +++++++++++++++++++++++++++++++++++++++++ src/ui.h | 9 ++++ 6 files changed, 345 insertions(+), 101 deletions(-) create mode 100644 src/ui.cc create mode 100644 src/ui.h diff --git a/Makefile b/Makefile index 71b98f1..e43c5ac 100644 --- a/Makefile +++ b/Makefile @@ -7,18 +7,19 @@ bin = demo opt = -O0 dbg = -g -incpath = -Isrc -Isrc/machine -I/usr/local/include +incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2` libpath = -L/usr/local/lib warn = -pedantic -Wall CFLAGS = $(warn) $(opt) $(dbg) $(incpath) CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath) -LDFLAGS = $(libpath) $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman -lpthread -lassimp -ltreestore +LDFLAGS = $(libpath) $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \ + -lpthread -lassimp -ltreestore -ldrawtext `pkg-config --libs sdl2` sys = $(shell uname -s) -libgl_Linux = -lGL -lGLU -lglut -lGLEW -libgl_Darwin = -framework OpenGL -framework GLUT -lGLEW +libgl_Linux = -lGL -lGLU -lGLEW +libgl_Darwin = -framework OpenGL -lGLEW $(bin): .clang_complete $(obj) $(CXX) -o $@ $(obj) $(LDFLAGS) diff --git a/src/app.cc b/src/app.cc index 6020947..96b3f86 100644 --- a/src/app.cc +++ b/src/app.cc @@ -9,17 +9,24 @@ #include "scene.h" #include "metascene.h" #include "datamap.h" +#include "ui.h" static void draw_scene(); long time_msec; int win_width, win_height; +float win_aspect; bool opt_gear_wireframe; -bool show_walk_mesh; static float cam_dist = 0.0; static float cam_theta, cam_phi = 20; static Vec3 cam_pos; +static float floor_y; // last floor height +static float user_eye_height = 165; + +static float walk_speed = 400.0f; +static bool show_walk_mesh, noclip = false; + static int prev_mx, prev_my; static bool bnstate[8]; static bool keystate[256]; @@ -51,6 +58,16 @@ bool app_init() return false; } + // set initial cam_pos above the center of the walk mesh (if any) + if(scn->walk_mesh) { + Vec3 bcent; + float brad; + scn->walk_mesh->get_bsphere(&bcent, &brad); + + floor_y = bcent.y; + cam_pos = bcent + Vec3(0, user_eye_height, 0); + } + if(!(sdr = create_program_load("sdr/test.v.glsl", "sdr/test.p.glsl"))) { fprintf(stderr, "failed to load test shaders\n"); return false; @@ -67,37 +84,82 @@ void app_cleanup() texman.clear(); } +static bool constrain_walk_mesh(const Vec3 &v, Vec3 *newv) +{ + Mesh *wm = scn->walk_mesh; + if(!wm) { + *newv = v; + return true; + } + + Ray downray = Ray(v, Vec3(0, -1, 0)); + HitPoint hit; + if(scn->walk_mesh->intersect(downray, &hit)) { + *newv = hit.pos; + newv->y += user_eye_height; + return true; + } + return false; +} + static void update(float dt) { texman.update(); scn->update(dt); - float walk_speed = 2000.0 * dt; + float speed = walk_speed * dt; Vec3 dir; if(keystate[(int)'w']) { - dir.z -= walk_speed; + dir.z -= speed; } if(keystate[(int)'s']) { - dir.z += walk_speed; + dir.z += speed; } if(keystate[(int)'d']) { - dir.x += walk_speed; + dir.x += speed; } if(keystate[(int)'a']) { - dir.x -= walk_speed; + dir.x -= speed; } if(keystate[(int)'q']) { - cam_pos.y += walk_speed; + cam_pos.y += speed; } if(keystate[(int)'z']) { - cam_pos.y -= walk_speed; + cam_pos.y -= speed; } float theta = M_PI * cam_theta / 180.0f; - cam_pos.x += cos(theta) * dir.x - sin(theta) * dir.z; - cam_pos.z += sin(theta) * dir.x + cos(theta) * dir.z; + Vec3 newpos; + newpos.x = cam_pos.x + cos(theta) * dir.x - sin(theta) * dir.z; + newpos.y = cam_pos.y; + newpos.z = cam_pos.z + sin(theta) * dir.x + cos(theta) * dir.z; + + if(noclip) { + cam_pos = newpos; + } else { + if(!constrain_walk_mesh(newpos, &cam_pos)) { + float dtheta = M_PI / 32.0; + float theta = dtheta; + Vec2 dir2d = newpos.xz() - cam_pos.xz(); + + for(int i=0; i<16; i++) { + Vec2 dvec = rotate(dir2d, theta); + Vec3 pos = cam_pos + Vec3(dvec.x, 0, dvec.y); + if(constrain_walk_mesh(pos, &cam_pos)) { + break; + } + dvec = rotate(dir2d, -theta); + pos = cam_pos + Vec3(dvec.x, 0, dvec.y); + if(constrain_walk_mesh(pos, &cam_pos)) { + break; + } + theta += dtheta; + } + } + floor_y = cam_pos.y - user_eye_height; + } } static void set_light(int idx, const Vec3 &pos, const Vec3 &color) @@ -136,6 +198,7 @@ void app_display() update(dt); draw_scene(); + draw_ui(); app_swap_buffers(); assert(glGetError() == GL_NO_ERROR); @@ -144,16 +207,6 @@ void app_display() static void draw_scene() { - /* - glBegin(GL_QUADS); - glNormal3f(0, 1, 0); - glVertex3f(-30, -10, 30); - glVertex3f(30, -10, 30); - glVertex3f(30, -10, -30); - glVertex3f(-30, -10, -30); - glEnd(); - */ - glUseProgram(sdr); scn->draw(); glUseProgram(0); @@ -163,10 +216,16 @@ static void draw_scene() glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE); glDisable(GL_LIGHTING); + glEnable(GL_POLYGON_OFFSET_FILL); - glColor3f(0.5, 0.4, 0.05); + glPolygonOffset(-1, 1); + glDepthMask(0); + + glColor3f(0.3, 0.08, 0.01); scn->walk_mesh->draw(); + glDepthMask(1); + glPopAttrib(); } } @@ -183,22 +242,43 @@ void app_reshape(int x, int y) void app_keyboard(int key, bool pressed) { + unsigned int mod = app_get_modifiers(); + if(pressed) { - printf("key: %d (mod: %x)\n", key, app_get_modifiers()); switch(key) { case 27: app_quit(); break; case 'w': - if(app_get_modifiers() & MOD_CTRL) { + if(mod & MOD_CTRL) { show_walk_mesh = !show_walk_mesh; + show_message("walk mesh: %s", show_walk_mesh ? "on" : "off"); } break; + + case 'c': + if(mod & MOD_CTRL) { + noclip = !noclip; + show_message(noclip ? "no clip" : "clip"); + } + break; + + case '=': + walk_speed *= 1.25; + show_message("walk speed: %g", walk_speed); + break; + + case '-': + walk_speed *= 0.75; + show_message("walk speed: %g", walk_speed); + break; } } - keystate[key] = pressed; + if(key < 256 && !(mod & (MOD_CTRL | MOD_ALT))) { + keystate[key] = pressed; + } } void app_mouse_button(int bn, bool pressed, int x, int y) @@ -217,6 +297,11 @@ void app_mouse_motion(int x, int y) if(!dx && !dy) return; + app_mouse_delta(dx, dy); +} + +void app_mouse_delta(int dx, int dy) +{ if(bnstate[0]) { cam_theta += dx * 0.5; cam_phi += dy * 0.5; diff --git a/src/app.h b/src/app.h index 12b3072..7efb44f 100644 --- a/src/app.h +++ b/src/app.h @@ -3,6 +3,7 @@ extern long time_msec; extern int win_width, win_height; +extern float win_aspect; extern bool opt_gear_wireframe; enum { @@ -20,6 +21,7 @@ void app_reshape(int x, int y); void app_keyboard(int key, bool pressed); void app_mouse_button(int bn, bool pressed, int x, int y); void app_mouse_motion(int x, int y); +void app_mouse_delta(int dx, int dy); // the following functions are implemented by the backend (main.cc) void app_quit(); diff --git a/src/main.cc b/src/main.cc index f9c9f3a..45b5632 100644 --- a/src/main.cc +++ b/src/main.cc @@ -2,58 +2,87 @@ #include #include #include -#ifdef __APPLE__ -#include -#else -#include -#endif +#include #include "app.h" static bool init(); -static void display(); -static void idle(); -static void reshape(int x, int y); -static void key_press(unsigned char key, int x, int y); -static void key_release(unsigned char key, int x, int y); -static void mouse(int bn, int st, int x, int y); +static void process_event(SDL_Event *ev); static void proc_modkeys(); +static SDL_Window *win; +static SDL_GLContext ctx; +static bool fullscreen, mouse_grabbed; +static bool quit; + static unsigned int start_time; static unsigned int modkeys; +static int scale_factor = 1; + int main(int argc, char **argv) { - glutInitWindowSize(1024, 768); - glutInit(&argc, argv); - glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE | GLUT_MULTISAMPLE); - glutCreateWindow("demo"); - - glutDisplayFunc(display); - glutIdleFunc(idle); - glutReshapeFunc(reshape); - glutKeyboardFunc(key_press); - glutKeyboardUpFunc(key_release); - glutMouseFunc(mouse); - glutMotionFunc(app_mouse_motion); - glutPassiveMotionFunc(app_mouse_motion); + if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { + fprintf(stderr, "failed to initialize SDL\n"); + return 1; + } + + SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); + SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 8); + SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 1); + + int defpos = SDL_WINDOWPOS_UNDEFINED; + unsigned int sdlflags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI; + + if(!(win = SDL_CreateWindow("demo", defpos, defpos, 1024, 768, sdlflags))) { + // try again without sRGB capability + SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 0); + if(!(win = SDL_CreateWindow("demo", defpos, defpos, 1024, 768, sdlflags))) { + fprintf(stderr, "failed to create window\n"); + SDL_Quit(); + return 1; + } + } + + if(!(ctx = SDL_GL_CreateContext(win))) { + fprintf(stderr, "failed to create OpenGL context\n"); + SDL_Quit(); + return 1; + } + SDL_GL_GetDrawableSize(win, &win_width, &win_height); + win_aspect = (float)win_width / (float)win_height; if(!init()) { + SDL_Quit(); return 1; } - atexit(app_cleanup); + app_reshape(win_width, win_height); - glutMainLoop(); + while(!quit) { + SDL_Event ev; + + time_msec = SDL_GetTicks() - start_time; + while(SDL_PollEvent(&ev)) { + process_event(&ev); + if(quit) goto break_evloop; + } + + app_display(); + } +break_evloop: + + app_cleanup(); + SDL_Quit(); return 0; } void app_swap_buffers() { - glutSwapBuffers(); + SDL_GL_SwapWindow(win); } void app_quit() { - exit(0); + quit = true; } unsigned int app_get_modifiers() @@ -69,62 +98,60 @@ static bool init() return false; } - start_time = glutGet(GLUT_ELAPSED_TIME); + start_time = SDL_GetTicks(); return true; } -static void display() -{ - time_msec = glutGet(GLUT_ELAPSED_TIME) - start_time; - app_display(); -} - -static void idle() -{ - glutPostRedisplay(); -} - -static void reshape(int x, int y) -{ - win_width = x; - win_height = y; - - app_reshape(x, y); -} - -static void key_press(unsigned char key, int x, int y) -{ - proc_modkeys(); - app_keyboard(key, true); -} - -static void key_release(unsigned char key, int x, int y) -{ - proc_modkeys(); - app_keyboard(key, false); -} - -static void mouse(int bn, int st, int x, int y) +static void process_event(SDL_Event *ev) { - int bidx = bn - GLUT_LEFT_BUTTON; - bool down = st == GLUT_DOWN; - - proc_modkeys(); - app_mouse_button(bidx, down, x, y); + switch(ev->type) { + case SDL_QUIT: + quit = true; + break; + + case SDL_KEYDOWN: + case SDL_KEYUP: + proc_modkeys(); + app_keyboard(ev->key.keysym.sym, ev->key.state == SDL_PRESSED); + break; + + case SDL_MOUSEBUTTONDOWN: + case SDL_MOUSEBUTTONUP: + proc_modkeys(); + app_mouse_button(ev->button.button - SDL_BUTTON_LEFT, ev->button.state == SDL_PRESSED, + ev->button.x * scale_factor, ev->button.y * scale_factor); + break; + + case SDL_MOUSEMOTION: + if(mouse_grabbed) { + app_mouse_delta(ev->motion.xrel, ev->motion.yrel); + } else { + app_mouse_motion(ev->motion.x * scale_factor, ev->motion.y * scale_factor); + } + break; + + case SDL_WINDOWEVENT: + if(ev->window.event == SDL_WINDOWEVENT_RESIZED) { + SDL_GL_GetDrawableSize(win, &win_width, &win_height); + win_aspect = (float)win_width / (float)win_height; + scale_factor = win_width / ev->window.data1; + app_reshape(win_width, win_height); + } + break; + } } static void proc_modkeys() { - int glutmod = glutGetModifiers(); - modkeys = 0; - if(glutmod & GLUT_ACTIVE_SHIFT) { + SDL_Keymod sdlmod = SDL_GetModState(); + if(sdlmod & KMOD_SHIFT) { modkeys |= MOD_SHIFT; } - if(glutmod & GLUT_ACTIVE_CTRL) { - modkeys |= MOD_CTRL; - } - if(glutmod & GLUT_ACTIVE_ALT) { + if(sdlmod & KMOD_ALT) { modkeys |= MOD_ALT; } + if(sdlmod & KMOD_CTRL) { + modkeys |= MOD_CTRL; + } } diff --git a/src/ui.cc b/src/ui.cc new file mode 100644 index 0000000..33fbccf --- /dev/null +++ b/src/ui.cc @@ -0,0 +1,120 @@ +#include +#include +#include +#include +#include +#include "opengl.h" +#include "ui.h" +#include "app.h" + +#define FONTSZ 16 + +static bool init(); + +struct Message { + long start_time, show_until; + char *str; + Message *next; +}; +static Message *msglist; + +static long timeout = 2000; +static long trans_time = 250; +static dtx_font *font; + +void set_message_timeout(long tm) +{ + timeout = tm; +} + +void show_message(const char *fmt, ...) +{ + va_list ap; + char buf[512]; + + init(); + + va_start(ap, fmt); + vsnprintf(buf, sizeof buf, fmt, ap); + va_end(ap); + + Message *msg = new Message; + int len = strlen(buf); + msg->str = new char[len + 1]; + memcpy(msg->str, buf, len + 1); + msg->start_time = time_msec; + msg->show_until = time_msec + timeout; + + Message dummy; + dummy.next = msglist; + Message *prev = &dummy; + while(prev->next && prev->next->show_until < msg->show_until) { + prev = prev->next; + } + msg->next = prev->next; + prev->next = msg; + msglist = dummy.next; +} + +void draw_ui() +{ + if(!font) return; + + while(msglist && msglist->show_until <= time_msec) { + Message *msg = msglist; + msglist = msg->next; + delete [] msg->str; + delete msg; + } + + dtx_use_font(font, FONTSZ); + + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glOrtho(0, win_width, -win_height, 0, -1, 1); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); + + glPushAttrib(GL_ENABLE_BIT); + glDisable(GL_LIGHTING); + glDisable(GL_DEPTH_TEST); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glUseProgram(0); + + Message *msg = msglist; + while(msg) { + long t = time_msec - msg->start_time; + long dur = msg->show_until - msg->start_time; + float alpha = smoothstep(0, trans_time, t) * + (1.0 - smoothstep(dur - trans_time, dur, t)); + glColor4f(1.0, 0.5, 0.1, alpha); + glTranslatef(0, -dtx_line_height(), 0); + dtx_string(msg->str); + msg = msg->next; + } + + glPopAttrib(); + + glMatrixMode(GL_PROJECTION); + glPopMatrix(); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); +} + +static bool init() +{ + static bool done_init; + if(done_init) return true; + + done_init = true; + + if(!(font = dtx_open_font("data/ui.font", 0))) { + fprintf(stderr, "failed to open font: data/ui.font\n"); + return false; + } + dtx_prepare_range(font, FONTSZ, 32, 127); + return true; +} diff --git a/src/ui.h b/src/ui.h new file mode 100644 index 0000000..1ed6c27 --- /dev/null +++ b/src/ui.h @@ -0,0 +1,9 @@ +#ifndef UI_H_ +#define UI_H_ + +void set_message_timeout(long timeout); +void show_message(const char *fmt, ...); + +void draw_ui(); + +#endif // UI_H_ -- 1.7.10.4