fixed mirror rendering for goatvr backends which don't use an fbo

[laserbrain_demo] / src / app.cc

diff --git a/src/app.cc b/src/app.cc
index 63e7cd7..96e92f3 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -33,6 +33,7 @@ static Ray calc_pick_ray(int x, int y);
 
 long time_msec;
 int win_width, win_height;
+int vp_width, vp_height;
 float win_aspect;
 bool fb_srgb;
 bool opt_gear_wireframe;
@@ -40,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;
@@ -84,6 +85,8 @@ static Renderer *rend;
 
 static Ray last_pick_ray;
 
+static bool post_scene_init_pending = true;
+
 
 bool app_init(int argc, char **argv)
 {
@@ -164,34 +167,27 @@ 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;
-       }
-       */
+       // exhibits are loaded in post_scene_init, because they need access to the scene graph
+
        if(!exui_init()) {
                error_log("failed to initialize exhibit ui system\n");
                return false;
        }
        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");
        }
 
        rend = new Renderer;
+       if(!rend->init()) {
+               return false;
+       }
+       if(opt.reflect) {
+               rend->ropt |= RENDER_MIRRORS;
+       } else {
+               rend->ropt &= ~RENDER_MIRRORS;
+       }
        rend->set_scene(mscn);
 
        glUseProgram(0);
@@ -206,6 +202,17 @@ bool app_init(int argc, char **argv)
        return true;
 }
 
+// post_scene_init is called after the scene has completed loading
+static void post_scene_init()
+{
+       mscn->update(0);        // update once to calculate node matrices
+
+       int num_mir = mscn->calc_mirror_planes();
+       info_log("found %d mirror planes\n", num_mir);
+
+       exman->load(mscn, "data/exhibits");
+}
+
 void app_cleanup()
 {
        if(mscn->music) {
@@ -257,6 +264,11 @@ static void update(float dt)
        texman.update();
        sceneman.update();
 
+       if(post_scene_init_pending && !sceneman.pending()) {
+               post_scene_init_pending = false;
+               post_scene_init();
+       }
+
        mscn->update(dt);
        exman->update(dt);
        exui_update(dt);
@@ -399,7 +411,7 @@ void app_display()
                ImGui::GetIOPtr()->DeltaTime = dt;
                ImGui::NewFrame();
 
-               ImGui::ShowTestWindow();
+               //ImGui::ShowTestWindow();
        }
 
        glClearColor(1, 1, 1, 1);
@@ -414,6 +426,12 @@ void app_display()
                for(int i=0; i<2; i++) {
                        // for each eye
                        goatvr_draw_eye(i);
+                       if(goatvr_get_fb_texture()) {
+                               vp_width = goatvr_get_fb_eye_width(i);
+                               vp_height = goatvr_get_fb_eye_height(i);
+                       } else {
+                               vp_width = win_width / 2;
+                       }
 
                        proj_matrix = goatvr_projection_matrix(i, NEAR_CLIP, FAR_CLIP);
                        glMatrixMode(GL_PROJECTION);
@@ -434,6 +452,9 @@ void app_display()
                }
                goatvr_draw_done();
 
+               vp_width = win_width;
+               vp_height = win_height;
+
                if(should_swap) {
                        app_swap_buffers();
                }
@@ -540,6 +561,9 @@ 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);
+
+       vp_width = x;
+       vp_height = y;
 }
 
 void app_keyboard(int key, bool pressed)
@@ -629,10 +653,6 @@ void app_keyboard(int key, bool pressed)
                        show_message("VR recenter\n");
                        break;
 
-               case 'x':
-                       exman->load(mscn, "data/exhibits");
-                       break;
-
                case KEY_UP:
                        exui_scroll(-1);
                        break;
@@ -648,6 +668,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;
                }
        }