X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fapp.cc;h=a1936b20e8e5f96502d47422f21bbd3c67df7377;hb=e8fe498f52ff5f3c87759623ce94726af0ef2890;hp=096bf4e3cd0e87478776bbed2c4717bf6e564840;hpb=3aacec4aee795e703e8eb9d6852ca47a3be065ee;p=laserbrain_demo diff --git a/src/app.cc b/src/app.cc index 096bf4e..a1936b2 100644 --- a/src/app.cc +++ b/src/app.cc @@ -18,6 +18,7 @@ #define FAR_CLIP 10000.0 static void draw_scene(); +static void toggle_flight(); long time_msec; int win_width, win_height; @@ -25,6 +26,8 @@ float win_aspect; bool fb_srgb; bool opt_gear_wireframe; +unsigned int sdr_ltmap, sdr_ltmap_notex; + static float cam_dist = 0.0; static float cam_theta, cam_phi = 20; static Vec3 cam_pos; @@ -32,6 +35,7 @@ static float floor_y; // last floor height static float user_eye_height = 165; 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; @@ -39,11 +43,14 @@ static bool have_headtracking, should_swap; static int prev_mx, prev_my; static bool bnstate[8]; static bool keystate[256]; +static bool gpad_bnstate[64]; +static Vec2 joy_move, joy_look; +static float joy_deadzone = 0.01; static Mat4 view_matrix, mouse_view_matrix, proj_matrix; static TextureSet texman; static Scene *scn; -static unsigned int sdr, sdr_post_gamma; +static unsigned int sdr_post_gamma; static long prev_msec; @@ -91,7 +98,7 @@ bool app_init(int argc, char **argv) glClearColor(0.2, 0.2, 0.2, 1.0); scn = new Scene(&texman); - if(!load_scene(scn, "data/museum.scene")) { + if(!load_scene(scn, opt.scenefile ? opt.scenefile : "data/museum.scene")) { return false; } @@ -105,12 +112,15 @@ bool app_init(int argc, char **argv) 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"); + if(!(sdr_ltmap_notex = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-notex.p.glsl"))) { + return false; + } + + if(!(sdr_ltmap = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-tex.p.glsl"))) { return false; } - set_uniform_int(sdr, "texmap", 0); - set_uniform_int(sdr, "lightmap", 1); + set_uniform_int(sdr_ltmap, "texmap", 0); + set_uniform_int(sdr_ltmap, "lightmap", 1); if(!fb_srgb) { sdr_post_gamma = create_program_load("sdr/post_gamma.v.glsl", "sdr/post_gamma.p.glsl"); @@ -160,6 +170,31 @@ static void update(float dt) float speed = walk_speed * dt; Vec3 dir; + // joystick + float jdeadsq = joy_deadzone * joy_deadzone; + float jmove_lensq = length_sq(joy_move); + float jlook_lensq = length_sq(joy_look); + + if(jmove_lensq > jdeadsq) { + float len = sqrt(jmove_lensq); + jmove_lensq -= jdeadsq; + + float mag = len * len; + dir.x += mag * joy_move.x / len * 2.0 * speed; + dir.z += mag * joy_move.y / len * 2.0 * speed; + } + if(jlook_lensq > jdeadsq) { + float len = sqrt(jlook_lensq); + 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; + } + + // keyboard move if(keystate[(int)'w']) { dir.z -= speed; } @@ -172,10 +207,10 @@ static void update(float dt) if(keystate[(int)'a']) { dir.x -= speed; } - if(keystate[(int)'q']) { + if(keystate[(int)'q'] || gpad_bnstate[GPAD_UP]) { cam_pos.y += speed; } - if(keystate[(int)'z']) { + if(keystate[(int)'z'] || gpad_bnstate[GPAD_DOWN]) { cam_pos.y -= speed; } @@ -294,9 +329,7 @@ static void draw_scene() 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); - glUseProgram(sdr); scn->draw(); - glUseProgram(0); if(show_walk_mesh && scn->walk_mesh) { glPushAttrib(GL_ENABLE_BIT); @@ -305,6 +338,8 @@ static void draw_scene() glDisable(GL_LIGHTING); glEnable(GL_POLYGON_OFFSET_FILL); + glUseProgram(0); + glPolygonOffset(-1, 1); glDepthMask(0); @@ -336,8 +371,11 @@ void app_keyboard(int key, bool pressed) app_quit(); break; - case 'f': - app_toggle_fullscreen(); + case '\n': + case '\r': + if(mod & MOD_ALT) { + app_toggle_fullscreen(); + } break; case '`': @@ -359,6 +397,10 @@ void app_keyboard(int key, bool pressed) } break; + case 'f': + toggle_flight(); + break; + case 'p': if(mod & MOD_CTRL) { fb_srgb = !fb_srgb; @@ -375,6 +417,16 @@ void app_keyboard(int key, bool pressed) walk_speed *= 0.75; show_message("walk speed: %g", walk_speed); break; + + case ']': + mouse_speed *= 1.2; + show_message("mouse speed: %g", mouse_speed); + break; + + case '[': + mouse_speed *= 0.8; + show_message("mouse speed: %g", mouse_speed); + break; } } @@ -390,7 +442,7 @@ void app_mouse_button(int bn, bool pressed, int x, int y) bnstate[bn] = pressed; } -static inline void mouse_look(int dx, int dy) +static inline void mouse_look(float dx, float dy) { float scrsz = (float)win_height; cam_theta += dx * 512.0 / scrsz; @@ -400,7 +452,7 @@ static inline void mouse_look(int dx, int dy) if(cam_phi > 90) cam_phi = 90; } -static void mouse_zoom(int dx, int dy) +static void mouse_zoom(float dx, float dy) { cam_dist += dy * 0.1; if(cam_dist < 0.0) cam_dist = 0.0; @@ -426,8 +478,59 @@ void app_mouse_motion(int x, int y) void app_mouse_delta(int dx, int dy) { if(bnstate[2]) { - mouse_zoom(dx, dy); + mouse_zoom(dx * mouse_speed, dy * mouse_speed); } else { - mouse_look(dx, dy); + mouse_look(dx * mouse_speed, dy * mouse_speed); + } +} + +void app_gamepad_axis(int axis, float val) +{ + switch(axis) { + case 0: + joy_move.x = val; + break; + case 1: + joy_move.y = val; + break; + + case 2: + joy_look.x = val; + break; + case 3: + joy_look.y = val; + break; + } +} + +void app_gamepad_button(int bn, bool pressed) +{ + gpad_bnstate[bn] = pressed; + + if(pressed) { + switch(bn) { + case GPAD_LSTICK: + toggle_flight(); + break; + + default: + break; + } + } +} + +static void toggle_flight() +{ + static float prev_walk_speed = -1.0; + if(prev_walk_speed < 0.0) { + noclip = true; + prev_walk_speed = walk_speed; + walk_speed = 1000.0; + show_message("fly mode\n"); + } else { + noclip = false; + walk_speed = prev_walk_speed; + prev_walk_speed = -1.0; + show_message("walk mode\n"); } }