better option/cfgfile parsing

[vrfileman] / src / app.cc

diff --git a/src/app.cc b/src/app.cc
index f99e034..e9e4cbb 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -5,24 +5,29 @@
 #include "gmath/gmath.h"
 #include "mesh.h"
 #include "meshgen.h"
-#include "sdr.h"
-#include "texture.h"
+#include "backdrop.h"
+#include "goatvr.h"
+#include "opt.h"
 
 int win_width, win_height;
 float win_aspect;
 long time_msec;
+Mat4 view_matrix;
+
+static bool should_swap;
 
 static float cam_theta, cam_phi;
+static float cam_height = 1.65;
 static Mesh *mesh_torus;
-static Texture *tex_grid;
 
 static bool bnstate[16];
 static int prev_x, prev_y;
 
-static unsigned int sdr_grid;
-
 bool app_init(int argc, char **argv)
 {
+       if(!init_options(argc, argv, 0)) {
+               return false;
+       }
        if(init_opengl() == -1) {
                return false;
        }
@@ -33,21 +38,35 @@ bool app_init(int argc, char **argv)
        glGetIntegerv(GL_SAMPLES, &aasamples);
        printf("got %d samples per pixel\n", aasamples);
 
+       printf("Max anisotropy: %d\n", glcaps.max_aniso);
+
        glEnable(GL_CULL_FACE);
        glEnable(GL_DEPTH_TEST);
        //glEnable(GL_LIGHTING);
        glEnable(GL_LIGHT0);
 
+       if(GLEW_ARB_framebuffer_sRGB) {
+               printf("enabling sRGB framebuffer\n");
+               glEnable(GL_FRAMEBUFFER_SRGB);
+       }
+
+       if(opt.vr) {
+               if(goatvr_init() == -1) {
+                       return false;
+               }
+               goatvr_set_origin_mode(GOATVR_HEAD);
+
+               goatvr_startvr();
+               should_swap = goatvr_should_swap() != 0;
+               cam_height = goatvr_get_eye_height();
+       }
+
        Mesh::use_custom_sdr_attr = false;
 
        mesh_torus = new Mesh;
        gen_torus(mesh_torus, 1.0, 0.25, 32, 32);
 
-       if(!(sdr_grid = create_program_load("sdr/grid.v.glsl", "sdr/grid.p.glsl"))) {
-               return false;
-       }
-       if(!(tex_grid = load_texture("data/purple_grid.png"))) {
-               delete tex_grid;
+       if(!init_backdrop()) {
                return false;
        }
 
@@ -56,43 +75,59 @@ bool app_init(int argc, char **argv)
 
 void app_cleanup()
 {
+       if(opt.vr) {
+               goatvr_shutdown();
+       }
+       delete mesh_torus;
+       cleanup_backdrop();
 }
 
 void app_draw()
 {
-       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+       if(opt.vr) {
+               // VR mode
+               goatvr_draw_start();
+               glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+               for(int i=0; i<2; i++) {
+                       goatvr_draw_eye(i);
 
-       Mat4 view_mat;
-       view_mat.pre_rotate_x(deg_to_rad(cam_phi));
-       view_mat.pre_rotate_y(deg_to_rad(cam_theta));
-       view_mat.pre_translate(0, -1.65, 0);
-       glMatrixMode(GL_MODELVIEW);
-       glLoadMatrixf(view_mat[0]);
+                       glMatrixMode(GL_PROJECTION);
+                       glLoadMatrixf(goatvr_projection_matrix(i, 0.5, 1000.0));
 
-       //mesh_torus->draw();
+                       view_matrix = goatvr_view_matrix(i);
+                       view_matrix.pre_rotate_x(deg_to_rad(cam_phi));
+                       view_matrix.pre_rotate_y(deg_to_rad(cam_theta));
+                       view_matrix.pre_translate(0, -cam_height, 0);
+
+                       glMatrixMode(GL_MODELVIEW);
+                       glLoadMatrixf(view_matrix[0]);
+
+                       draw_backdrop();
+               }
+               goatvr_draw_done();
 
-       Mat4 xform;
-       xform.scaling(500.0);
-       glPushMatrix();
-       glMultMatrixf(xform[0]);
+               if(should_swap) {
+                       app_swap_buffers();
+               }
+               app_redraw();   // in VR mode, force continuous redraw
 
-       bind_program(sdr_grid);
-       bind_texture(tex_grid);
+       } else {
+               // regular monoscopic mode
+               glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-       glBegin(GL_QUADS);
-       glNormal3f(0, 1, 0);
-       glVertex3f(-1, 0, 1);
-       glVertex3f(1, 0, 1);
-       glVertex3f(1, 0, -1);
-       glVertex3f(-1, 0, -1);
-       glEnd();
+               view_matrix = Mat4::identity;
+               view_matrix.pre_rotate_x(deg_to_rad(cam_phi));
+               view_matrix.pre_rotate_y(deg_to_rad(cam_theta));
+               view_matrix.pre_translate(0, -cam_height, 0);
 
-       bind_texture(0);
-       bind_program(0);
+               glMatrixMode(GL_MODELVIEW);
+               glLoadMatrixf(view_matrix[0]);
 
-       glPopMatrix();
+               draw_backdrop();
 
-       app_swap_buffers();
+               app_swap_buffers();
+       }
        assert(glGetError() == GL_NO_ERROR);
 }
 
@@ -114,6 +149,12 @@ void app_keyboard(int key, bool pressed)
                case 27:
                        app_quit();
                        break;
+
+               case ' ':
+                       if(opt.vr) {
+                               goatvr_recenter();
+                       }
+                       break;
                }
        }
 }
@@ -136,10 +177,13 @@ void app_mouse_motion(int x, int y)
 
        if(bnstate[0]) {
                cam_theta += dx * 0.5;
-               cam_phi += dy * 0.5;
 
-               if(cam_phi < -90) cam_phi = -90;
-               if(cam_phi > 90) cam_phi = 90;
+               if(!opt.vr || !goatvr_have_headtracking()) {
+                       cam_phi += dy * 0.5;
+
+                       if(cam_phi < -90) cam_phi = -90;
+                       if(cam_phi > 90) cam_phi = 90;
+               }
        }
        app_redraw();
 }