Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:25:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup for eyePosition ifdef HAVE_LIBOVR

Browse source
This commit is contained in:
Stephen Birarda 2014-09-26 15:44:10 -07:00
parent 7c738edbd8
commit bd73c950ac
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/devices/OculusManager.cpp
View file

@ -55,11 +55,11 @@ bool OculusManager::_programInitialized = false;
Camera* OculusManager::_camera = NULL; Camera* OculusManager::_camera = NULL;
int OculusManager::_activeEyeIndex = -1; int OculusManager::_activeEyeIndex = -1;
glm::vec3 OculusManager::_leftEyePosition;
glm::vec3 OculusManager::_rightEyePosition;
#endif #endif
glm::vec3 OculusManager::_leftEyePosition = glm::vec3();
glm::vec3 OculusManager::_rightEyePosition = glm::vec3();
void OculusManager::connect() { void OculusManager::connect() {
#ifdef HAVE_LIBOVR #ifdef HAVE_LIBOVR
ovr_Initialize(); ovr_Initialize();

10
interface/src/devices/OculusManager.h
View file

@ -46,14 +46,8 @@ public:
static void overrideOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, static void overrideOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal,
float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane); float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane);
#ifdef HAVE_LIBOVR
static glm::vec3 getLeftEyePosition() { return _leftEyePosition; } static glm::vec3 getLeftEyePosition() { return _leftEyePosition; }
static glm::vec3 getRightEyePosition() { return _rightEyePosition; } static glm::vec3 getRightEyePosition() { return _rightEyePosition; }
#else
static glm::vec3 getLeftEyePosition() { return glm::vec3(); }
static glm::vec3 getRightEyePosition() { return glm::vec3(); }
#endif
private: private:
#ifdef HAVE_LIBOVR #ifdef HAVE_LIBOVR
@ -105,10 +99,10 @@ private:
static bool _programInitialized; static bool _programInitialized;
static Camera* _camera; static Camera* _camera;
static int _activeEyeIndex; static int _activeEyeIndex;
#endif
static glm::vec3 _leftEyePosition; static glm::vec3 _leftEyePosition;
static glm::vec3 _rightEyePosition; static glm::vec3 _rightEyePosition;
#endif
}; };