From bd73c950acc43928cf1673ece7abb2530ce3e211 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 26 Sep 2014 15:44:10 -0700
Subject: [PATCH] cleanup for eyePosition ifdef HAVE_LIBOVR

---
 interface/src/devices/OculusManager.cpp |  6 +++---
 interface/src/devices/OculusManager.h   | 10 ++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index 5f5a5650c9..27590d9a72 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -55,11 +55,11 @@ bool OculusManager::_programInitialized = false;
 Camera* OculusManager::_camera = NULL;
 int OculusManager::_activeEyeIndex = -1;
 
-glm::vec3 OculusManager::_leftEyePosition;
-glm::vec3 OculusManager::_rightEyePosition;
-
 #endif
 
+glm::vec3 OculusManager::_leftEyePosition = glm::vec3();
+glm::vec3 OculusManager::_rightEyePosition = glm::vec3();
+
 void OculusManager::connect() {
 #ifdef HAVE_LIBOVR
     ovr_Initialize();
diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h
index 09880243e9..604580a24e 100644
--- a/interface/src/devices/OculusManager.h
+++ b/interface/src/devices/OculusManager.h
@@ -46,14 +46,8 @@ public:
     static void overrideOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal,
         float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane);
     
-#ifdef HAVE_LIBOVR
     static glm::vec3 getLeftEyePosition() { return _leftEyePosition; }
     static glm::vec3 getRightEyePosition() { return _rightEyePosition; }
-#else
-    static glm::vec3 getLeftEyePosition() { return glm::vec3(); }
-    static glm::vec3 getRightEyePosition() { return glm::vec3(); }
-#endif
-
     
 private:
 #ifdef HAVE_LIBOVR
@@ -105,10 +99,10 @@ private:
     static bool _programInitialized;
     static Camera* _camera;
     static int _activeEyeIndex;
+#endif
+    
     static glm::vec3 _leftEyePosition;
     static glm::vec3 _rightEyePosition;
-
-#endif
     
 
 };