added VR recenter

[laserbrain_demo] / src / app.cc

diff --git a/src/app.cc b/src/app.cc
index d126635..d2f9476 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -104,7 +104,7 @@ bool app_init(int argc, char **argv)
        float ambient[] = {0.0, 0.0, 0.0, 0.0};
        glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient);
 
-       glClearColor(0.2, 0.2, 0.2, 1.0);
+       glClearColor(1, 1, 1, 1);
 
        mscn = new MetaScene;
        if(!mscn->load(opt.scenefile ? opt.scenefile : "data/museum.scene")) {
@@ -119,19 +119,21 @@ bool app_init(int argc, char **argv)
        blobs = new BlobExhibit;
        blobs->node = new SceneNode;
        blobs->init();
-       blobs->node->set_position(Vec3(-680, 150, -100));
-       blobs->node->set_scaling(Vec3(20, 20, 20));
+       blobs->node->set_position(Vec3(-680, 160, -100));
+       blobs->node->set_scaling(Vec3(28, 28, 28));
        blobs->node->update(0);
 
        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", 0);
-       set_uniform_int(sdr_ltmap, "lightmap", 1);
+       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");
@@ -459,6 +461,11 @@ void app_keyboard(int key, bool pressed)
                        show_blobs = !show_blobs;
                        show_message("blobs: %s\n", show_blobs ? "on" : "off");
                        break;
+
+               case ' ':
+                       goatvr_recenter();
+                       show_message("VR recenter\n");
+                       break;
                }
        }
 
@@ -550,6 +557,11 @@ void app_gamepad_button(int bn, bool pressed)
                        show_message("blobs: %s\n", show_blobs ? "on" : "off");
                        break;
 
+               case GPAD_START:
+                       goatvr_recenter();
+                       show_message("VR recenter\n");
+                       break;
+
                default:
                        break;
                }