Make sure we can still compile if we don't have the Linux Oculus dependencies.

This commit is contained in:
Andrzej Kapolka 2013-12-02 12:24:42 -08:00
parent 635eb7c52d
commit b4466e3e34
2 changed files with 9 additions and 4 deletions

View file

@ -14,9 +14,6 @@
#include "InterfaceConfig.h"
#include "OculusManager.h"
using namespace OVR;
using namespace OVR::Util::Render;
ProgramObject OculusManager::_program;
int OculusManager::_textureLocation;
int OculusManager::_lensCenterLocation;
@ -28,6 +25,9 @@ bool OculusManager::_isConnected = false;
float OculusManager::_yawOffset = 0;
#ifdef HAVE_LIBOVR
using namespace OVR;
using namespace OVR::Util::Render;
Ptr<DeviceManager> OculusManager::_deviceManager;
Ptr<HMDDevice> OculusManager::_hmdDevice;
Ptr<SensorDevice> OculusManager::_sensorDevice;

View file

@ -11,7 +11,9 @@
#include <iostream>
#ifdef HAVE_LIBOVR
#include <OVR.h>
#endif
#include "renderer/ProgramObject.h"
@ -43,12 +45,15 @@ private:
static int _scaleInLocation;
static int _hmdWarpParamLocation;
static bool _isConnected;
static float _yawOffset;
#ifdef HAVE_LIBOVR
static OVR::Ptr<OVR::DeviceManager> _deviceManager;
static OVR::Ptr<OVR::HMDDevice> _hmdDevice;
static OVR::Ptr<OVR::SensorDevice> _sensorDevice;
static OVR::SensorFusion* _sensorFusion;
static OVR::Util::Render::StereoConfig _stereoConfig;
static float _yawOffset;
#endif
};
#endif /* defined(__hifi__OculusManager__) */