build-time config option for VR mode

[vrtris] / src / game.c

diff --git a/src/game.c b/src/game.c
index 05bdc95..eba4a23 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -1,5 +1,7 @@
 #include <assert.h>
+#ifdef BUILD_VR
 #include <goatvr.h>
+#endif
 #include <cgmath/cgmath.h>
 #include "opengl.h"
 #include "game.h"
@@ -12,9 +14,12 @@
 static void calc_framerate(void);
 static void print_framerate(void);
 
+#ifdef BUILD_VR
 static int should_swap;
+#endif
 static unsigned long framerate;
 
+
 int game_init(int argc, char **argv)
 {
        if(init_opengl() == -1) {
@@ -29,6 +34,7 @@ int game_init(int argc, char **argv)
                return -1;
        }
 
+#ifdef BUILD_VR
        if(opt.flags & OPT_VR) {
                if(goatvr_init() == -1) {
                        return -1;
@@ -39,6 +45,7 @@ int game_init(int argc, char **argv)
                goatvr_startvr();
                should_swap = goatvr_should_swap();
        }
+#endif /* BUILD_VR */
 
        glEnable(GL_DEPTH_TEST);
        glEnable(GL_CULL_FACE);
@@ -50,35 +57,30 @@ int game_init(int argc, char **argv)
 
 void game_cleanup()
 {
+#ifdef BUILD_VR
        if(opt.flags & OPT_VR) {
                goatvr_shutdown();
        }
+#endif
        cleanup_screens();
 }
 
 static void update(float dt)
 {
-       int num_vr_sticks;
-
-       if((num_vr_sticks = goatvr_num_sticks()) > 0) {
-               float p[2];
-               goatvr_stick_pos(0, p);
-               /* TODO */
-       }
-
        screen->update(dt);
 }
 
 void game_display(void)
 {
        static long prev_msec;
-       int i;
        float dt = (float)(time_msec - prev_msec) / 1000.0f;
        prev_msec = time_msec;
 
        update(dt);
 
+#ifdef BUILD_VR
        if(opt.flags & OPT_VR) {
+               int i;
                goatvr_draw_start();
                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -105,7 +107,9 @@ void game_display(void)
                        game_swap_buffers();
                }
 
-       } else {
+       } else
+#endif /* BUILD_VR */
+       {
                /* non-VR mode */
                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -132,7 +136,9 @@ void game_display(void)
 void game_reshape(int x, int y)
 {
        glViewport(0, 0, x, y);
+#ifdef BUILD_VR
        goatvr_set_fb_size(x, y, 1.0f);
+#endif
 
        reshape_screens(x, y);
 }
@@ -156,9 +162,11 @@ void game_keyboard(int key, int pressed)
                        break;
 
                case KEY_HOME:
+#ifdef BUILD_VR
                        if(opt.flags & OPT_VR) {
                                goatvr_recenter();
                        }
+#endif
                        break;
 
                default:
@@ -187,10 +195,16 @@ void game_mouse_wheel(int dir)
 
 void game_gamepad_axis(int axis, float val)
 {
+       joy_axis[axis] = val;
 }
 
 void game_gamepad_button(int bn, int pressed)
 {
+       if(pressed) {
+               joy_bnstate |= (1 << bn);
+       } else {
+               joy_bnstate &= ~(1 << bn);
+       }
 }
 
 static void calc_framerate(void)