X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=fcf5fe0d0774080e1af0a43289f5b081fd9b4cb3;hp=30222f9ce50d57444519b7aef8e6d427dc4df427;hb=9480e20f4de41693ebd1f22e63d3bcecde878f70;hpb=82367657a8ac442b29c1dad51c91e64a48e0671d diff --git a/src/app.cc b/src/app.cc index 30222f9..fcf5fe0 100644 --- a/src/app.cc +++ b/src/app.cc @@ -41,10 +41,10 @@ bool opt_gear_wireframe; TextureSet texman; SceneSet sceneman; -unsigned int sdr_ltmap, sdr_ltmap_notex; - int fpexcept_enabled; +unsigned int dbg_key_pending; + static Avatar avatar; static float cam_dist = 0.0; @@ -175,18 +175,6 @@ bool app_init(int argc, char **argv) } exui_setnode(&exslot_left.node); - if(!(sdr_ltmap_notex = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-notex.p.glsl"))) { - return false; - } - set_uniform_int(sdr_ltmap_notex, "texmap", MTL_TEX_DIFFUSE); - set_uniform_int(sdr_ltmap_notex, "lightmap", MTL_TEX_LIGHTMAP); - - if(!(sdr_ltmap = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-tex.p.glsl"))) { - return false; - } - set_uniform_int(sdr_ltmap, "texmap", MTL_TEX_DIFFUSE); - set_uniform_int(sdr_ltmap, "lightmap", MTL_TEX_LIGHTMAP); - if(!fb_srgb) { sdr_post_gamma = create_program_load("sdr/post_gamma.v.glsl", "sdr/post_gamma.p.glsl"); } @@ -671,6 +659,13 @@ void app_keyboard(int key, bool pressed) case KEY_RIGHT: exui_change_tab(1); break; + + case KEY_F5: + case KEY_F6: + case KEY_F7: + case KEY_F8: + dbg_key_pending |= 1 << (key - KEY_F5); + break; } }