X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=1c2768565d726db602b2df1c3faaf758b0d31454;hp=d9d44c0ed9bb82b7f3be6f9abc2ed3ad7772a27f;hb=b75b6703809abf0dc02f2e557ba73e9efbefa4d1;hpb=c790c297ef925b7f2257ad41e2123cf86305822c diff --git a/src/app.cc b/src/app.cc index d9d44c0..1c27685 100644 --- a/src/app.cc +++ b/src/app.cc @@ -141,9 +141,11 @@ bool app_init(int argc, char **argv) avatar.body_rot = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1)))); exman = new ExhibitManager; + /* if(!exman->load(mscn, "data/exhibits")) { //return false; } + */ blobs = new BlobExhibit; blobs->node = new SceneNode; @@ -425,10 +427,7 @@ static void draw_scene() set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3); rend->draw(); - - if(show_blobs) { - blobs->draw(); - } + exman->draw(); /* if(have_handtracking) { @@ -580,6 +579,11 @@ void app_keyboard(int key, bool pressed) goatvr_recenter(); show_message("VR recenter\n"); break; + + case 'x': + exman->clear(); + exman->load(mscn, "data/exhibits"); + break; } }