X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=25c59b32edc994f169003110de01aff653db6d47;hp=60affa003407b41afe7a44b950ea071c2e287a71;hb=ebbb52cd0de8e27817a0770bd7bdb48a58348a02;hpb=3674b7a5b534224cc22551673a9d0ae9b83206c4 diff --git a/src/app.cc b/src/app.cc index 60affa0..25c59b3 100644 --- a/src/app.cc +++ b/src/app.cc @@ -14,8 +14,11 @@ #include "opt.h" #include "post.h" #include "renderer.h" +#include "avatar.h" +#include "vrinput.h" #include "exman.h" #include "blob_exhibit.h" +#include "dbg_gui.h" #define NEAR_CLIP 5.0 #define FAR_CLIP 10000.0 @@ -23,6 +26,7 @@ static void draw_scene(); static void toggle_flight(); static void calc_framerate(); +static Ray calc_pick_ray(int x, int y); long time_msec; int win_width, win_height; @@ -35,9 +39,11 @@ SceneSet sceneman; unsigned int sdr_ltmap, sdr_ltmap_notex; +int fpexcept_enabled; + +static Avatar avatar; + static float cam_dist = 0.0; -static float cam_theta, cam_phi; -static Vec3 cam_pos; static float floor_y; // last floor height static float user_eye_height = 165; @@ -45,7 +51,7 @@ static float walk_speed = 300.0f; static float mouse_speed = 0.5f; static bool show_walk_mesh, noclip = false; -static bool have_headtracking, should_swap; +static bool have_headtracking, have_handtracking, should_swap; static int prev_mx, prev_my; static bool bnstate[8]; @@ -66,11 +72,28 @@ static ExhibitManager *exman; static BlobExhibit *blobs; static bool show_blobs; +static ExSelection ex_sel; + 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; + } + if(!init_options(argc, argv, "demo.conf")) { return false; } @@ -88,22 +111,31 @@ bool app_init(int argc, char **argv) should_swap = goatvr_should_swap() != 0; user_eye_height = goatvr_get_eye_height(); have_headtracking = goatvr_have_headtracking(); + have_handtracking = goatvr_have_handtracking(); goatvr_recenter(); } - int srgb_capable; - glGetIntegerv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT, &srgb_capable); - printf("Framebuffer %s sRGB-capable\n", srgb_capable ? "is" : "is not"); - fb_srgb = srgb_capable != 0; - glEnable(GL_FRAMEBUFFER_SRGB); + if(fb_srgb) { + int srgb_capable; + glGetIntegerv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT, &srgb_capable); + printf("Framebuffer %s sRGB-capable\n", srgb_capable ? "is" : "is not"); + if(srgb_capable) { + glEnable(GL_FRAMEBUFFER_SRGB); + } else { + fb_srgb = 0; + } + } glEnable(GL_MULTISAMPLE); glEnable(GL_DEPTH_TEST); glEnable(GL_CULL_FACE); - glEnable(GL_LIGHTING); glEnable(GL_NORMALIZE); + if(!init_debug_gui()) { + return false; + } + Mesh::use_custom_sdr_attr = false; float ambient[] = {0.0, 0.0, 0.0, 0.0}; @@ -111,20 +143,28 @@ bool app_init(int argc, char **argv) glClearColor(1, 1, 1, 1); + init_audio(); + + if(!init_vrhands()) { + return false; + } + mscn = new MetaScene; if(!mscn->load(opt.scenefile ? opt.scenefile : "data/museum.scene")) { return false; } - cam_pos = mscn->start_pos; + avatar.pos = mscn->start_pos; Vec3 dir = rotate(Vec3(0, 0, 1), mscn->start_rot); dir.y = 0; - cam_theta = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1)))); + avatar.body_rot = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1)))); exman = new ExhibitManager; + /* if(!exman->load(mscn, "data/exhibits")) { - return false; + //return false; } + */ blobs = new BlobExhibit; blobs->node = new SceneNode; @@ -159,15 +199,25 @@ bool app_init(int argc, char **argv) if(opt.vr || opt.fullscreen) { app_grab_mouse(true); } + + if(mscn->music && opt.music) { + mscn->music->play(AUDIO_PLAYMODE_LOOP); + } return true; } void app_cleanup() { + if(mscn->music) { + mscn->music->stop(); + } + destroy_audio(); + app_grab_mouse(false); if(opt.vr) { goatvr_shutdown(); } + destroy_vrhands(); delete rend; @@ -175,6 +225,8 @@ void app_cleanup() texman.clear(); sceneman.clear(); + + cleanup_debug_gui(); } static bool constrain_walk_mesh(const Vec3 &v, Vec3 *newv) @@ -224,10 +276,10 @@ static void update(float dt) jlook_lensq -= jdeadsq; float mag = len * len; - cam_theta += mag * joy_look.x / len * 200.0 * dt; - cam_phi += mag * joy_look.y / len * 100.0 * dt; - if(cam_phi < -90.0f) cam_phi = -90.0f; - if(cam_phi > 90.0f) cam_phi = 90.0f; + avatar.body_rot += mag * joy_look.x / len * 200.0 * dt; + avatar.head_alt += mag * joy_look.y / len * 100.0 * dt; + if(avatar.head_alt < -90.0f) avatar.head_alt = -90.0f; + if(avatar.head_alt > 90.0f) avatar.head_alt = 90.0f; } // keyboard move @@ -244,63 +296,57 @@ static void update(float dt) dir.x -= speed; } if(keystate[(int)'q'] || gpad_bnstate[GPAD_UP]) { - cam_pos.y += speed; + avatar.pos.y += speed; } if(keystate[(int)'z'] || gpad_bnstate[GPAD_DOWN]) { - cam_pos.y -= speed; + avatar.pos.y -= speed; } - float theta = M_PI * cam_theta / 180.0f; + float theta = M_PI * avatar.body_rot / 180.0f; 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; + newpos.x = avatar.pos.x + cos(theta) * dir.x - sin(theta) * dir.z; + newpos.y = avatar.pos.y; + newpos.z = avatar.pos.z + sin(theta) * dir.x + cos(theta) * dir.z; if(noclip) { - cam_pos = newpos; + avatar.pos = newpos; } else { - if(!constrain_walk_mesh(newpos, &cam_pos)) { + if(!constrain_walk_mesh(newpos, &avatar.pos)) { float dtheta = M_PI / 32.0; float theta = dtheta; - Vec2 dir2d = newpos.xz() - cam_pos.xz(); + Vec2 dir2d = newpos.xz() - avatar.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)) { + Vec3 pos = avatar.pos + Vec3(dvec.x, 0, dvec.y); + if(constrain_walk_mesh(pos, &avatar.pos)) { break; } dvec = rotate(dir2d, -theta); - pos = cam_pos + Vec3(dvec.x, 0, dvec.y); - if(constrain_walk_mesh(pos, &cam_pos)) { + pos = avatar.pos + Vec3(dvec.x, 0, dvec.y); + if(constrain_walk_mesh(pos, &avatar.pos)) { break; } theta += dtheta; } } - floor_y = cam_pos.y - user_eye_height; + floor_y = avatar.pos.y - user_eye_height; } + // TODO move to avatar // calculate mouselook view matrix mouse_view_matrix = Mat4::identity; mouse_view_matrix.pre_translate(0, 0, -cam_dist); if(!have_headtracking) { - mouse_view_matrix.pre_rotate_x(deg_to_rad(cam_phi)); + mouse_view_matrix.pre_rotate_x(deg_to_rad(avatar.head_alt)); } - mouse_view_matrix.pre_rotate_y(deg_to_rad(cam_theta)); - mouse_view_matrix.pre_translate(-cam_pos.x, -cam_pos.y, -cam_pos.z); -} + 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); -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); + // update hand-tracking + if(have_handtracking) { + update_vrhands(&avatar); + } } void app_display() @@ -308,13 +354,20 @@ void app_display() float dt = (float)(time_msec - prev_msec) / 1000.0f; prev_msec = time_msec; - update(dt); + if(debug_gui) { + ImGui::GetIOPtr()->DeltaTime = dt; + ImGui::NewFrame(); + + ImGui::ShowTestWindow(); + } if(opt.vr) { // VR mode goatvr_draw_start(); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + update(dt); + for(int i=0; i<2; i++) { // for each eye goatvr_draw_eye(i); @@ -328,6 +381,13 @@ void app_display() glLoadMatrixf(view_matrix[0]); draw_scene(); + if(have_handtracking) { + draw_vrhands(); + } + + if(debug_gui) { + ImGui::Render(); + } } goatvr_draw_done(); @@ -338,6 +398,8 @@ void app_display() } else { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + update(dt); + proj_matrix.perspective(deg_to_rad(50.0), win_aspect, NEAR_CLIP, FAR_CLIP); glMatrixMode(GL_PROJECTION); glLoadMatrixf(proj_matrix[0]); @@ -352,6 +414,10 @@ void app_display() slow_post(sdr_post_gamma); glUseProgram(0); } + + if(debug_gui) { + ImGui::Render(); + } app_swap_buffers(); } assert(glGetError() == GL_NO_ERROR); @@ -362,22 +428,45 @@ 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(); + + /* + if(have_handtracking) { + Mat4 head_xform = inverse(mouse_view_matrix);//goatvr_head_matrix(); + Mat4 head_dir_xform = head_xform.upper3x3(); - if(show_blobs) { - blobs->draw(); + glUseProgram(0); + glPushAttrib(GL_ENABLE_BIT); + glDisable(GL_LIGHTING); + glBegin(GL_LINES); + for(int i=0; i<2; i++) { + if(hand[i].valid) { + glColor3f(i, 1 - i, i); + } else { + glColor3f(0.5, 0.5, 0.5); + } + Vec3 v = head_xform * hand[i].pos; + Vec3 dir = head_dir_xform * rotate(Vec3(0, 0, -1), hand[i].rot) * 20.0f; + Vec3 up = head_dir_xform * rotate(Vec3(0, 1, 0), hand[i].rot) * 10.0f; + Vec3 right = head_dir_xform * rotate(Vec3(1, 0, 0), hand[i].rot) * 10.0f; + + glVertex3f(v.x, v.y, v.z); + glVertex3f(v.x + dir.x, v.y + dir.y, v.z + dir.z); + glVertex3f(v.x - right.x, v.y - right.y, v.z - right.z); + glVertex3f(v.x + right.x, v.y + right.y, v.z + right.z); + glVertex3f(v.x - up.x, v.y - up.y, v.z - up.z); + glVertex3f(v.x + up.x, v.y + up.y, v.z + up.z); + } + glEnd(); + glPopAttrib(); } + */ if(show_walk_mesh && mscn->walk_mesh) { glPushAttrib(GL_ENABLE_BIT); glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE); - glDisable(GL_LIGHTING); glEnable(GL_POLYGON_OFFSET_FILL); glUseProgram(0); @@ -402,12 +491,18 @@ void app_reshape(int x, int y) { glViewport(0, 0, x, y); goatvr_set_fb_size(x, y, 1.0f); + debug_gui_reshape(x, y); } void app_keyboard(int key, bool pressed) { unsigned int mod = app_get_modifiers(); + if(debug_gui && !(pressed && (key == '`' || key == 27))) { + debug_gui_key(key, pressed, mod); + return; // ignore all keystrokes when GUI is visible + } + if(pressed) { switch(key) { case 27: @@ -422,6 +517,11 @@ void app_keyboard(int key, bool pressed) break; case '`': + debug_gui = !debug_gui; + show_message("debug gui %s", debug_gui ? "enabled" : "disabled"); + break; + + case 'm': app_toggle_grab_mouse(); show_message("mouse %s", app_is_mouse_grabbed() ? "grabbed" : "released"); break; @@ -480,6 +580,10 @@ void app_keyboard(int key, bool pressed) goatvr_recenter(); show_message("VR recenter\n"); break; + + case 'x': + exman->load(mscn, "data/exhibits"); + break; } } @@ -490,19 +594,35 @@ void app_keyboard(int key, bool pressed) void app_mouse_button(int bn, bool pressed, int x, int y) { + if(debug_gui) { + debug_gui_mbutton(bn, pressed, x, y); + return; // ignore mouse events while GUI is visible + } + prev_mx = x; prev_my = 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); + ex_sel = exman->select(ray); + } + } + } } static inline void mouse_look(float dx, float dy) { float scrsz = (float)win_height; - cam_theta += dx * 512.0 / scrsz; - cam_phi += dy * 512.0 / scrsz; + avatar.body_rot += dx * 512.0 / scrsz; + avatar.head_alt += dy * 512.0 / scrsz; - if(cam_phi < -90) cam_phi = -90; - if(cam_phi > 90) cam_phi = 90; + if(avatar.head_alt < -90) avatar.head_alt = -90; + if(avatar.head_alt > 90) avatar.head_alt = 90; } static void mouse_zoom(float dx, float dy) @@ -513,6 +633,11 @@ static void mouse_zoom(float dx, float dy) void app_mouse_motion(int x, int y) { + if(debug_gui) { + debug_gui_mmotion(x, y); + return; // ignore mouse events while GUI is visible + } + int dx = x - prev_mx; int dy = y - prev_my; prev_mx = x; @@ -520,11 +645,15 @@ void app_mouse_motion(int x, int y) if(!dx && !dy) return; - if(bnstate[0]) { - mouse_look(dx, dy); + if(ex_sel.ex) { + Vec3 pos = ex_sel.ex->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); } + if(bnstate[2]) { - mouse_zoom(dx, dy); + mouse_look(dx, dy); } } @@ -537,6 +666,13 @@ void app_mouse_delta(int dx, int dy) } } +void app_mouse_wheel(int dir) +{ + if(debug_gui) { + debug_gui_wheel(dir); + } +} + void app_gamepad_axis(int axis, float val) { switch(axis) { @@ -600,7 +736,7 @@ static void toggle_flight() static void calc_framerate() { - static int ncalc; + //static int ncalc; static int nframes; static long prev_upd; @@ -618,3 +754,12 @@ static void calc_framerate() ++nframes; } } + +static Ray calc_pick_ray(int x, int y) +{ + 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; +}