Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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