Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-30 20:23:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mac library with RTTI enabled, prevent crash on startup when there's no

Browse source 
Oculus.
This commit is contained in:
Andrzej Kapolka 2013-11-25 18:36:23 -08:00
parent 0e0685af04
commit 1aaf6f2620
3 changed files with 9 additions and 7 deletions
interface
external/LibOVR/Lib/MacOS
libovr.a
src/devices
OculusManager.cppOculusManager.h

BIN
interface/external/LibOVR/Lib/MacOS/libovr.a vendored
View file

Binary file not shown.

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

@ -6,9 +6,10 @@
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include "OculusManager.h"
#include <glm/glm.hpp>
#include "OculusManager.h"
using namespace OVR;
bool OculusManager::_isConnected = false;
@ -17,7 +18,7 @@ bool OculusManager::_isConnected = false;
Ptr<DeviceManager> OculusManager::_deviceManager;
Ptr<HMDDevice> OculusManager::_hmdDevice;
Ptr<SensorDevice> OculusManager::_sensorDevice;
SensorFusion OculusManager::_sensorFusion;
SensorFusion* OculusManager::_sensorFusion;
float OculusManager::_yawOffset = 0;
#endif
@ -31,28 +32,29 @@ void OculusManager::connect() {
_isConnected = true;
_sensorDevice = *_hmdDevice->GetSensor();
_sensorFusion.AttachToSensor(_sensorDevice);
_sensorFusion = new SensorFusion;
_sensorFusion->AttachToSensor(_sensorDevice);
}
#endif
}
void OculusManager::reset() {
#ifdef HAVE_LIBOVR
_sensorFusion.Reset();
_sensorFusion->Reset();
#endif
}
void OculusManager::updateYawOffset() {
#ifdef HAVE_LIBOVR
float yaw, pitch, roll;
_sensorFusion.GetOrientation().GetEulerAngles<Axis_Y, Axis_X, Axis_Z, Rotate_CCW, Handed_R>(&yaw, &pitch, &roll);
_sensorFusion->GetOrientation().GetEulerAngles<Axis_Y, Axis_X, Axis_Z, Rotate_CCW, Handed_R>(&yaw, &pitch, &roll);
_yawOffset = yaw;
#endif
}
void OculusManager::getEulerAngles(float& yaw, float& pitch, float& roll) {
#ifdef HAVE_LIBOVR
_sensorFusion.GetOrientation().GetEulerAngles<Axis_Y, Axis_X, Axis_Z, Rotate_CCW, Handed_R>(&yaw, &pitch, &roll);
_sensorFusion->GetOrientation().GetEulerAngles<Axis_Y, Axis_X, Axis_Z, Rotate_CCW, Handed_R>(&yaw, &pitch, &roll);
// convert each angle to degrees
// remove the yaw offset from the returned yaw

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

@ -28,7 +28,7 @@ private:
static OVR::Ptr<OVR::DeviceManager> _deviceManager;
static OVR::Ptr<OVR::HMDDevice> _hmdDevice;
static OVR::Ptr<OVR::SensorDevice> _sensorDevice;
static OVR::SensorFusion _sensorFusion;
static OVR::SensorFusion* _sensorFusion;
static float _yawOffset;
};