Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 18:15:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5696 from birarda/sixense-fix

Browse source 
fix for sixense compile when not present
This commit is contained in:
Andrew Meadows 2015-09-01 19:56:03 -07:00
commit dd2f94bc88
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
View file

@ -34,6 +34,8 @@ Q_LOGGING_CATEGORY(inputplugins, "hifi.inputplugins")
const unsigned int LEFT_MASK = 0; const unsigned int LEFT_MASK = 0;
const unsigned int RIGHT_MASK = 1U << 1; const unsigned int RIGHT_MASK = 1U << 1;
#ifdef HAVE_SIXENSE
const int CALIBRATION_STATE_IDLE = 0; const int CALIBRATION_STATE_IDLE = 0;
const int CALIBRATION_STATE_X = 1; const int CALIBRATION_STATE_X = 1;
const int CALIBRATION_STATE_Y = 2; const int CALIBRATION_STATE_Y = 2;
@ -47,11 +49,15 @@ const float NECK_Z = 0.3f; // meters
const float CONTROLLER_THRESHOLD = 0.35f; const float CONTROLLER_THRESHOLD = 0.35f;
#endif
#ifdef __APPLE__ #ifdef __APPLE__
typedef int (*SixenseBaseFunction)(); typedef int (*SixenseBaseFunction)();
typedef int (*SixenseTakeIntFunction)(int); typedef int (*SixenseTakeIntFunction)(int);
#ifdef HAVE_SIXENSE
typedef int (*SixenseTakeIntAndSixenseControllerData)(int, sixenseControllerData*); typedef int (*SixenseTakeIntAndSixenseControllerData)(int, sixenseControllerData*);
#endif #endif
#endif
const QString SixenseManager::NAME = "Sixense"; const QString SixenseManager::NAME = "Sixense";