X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=d4b516ed5804679e2061c23a7b3309f515a15aa3;hp=dcfd3f351ae19008482e89084c5c53b00f540a67;hb=3c48aa0de66e0b89b674d353eb6c84b2c9276013;hpb=215f16e2f26cc2acc79255bab06f13452ec06ae5 diff --git a/src/app.cc b/src/app.cc index dcfd3f3..d4b516e 100644 --- a/src/app.cc +++ b/src/app.cc @@ -1,4 +1,5 @@ #include +#include #include #include #include "app.h" @@ -26,7 +27,7 @@ static void draw_scene(); static void toggle_flight(); static void calc_framerate(); -static Ray calc_pick_ray(int x, int y, const Mat4 &view_mat, const Mat4 &proj_mat); +static Ray calc_pick_ray(int x, int y); long time_msec; int win_width, win_height; @@ -39,6 +40,8 @@ SceneSet sceneman; unsigned int sdr_ltmap, sdr_ltmap_notex; +int fpexcept_enabled; + static Avatar avatar; static float cam_dist = 0.0; @@ -70,15 +73,28 @@ static ExhibitManager *exman; static BlobExhibit *blobs; static bool show_blobs; -static ExSelection ex_sel; +ExSelection exsel_active, exsel_hover; +ExSelection exsel_grab_left, exsel_grab_right; +#define exsel_grab_mouse exsel_grab_right +static ExhibitSlot exslot_left, exslot_right; +#define exslot_mouse exslot_right static Renderer *rend; +static Ray last_pick_ray; + bool app_init(int argc, char **argv) { set_log_file("demo.log"); + char *env = getenv("FPEXCEPT"); + if(env && atoi(env)) { + info_log("enabling floating point exceptions\n"); + fpexcept_enabled = 1; + enable_fpexcept(); + } + if(init_opengl() == -1) { return false; } @@ -119,7 +135,6 @@ bool app_init(int argc, char **argv) glEnable(GL_MULTISAMPLE); glEnable(GL_DEPTH_TEST); glEnable(GL_CULL_FACE); - glEnable(GL_LIGHTING); glEnable(GL_NORMALIZE); if(!init_debug_gui()) { @@ -211,6 +226,9 @@ void app_cleanup() delete rend; + /* this must be destroyed before the scene graph to detach exhibit nodes + * before the scene tries to delete them recursively + */ delete exman; texman.clear(); @@ -323,7 +341,7 @@ static void update(float dt) floor_y = avatar.pos.y - user_eye_height; } - // TODO move to avatar + // TODO move to the avatar system // calculate mouselook view matrix mouse_view_matrix = Mat4::identity; mouse_view_matrix.pre_translate(0, 0, -cam_dist); @@ -333,24 +351,24 @@ static void update(float dt) mouse_view_matrix.pre_rotate_y(deg_to_rad(avatar.body_rot)); mouse_view_matrix.pre_translate(-avatar.pos.x, -avatar.pos.y, -avatar.pos.z); + // check if an exhibit is hovered-over by mouse or 6dof (only if we don't have one grabbed) + if(!exsel_grab_mouse) { + // XXX note: using previous view/proj matrix lattency shouldn't be an issue but + // make sure state-creep doesn't get us + // XXX also this mouse-picking probably should only be active in non-VR mode + Ray ray = calc_pick_ray(prev_mx, prev_my); + exsel_hover = exman->select(ray); + } + + if(!exslot_left.empty()) exslot_left.node.update(dt); + if(!exslot_right.empty()) exslot_right.node.update(dt); + // update hand-tracking if(have_handtracking) { update_vrhands(&avatar); } } -static void set_light(int idx, const Vec3 &pos, const Vec3 &color) -{ - unsigned int lt = GL_LIGHT0 + idx; - float posv[] = { pos.x, pos.y, pos.z, 1 }; - float colv[] = { color.x, color.y, color.z, 1 }; - - glEnable(lt); - glLightfv(lt, GL_POSITION, posv); - glLightfv(lt, GL_DIFFUSE, colv); - glLightfv(lt, GL_SPECULAR, colv); -} - void app_display() { float dt = (float)(time_msec - prev_msec) / 1000.0f; @@ -430,11 +448,6 @@ void app_display() static void draw_scene() { - static const Vec3 lpos[] = { Vec3(-50, 75, 100), Vec3(100, 0, 30), Vec3(-10, -10, 60) }; - set_light(0, lpos[0], Vec3(1.0, 0.8, 0.7) * 0.8); - set_light(1, lpos[1], Vec3(0.6, 0.7, 1.0) * 0.6); - set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3); - rend->draw(); exman->draw(); @@ -474,7 +487,6 @@ static void draw_scene() glPushAttrib(GL_ENABLE_BIT); glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE); - glDisable(GL_LIGHTING); glEnable(GL_POLYGON_OFFSET_FILL); glUseProgram(0); @@ -602,6 +614,8 @@ void app_keyboard(int key, bool pressed) void app_mouse_button(int bn, bool pressed, int x, int y) { + static int press_x, press_y; + if(debug_gui) { debug_gui_mbutton(bn, pressed, x, y); return; // ignore mouse events while GUI is visible @@ -612,13 +626,66 @@ void app_mouse_button(int bn, bool pressed, int x, int y) bnstate[bn] = pressed; if(bn == 0) { - if(!pressed) { - if(ex_sel.ex) { - ex_sel.ex = 0; - } else { - Ray ray = calc_pick_ray(x, y, view_matrix, proj_matrix); - ex_sel = exman->select(ray); + ExSelection sel; + Ray ray = calc_pick_ray(x, y); + sel = exman->select(ray); + + if(pressed) { + if(sel && (app_get_modifiers() & MOD_CTRL)) { + exsel_grab_mouse = sel; + Vec3 pos = sel.ex->node->get_position(); + debug_log("grabbing... (%g %g %g)\n", pos.x, pos.y, pos.z); + exslot_mouse.node.set_position(pos); + exslot_mouse.node.set_rotation(sel.ex->node->get_rotation()); + exslot_mouse.attach_exhibit(sel.ex, EXSLOT_ATTACH_TRANSIENT); + if(exsel_active) { + exsel_active = ExSelection::null; // cancel active on grab + } } + press_x = x; + press_y = y; + + } else { + if(exsel_grab_mouse) { + // cancel grab on mouse release + Exhibit *ex = exsel_grab_mouse.ex; + Vec3 pos = exslot_mouse.node.get_position(); + + debug_log("releasing at %g %g %g ...\n", pos.x, pos.y, pos.z); + + exslot_mouse.detach_exhibit(); + + ExhibitSlot *slot = exman->nearest_empty_slot(pos, 100); + if(!slot) { + debug_log("no empty slot nearby\n"); + if(ex->prev_slot && ex->prev_slot->empty()) { + slot = ex->prev_slot; + debug_log("using previous slot"); + } + } + + if(slot) { + slot->attach_exhibit(ex); + } else { + // nowhere to put it, so stash it for later + exslot_mouse.detach_exhibit(); + exman->stash_exhibit(ex); + debug_log("no slots available, stashing\n"); + } + + exsel_grab_mouse = ExSelection::null; + } + + if(abs(press_x - x) < 5 && abs(press_y - y) < 5) { + exsel_active = sel; // select or deselect active exhibit + if(sel) { + debug_log("selecting...\n"); + } else { + debug_log("deselecting...\n"); + } + } + + press_x = press_y = INT_MIN; } } } @@ -653,11 +720,11 @@ void app_mouse_motion(int x, int y) if(!dx && !dy) return; - if(ex_sel.ex) { - Vec3 pos = ex_sel.ex->node->get_node_position(); + if(exsel_grab_mouse) { + Vec3 pos = exslot_mouse.node.get_node_position(); Vec3 dir = transpose(view_matrix.upper3x3()) * Vec3(dx * 1.0, dy * -1.0, 0); - ex_sel.ex->node->set_position(pos + dir); + exslot_mouse.node.set_position(pos + dir); } if(bnstate[2]) { @@ -744,7 +811,7 @@ static void toggle_flight() static void calc_framerate() { - static int ncalc; + //static int ncalc; static int nframes; static long prev_upd; @@ -763,7 +830,11 @@ static void calc_framerate() } } -static Ray calc_pick_ray(int x, int y, const Mat4 &view_mat, const Mat4 &proj_mat) +static Ray calc_pick_ray(int x, int y) { - return Ray(); // TODO + float nx = (float)x / (float)win_width; + float ny = (float)(win_height - y) / (float)win_height; + + last_pick_ray = mouse_pick_ray(nx, ny, view_matrix, proj_matrix); + return last_pick_ray; }