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

Fixing input API, DLL path for Oculus

Browse source
This commit is contained in:
Brad Davis 2016-03-28 14:45:09 -07:00
parent 78626f7938
commit 80d397555d
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/oculus/src/OculusControllerManager.cpp
View file

@ -35,7 +35,7 @@ bool OculusControllerManager::isSupported() const {
return oculusAvailable();
}
void OculusControllerManager::activate() {
bool OculusControllerManager::activate() {
InputPlugin::activate();
if (!_session) {
_session = acquireOculusSession();
@ -50,6 +50,7 @@ void OculusControllerManager::activate() {
if (_touch) {
userInputMapper->registerDevice(_touch);
}
return true;
}
void OculusControllerManager::deactivate() {

2
plugins/oculus/src/OculusControllerManager.h
View file

@ -27,7 +27,7 @@ public:
bool isJointController() const override { return true; }
const QString& getName() const override { return NAME; }
void activate() override;
bool activate() override;
void deactivate() override;
void pluginFocusOutEvent() override;

4
plugins/oculus/src/OculusHelpers.cpp
View file

@ -12,6 +12,7 @@
#include <QtCore/QLoggingCategory>
#include <QtCore/QFile>
#include <QtCore/QDir>
using Mutex = std::mutex;
using Lock = std::unique_lock<Mutex>;
@ -40,7 +41,8 @@ void logFatal(const char* what) {
qFatal(error.c_str());
}
static const QString GOOD_OCULUS_RUNTIME_FILE { "C:\\Program Files(x86)\\Oculus\\Support\\oculus - runtime\\LibOVRRT64_1.dll" };
static const QString OCULUS_RUNTIME_PATH { "C:\\Program Files (x86)\\Oculus\\Support\\oculus-runtime" };
static const QString GOOD_OCULUS_RUNTIME_FILE { OCULUS_RUNTIME_PATH + "\\LibOVRRT64_1.dll" };
bool oculusAvailable() {
ovrDetectResult detect = ovr_Detect(0);