From 5049312cc8847f5bd8cc9cf32dd42e39ae0bb1f5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 29 Oct 2015 10:34:44 +0100 Subject: support rift 0.2.5, 0.4.2, 0.8.0 Issue: #263 --- CMakeLists.txt | 84 ++++------ ftnoir_tracker_rift/ftnoir_rift.qrc | 7 - ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui | 176 --------------------- ftnoir_tracker_rift/ftnoir_tracker_rift.cpp | 71 --------- ftnoir_tracker_rift/ftnoir_tracker_rift.h | 60 ------- ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp | 26 --- ftnoir_tracker_rift/images/medium.png | Bin 5764 -> 0 bytes ftnoir_tracker_rift/images/rift_medium.png | Bin 5764 -> 0 bytes ftnoir_tracker_rift/images/rift_small.png | Bin 1212 -> 0 bytes ftnoir_tracker_rift/images/rift_tiny.png | Bin 624 -> 0 bytes ftnoir_tracker_rift/images/small.png | Bin 1212 -> 0 bytes ftnoir_tracker_rift/images/tiny.png | Bin 624 -> 0 bytes ftnoir_tracker_rift_025/ftnoir_tracker_rift_025.h | 2 +- ftnoir_tracker_rift_042/ftnoir_rift_042.qrc | 7 + .../ftnoir_rift_clientcontrols_042.ui | 176 +++++++++++++++++++++ .../ftnoir_tracker_rift_042.cpp | 71 +++++++++ ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.h | 60 +++++++ .../ftnoir_tracker_rift_dialog_042.cpp | 26 +++ ftnoir_tracker_rift_042/images/medium.png | Bin 0 -> 5764 bytes ftnoir_tracker_rift_042/images/rift_medium.png | Bin 0 -> 5764 bytes ftnoir_tracker_rift_042/images/rift_small.png | Bin 0 -> 1212 bytes ftnoir_tracker_rift_042/images/rift_tiny.png | Bin 0 -> 624 bytes ftnoir_tracker_rift_042/images/small.png | Bin 0 -> 1212 bytes ftnoir_tracker_rift_042/images/tiny.png | Bin 0 -> 624 bytes ftnoir_tracker_rift_080/ftnoir_rift_080.qrc | 7 + .../ftnoir_rift_clientcontrols_080.ui | 176 +++++++++++++++++++++ .../ftnoir_tracker_rift_080.cpp | 69 ++++++++ ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.h | 60 +++++++ .../ftnoir_tracker_rift_dialog_080.cpp | 26 +++ ftnoir_tracker_rift_080/images/medium.png | Bin 0 -> 5764 bytes ftnoir_tracker_rift_080/images/rift_medium.png | Bin 0 -> 5764 bytes ftnoir_tracker_rift_080/images/rift_small.png | Bin 0 -> 1212 bytes ftnoir_tracker_rift_080/images/rift_tiny.png | Bin 0 -> 624 bytes ftnoir_tracker_rift_080/images/small.png | Bin 0 -> 1212 bytes ftnoir_tracker_rift_080/images/tiny.png | Bin 0 -> 624 bytes 35 files changed, 708 insertions(+), 396 deletions(-) delete mode 100644 ftnoir_tracker_rift/ftnoir_rift.qrc delete mode 100644 ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui delete mode 100644 ftnoir_tracker_rift/ftnoir_tracker_rift.cpp delete mode 100644 ftnoir_tracker_rift/ftnoir_tracker_rift.h delete mode 100644 ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp delete mode 100644 ftnoir_tracker_rift/images/medium.png delete mode 100644 ftnoir_tracker_rift/images/rift_medium.png delete mode 100644 ftnoir_tracker_rift/images/rift_small.png delete mode 100644 ftnoir_tracker_rift/images/rift_tiny.png delete mode 100644 ftnoir_tracker_rift/images/small.png delete mode 100644 ftnoir_tracker_rift/images/tiny.png create mode 100644 ftnoir_tracker_rift_042/ftnoir_rift_042.qrc create mode 100644 ftnoir_tracker_rift_042/ftnoir_rift_clientcontrols_042.ui create mode 100644 ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.cpp create mode 100644 ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.h create mode 100644 ftnoir_tracker_rift_042/ftnoir_tracker_rift_dialog_042.cpp create mode 100644 ftnoir_tracker_rift_042/images/medium.png create mode 100644 ftnoir_tracker_rift_042/images/rift_medium.png create mode 100644 ftnoir_tracker_rift_042/images/rift_small.png create mode 100644 ftnoir_tracker_rift_042/images/rift_tiny.png create mode 100644 ftnoir_tracker_rift_042/images/small.png create mode 100644 ftnoir_tracker_rift_042/images/tiny.png create mode 100644 ftnoir_tracker_rift_080/ftnoir_rift_080.qrc create mode 100644 ftnoir_tracker_rift_080/ftnoir_rift_clientcontrols_080.ui create mode 100644 ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.cpp create mode 100644 ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.h create mode 100644 ftnoir_tracker_rift_080/ftnoir_tracker_rift_dialog_080.cpp create mode 100644 ftnoir_tracker_rift_080/images/medium.png create mode 100644 ftnoir_tracker_rift_080/images/rift_medium.png create mode 100644 ftnoir_tracker_rift_080/images/rift_small.png create mode 100644 ftnoir_tracker_rift_080/images/rift_tiny.png create mode 100644 ftnoir_tracker_rift_080/images/small.png create mode 100644 ftnoir_tracker_rift_080/images/tiny.png diff --git a/CMakeLists.txt b/CMakeLists.txt index e447c4b8..a444bce3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,7 +186,8 @@ endif() SET(SDK_HYDRA "" CACHE PATH "libSixense path for Razer Hydra") SET(SDK_HYDRA_AMD64 FALSE CACHE BOOL "whether libSixense is amd64 (else ia-32)") -SET(SDK_RIFT "" CACHE PATH "libOVR path for Oculus Rift") +SET(SDK_RIFT_080 "" CACHE PATH "libOVR path for Oculus Rift") +SET(SDK_RIFT_042 "" CACHE PATH "libOVR path for Oculus Rift") SET(SDK_RIFT_025 "" CACHE PATH "libOVR 0.2.5 path for Oculus Rift") set(SDK_ARUCO_LIBPATH "" CACHE FILEPATH "Aruco paper marker tracker static library path") @@ -427,67 +428,40 @@ endif() link_with_dinput8(opentrack-tracker-joystick) -if(SDK_RIFT_025) - set(link-flags) - set(c-flags) - if(APPLE) - set(link-flags "-framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Quartz") - set(c-flags "-fno-strict-aliasing") - else() - if(NOT MSVC) +foreach(ver 025 042 080) + if(SDK_RIFT_${ver}) + set(link-flags) + set(c-flags) + if(APPLE) + set(link-flags "-framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Quartz") set(c-flags "-fno-strict-aliasing") - endif() - endif() - opentrack_library(opentrack-tracker-rift-025 ftnoir_tracker_rift_025 LINK ${link-flags} COMPILE ${c-flags}) - target_include_directories(opentrack-tracker-rift-025 SYSTEM PUBLIC ${SDK_RIFT_025}/Include ${SDK_RIFT_025}/Src) - if(WIN32) - if(MSVC) - set(ext lib) - set(p) else() - set(ext a) - set(p lib) + if(NOT MSVC) + set(c-flags "-fno-strict-aliasing") endif() - target_link_libraries(opentrack-tracker-rift-025 ${SDK_RIFT_025}/${p}LibOVR.${ext} winmm setupapi ws2_32 imagehlp wbemuuid) - else() - if(NOT APPLE) - target_link_libraries(opentrack-tracker-rift-025 ${SDK_RIFT_025}/libLibOVR.a udev Xinerama) - else() - target_link_libraries(opentrack-tracker-rift-025 ${SDK_RIFT_025}/libLibOVR.a) endif() - endif() -endif() - -if(SDK_RIFT) - set(link-flags) - set(c-flags) - if(APPLE) - set(link-flags "-framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Quartz") - set(c-flags "-fno-strict-aliasing") - else() - if(NOT MSVC) - set(c-flags "-fno-strict-aliasing") - endif() - endif() - opentrack_library(opentrack-tracker-rift ftnoir_tracker_rift LINK ${link-flags} COMPILE ${c-flags}) - target_include_directories(opentrack-tracker-rift SYSTEM PUBLIC ${SDK_RIFT}/Include ${SDK_RIFT}/Src) - if(WIN32) - if(MSVC) - set(ext lib) - set(p) - else() - set(ext a) - set(p lib) - endif() - target_link_libraries(opentrack-tracker-rift ${SDK_RIFT}/${p}LibOVR.${ext} winmm setupapi ws2_32 imagehlp wbemuuid) - else() - if(NOT APPLE) - target_link_libraries(opentrack-tracker-rift ${SDK_RIFT}/libLibOVR.a udev Xinerama) + opentrack_library(opentrack-tracker-rift-${ver} ftnoir_tracker_rift_${ver} LINK ${link-flags} COMPILE ${c-flags}) + target_include_directories(opentrack-tracker-rift-${ver} SYSTEM PUBLIC + ${SDK_RIFT_${ver}}/Include ${SDK_RIFT_${ver}}/Src + ) + if(WIN32) + if(MSVC) + set(ext lib) + set(p) + else() + set(ext a) + set(p lib) + endif() + target_link_libraries(opentrack-tracker-rift-${ver} ${SDK_RIFT_${ver}}/${p}LibOVR.${ext} winmm setupapi ws2_32 imagehlp wbemuuid) else() - target_link_libraries(opentrack-tracker-rift ${SDK_RIFT}/libLibOVR.a) + if(NOT APPLE) + target_link_libraries(opentrack-tracker-rift-${ver} ${SDK_RIFT_${ver}}/libLibOVR.a udev Xinerama) + else() + target_link_libraries(opentrack-tracker-rift-${ver} ${SDK_RIFT_${ver}}/libLibOVR.a) + endif() endif() endif() -endif() +endforeach() if(SDK_HYDRA) opentrack_library(opentrack-tracker-hydra ftnoir_tracker_hydra) diff --git a/ftnoir_tracker_rift/ftnoir_rift.qrc b/ftnoir_tracker_rift/ftnoir_rift.qrc deleted file mode 100644 index cd174fc4..00000000 --- a/ftnoir_tracker_rift/ftnoir_rift.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - images/rift_medium.png - images/rift_small.png - images/rift_tiny.png - - diff --git a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui deleted file mode 100644 index 20c8f00b..00000000 --- a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui +++ /dev/null @@ -1,176 +0,0 @@ - - - UIRiftControls - - - Qt::NonModal - - - - 0 - 0 - 218 - 200 - - - - - 0 - 0 - - - - Oculus Rift tracker settings FaceTrackNoIR - - - - images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png - - - Qt::LeftToRight - - - false - - - - - - Yaw spring - - - - - - Enable - - - - - - - Persistence - - - - - - - - 0 - 0 - - - - - 0 - 23 - - - - 5 - - - 0.900000000000000 - - - 1.000000000000000 - - - 0.001000000000000 - - - - - - - Constant drift - - - - - - - - 0 - 0 - - - - - 0 - 23 - - - - 5 - - - 0.000100000000000 - - - 0.100000000000000 - - - 0.001000000000000 - - - - - - - Deadzone - - - - - - - - 0 - 0 - - - - - 0 - 23 - - - - 5 - - - 0.100000000000000 - - - 0.010000000000000 - - - - - - - - - - - 0 - 0 - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - startEngineClicked() - stopEngineClicked() - cameraSettingsClicked() - - diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp deleted file mode 100644 index 74208272..00000000 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ -#include "ftnoir_tracker_rift.h" -#include "opentrack/plugin-api.hpp" -#include "OVR_CAPI.h" -#include "Kernel/OVR_Math.h" -#include - -using namespace OVR; - -Rift_Tracker::Rift_Tracker() : old_yaw(0), hmd(nullptr) -{ -} - -Rift_Tracker::~Rift_Tracker() -{ - ovrHmd_Destroy(hmd); - ovr_Shutdown(); -} - -void Rift_Tracker::start_tracker(QFrame*) -{ - ovr_Initialize(); - hmd = ovrHmd_Create(0); - if (hmd) - { - ovrHmd_ConfigureTracking(hmd, ovrTrackingCap_Orientation | ovrTrackingCap_MagYawCorrection | ovrTrackingCap_Position, ovrTrackingCap_Orientation); - } - else - { - // XXX need change ITracker et al api to allow for failure reporting - // this qmessagebox doesn't give any relevant details either -sh 20141012 - QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to start Rift tracker",QMessageBox::Ok,QMessageBox::NoButton); - } -} - - -void Rift_Tracker::data(double *data) -{ - if (hmd) - { - ovrHSWDisplayState hsw; - if (ovrHmd_GetHSWDisplayState(hmd, &hsw), hsw.Displayed) - ovrHmd_DismissHSWDisplay(hmd); - ovrTrackingState ss = ovrHmd_GetTrackingState(hmd, 0); - if(ss.StatusFlags & ovrStatus_OrientationTracked) { - auto pose = ss.HeadPose.ThePose; - Quatf quat = pose.Orientation; - float yaw, pitch, roll; - quat.GetEulerAngles(&yaw, &pitch, &roll); - // XXX TODO move to core - if (s.useYawSpring) - { - yaw = old_yaw*s.persistence + (yaw-old_yaw); - if(yaw > s.deadzone) - yaw -= s.constant_drift; - if(yaw < -s.deadzone) - yaw += s.constant_drift; - old_yaw=yaw; - } - constexpr double d2r = 57.295781; - data[Yaw] = yaw * -d2r; - data[Pitch] = pitch * d2r; - data[Roll] = roll * d2r; - data[TX] = pose.Position.x * -1e2; - data[TY] = pose.Position.y * 1e2; - data[TZ] = pose.Position.z * 1e2; - } - } -} - -OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll) diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h deleted file mode 100644 index f4458413..00000000 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once -#include "ui_ftnoir_rift_clientcontrols.h" -#include -#include -#include -#include "opentrack/plugin-api.hpp" -#include "OVR.h" -#include -#include "opentrack/options.hpp" -using namespace options; - -struct settings : opts { - value useYawSpring; - value constant_drift, persistence, deadzone; - settings() : - opts("Rift"), - useYawSpring(b, "yaw-spring", false), - constant_drift(b, "constant-drift", 0.000005), - persistence(b, "persistence", 0.99999), - deadzone(b, "deadzone", 0.02) - {} -}; - -class Rift_Tracker : public ITracker -{ -public: - Rift_Tracker(); - ~Rift_Tracker() override; - void start_tracker(QFrame *) override; - void data(double *data) override; -private: - double old_yaw; - ovrHmd hmd; - settings s; -}; - -class TrackerControls: public ITrackerDialog -{ - Q_OBJECT -public: - TrackerControls(); - - void register_tracker(ITracker *) {} - void unregister_tracker() {} - -private: - Ui::UIRiftControls ui; - settings s; -private slots: - void doOK(); - void doCancel(); -}; - -class FTNoIR_TrackerDll : public Metadata -{ -public: - QString name() { return QString("Oculus Rift DK2 -- HMD"); } - QIcon icon() { return QIcon(":/images/rift_tiny.png"); } -}; - diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp deleted file mode 100644 index 6c8e9cd7..00000000 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "ftnoir_tracker_rift.h" -#include "opentrack/plugin-api.hpp" - -TrackerControls::TrackerControls() -{ - ui.setupUi( this ); - - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); - connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); - - tie_setting(s.constant_drift, ui.constantDrift); - tie_setting(s.deadzone, ui.deadzone); - tie_setting(s.persistence, ui.persistence); - tie_setting(s.useYawSpring, ui.yawSpring); -} - -void TrackerControls::doOK() { - s.b->save(); - this->close(); -} - -void TrackerControls::doCancel() { - s.b->reload(); - close(); -} - diff --git a/ftnoir_tracker_rift/images/medium.png b/ftnoir_tracker_rift/images/medium.png deleted file mode 100644 index a5ba49e7..00000000 Binary files a/ftnoir_tracker_rift/images/medium.png and /dev/null differ diff --git a/ftnoir_tracker_rift/images/rift_medium.png b/ftnoir_tracker_rift/images/rift_medium.png deleted file mode 100644 index a5ba49e7..00000000 Binary files a/ftnoir_tracker_rift/images/rift_medium.png and /dev/null differ diff --git a/ftnoir_tracker_rift/images/rift_small.png b/ftnoir_tracker_rift/images/rift_small.png deleted file mode 100644 index 3f18080c..00000000 Binary files a/ftnoir_tracker_rift/images/rift_small.png and /dev/null differ diff --git a/ftnoir_tracker_rift/images/rift_tiny.png b/ftnoir_tracker_rift/images/rift_tiny.png deleted file mode 100644 index 76fe0f58..00000000 Binary files a/ftnoir_tracker_rift/images/rift_tiny.png and /dev/null differ diff --git a/ftnoir_tracker_rift/images/small.png b/ftnoir_tracker_rift/images/small.png deleted file mode 100644 index 3f18080c..00000000 Binary files a/ftnoir_tracker_rift/images/small.png and /dev/null differ diff --git a/ftnoir_tracker_rift/images/tiny.png b/ftnoir_tracker_rift/images/tiny.png deleted file mode 100644 index 76fe0f58..00000000 Binary files a/ftnoir_tracker_rift/images/tiny.png and /dev/null differ diff --git a/ftnoir_tracker_rift_025/ftnoir_tracker_rift_025.h b/ftnoir_tracker_rift_025/ftnoir_tracker_rift_025.h index ca3068bc..717cbe84 100644 --- a/ftnoir_tracker_rift_025/ftnoir_tracker_rift_025.h +++ b/ftnoir_tracker_rift_025/ftnoir_tracker_rift_025.h @@ -25,7 +25,7 @@ class Rift_Tracker : public ITracker { public: Rift_Tracker(); - ~Rift_Tracker() override; + virtual ~Rift_Tracker() override; void start_tracker(QFrame *) override; void data(double *data) override; private: diff --git a/ftnoir_tracker_rift_042/ftnoir_rift_042.qrc b/ftnoir_tracker_rift_042/ftnoir_rift_042.qrc new file mode 100644 index 00000000..cd174fc4 --- /dev/null +++ b/ftnoir_tracker_rift_042/ftnoir_rift_042.qrc @@ -0,0 +1,7 @@ + + + images/rift_medium.png + images/rift_small.png + images/rift_tiny.png + + diff --git a/ftnoir_tracker_rift_042/ftnoir_rift_clientcontrols_042.ui b/ftnoir_tracker_rift_042/ftnoir_rift_clientcontrols_042.ui new file mode 100644 index 00000000..20c8f00b --- /dev/null +++ b/ftnoir_tracker_rift_042/ftnoir_rift_clientcontrols_042.ui @@ -0,0 +1,176 @@ + + + UIRiftControls + + + Qt::NonModal + + + + 0 + 0 + 218 + 200 + + + + + 0 + 0 + + + + Oculus Rift tracker settings FaceTrackNoIR + + + + images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + + + Qt::LeftToRight + + + false + + + + + + Yaw spring + + + + + + Enable + + + + + + + Persistence + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + 5 + + + 0.900000000000000 + + + 1.000000000000000 + + + 0.001000000000000 + + + + + + + Constant drift + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + 5 + + + 0.000100000000000 + + + 0.100000000000000 + + + 0.001000000000000 + + + + + + + Deadzone + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + 5 + + + 0.100000000000000 + + + 0.010000000000000 + + + + + + + + + + + 0 + 0 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + startEngineClicked() + stopEngineClicked() + cameraSettingsClicked() + + diff --git a/ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.cpp b/ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.cpp new file mode 100644 index 00000000..655a014c --- /dev/null +++ b/ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.cpp @@ -0,0 +1,71 @@ +/* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ +#include "ftnoir_tracker_rift_042.h" +#include "opentrack/plugin-api.hpp" +#include "OVR_CAPI.h" +#include "Kernel/OVR_Math.h" +#include + +using namespace OVR; + +Rift_Tracker::Rift_Tracker() : old_yaw(0), hmd(nullptr) +{ +} + +Rift_Tracker::~Rift_Tracker() +{ + ovrHmd_Destroy(hmd); + ovr_Shutdown(); +} + +void Rift_Tracker::start_tracker(QFrame*) +{ + ovr_Initialize(); + hmd = ovrHmd_Create(0); + if (hmd) + { + ovrHmd_ConfigureTracking(hmd, ovrTrackingCap_Orientation | ovrTrackingCap_MagYawCorrection | ovrTrackingCap_Position, ovrTrackingCap_Orientation); + } + else + { + // XXX need change ITracker et al api to allow for failure reporting + // this qmessagebox doesn't give any relevant details either -sh 20141012 + QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to start Rift tracker",QMessageBox::Ok,QMessageBox::NoButton); + } +} + + +void Rift_Tracker::data(double *data) +{ + if (hmd) + { + ovrHSWDisplayState hsw; + if (ovrHmd_GetHSWDisplayState(hmd, &hsw), hsw.Displayed) + ovrHmd_DismissHSWDisplay(hmd); + ovrTrackingState ss = ovrHmd_GetTrackingState(hmd, 0); + if(ss.StatusFlags & ovrStatus_OrientationTracked) { + auto pose = ss.HeadPose.ThePose; + Quatf quat = pose.Orientation; + float yaw, pitch, roll; + quat.GetEulerAngles(&yaw, &pitch, &roll); + // XXX TODO move to core + if (s.useYawSpring) + { + yaw = old_yaw*s.persistence + (yaw-old_yaw); + if(yaw > s.deadzone) + yaw -= s.constant_drift; + if(yaw < -s.deadzone) + yaw += s.constant_drift; + old_yaw=yaw; + } + constexpr double d2r = 57.295781; + data[Yaw] = yaw * -d2r; + data[Pitch] = pitch * d2r; + data[Roll] = roll * d2r; + data[TX] = pose.Position.x * -1e2; + data[TY] = pose.Position.y * 1e2; + data[TZ] = pose.Position.z * 1e2; + } + } +} + +OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll) diff --git a/ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.h b/ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.h new file mode 100644 index 00000000..437a2a39 --- /dev/null +++ b/ftnoir_tracker_rift_042/ftnoir_tracker_rift_042.h @@ -0,0 +1,60 @@ +#pragma once +#include "ui_ftnoir_rift_clientcontrols_042.h" +#include +#include +#include +#include "opentrack/plugin-api.hpp" +#include "OVR.h" +#include +#include "opentrack/options.hpp" +using namespace options; + +struct settings : opts { + value useYawSpring; + value constant_drift, persistence, deadzone; + settings() : + opts("Rift"), + useYawSpring(b, "yaw-spring", false), + constant_drift(b, "constant-drift", 0.000005), + persistence(b, "persistence", 0.99999), + deadzone(b, "deadzone", 0.02) + {} +}; + +class Rift_Tracker : public ITracker +{ +public: + Rift_Tracker(); + virtual ~Rift_Tracker() override; + void start_tracker(QFrame *) override; + void data(double *data) override; +private: + double old_yaw; + ovrHmd hmd; + settings s; +}; + +class TrackerControls: public ITrackerDialog +{ + Q_OBJECT +public: + TrackerControls(); + + void register_tracker(ITracker *) {} + void unregister_tracker() {} + +private: + Ui::UIRiftControls ui; + settings s; +private slots: + void doOK(); + void doCancel(); +}; + +class FTNoIR_TrackerDll : public Metadata +{ +public: + QString name() { return QString("Oculus Rift runtime 0.4.2 -- HMD"); } + QIcon icon() { return QIcon(":/images/rift_tiny.png"); } +}; + diff --git a/ftnoir_tracker_rift_042/ftnoir_tracker_rift_dialog_042.cpp b/ftnoir_tracker_rift_042/ftnoir_tracker_rift_dialog_042.cpp new file mode 100644 index 00000000..9a8b7549 --- /dev/null +++ b/ftnoir_tracker_rift_042/ftnoir_tracker_rift_dialog_042.cpp @@ -0,0 +1,26 @@ +#include "ftnoir_tracker_rift_042.h" +#include "opentrack/plugin-api.hpp" + +TrackerControls::TrackerControls() +{ + ui.setupUi( this ); + + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); + connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); + + tie_setting(s.constant_drift, ui.constantDrift); + tie_setting(s.deadzone, ui.deadzone); + tie_setting(s.persistence, ui.persistence); + tie_setting(s.useYawSpring, ui.yawSpring); +} + +void TrackerControls::doOK() { + s.b->save(); + this->close(); +} + +void TrackerControls::doCancel() { + s.b->reload(); + close(); +} + diff --git a/ftnoir_tracker_rift_042/images/medium.png b/ftnoir_tracker_rift_042/images/medium.png new file mode 100644 index 00000000..a5ba49e7 Binary files /dev/null and b/ftnoir_tracker_rift_042/images/medium.png differ diff --git a/ftnoir_tracker_rift_042/images/rift_medium.png b/ftnoir_tracker_rift_042/images/rift_medium.png new file mode 100644 index 00000000..a5ba49e7 Binary files /dev/null and b/ftnoir_tracker_rift_042/images/rift_medium.png differ diff --git a/ftnoir_tracker_rift_042/images/rift_small.png b/ftnoir_tracker_rift_042/images/rift_small.png new file mode 100644 index 00000000..3f18080c Binary files /dev/null and b/ftnoir_tracker_rift_042/images/rift_small.png differ diff --git a/ftnoir_tracker_rift_042/images/rift_tiny.png b/ftnoir_tracker_rift_042/images/rift_tiny.png new file mode 100644 index 00000000..76fe0f58 Binary files /dev/null and b/ftnoir_tracker_rift_042/images/rift_tiny.png differ diff --git a/ftnoir_tracker_rift_042/images/small.png b/ftnoir_tracker_rift_042/images/small.png new file mode 100644 index 00000000..3f18080c Binary files /dev/null and b/ftnoir_tracker_rift_042/images/small.png differ diff --git a/ftnoir_tracker_rift_042/images/tiny.png b/ftnoir_tracker_rift_042/images/tiny.png new file mode 100644 index 00000000..76fe0f58 Binary files /dev/null and b/ftnoir_tracker_rift_042/images/tiny.png differ diff --git a/ftnoir_tracker_rift_080/ftnoir_rift_080.qrc b/ftnoir_tracker_rift_080/ftnoir_rift_080.qrc new file mode 100644 index 00000000..cd174fc4 --- /dev/null +++ b/ftnoir_tracker_rift_080/ftnoir_rift_080.qrc @@ -0,0 +1,7 @@ + + + images/rift_medium.png + images/rift_small.png + images/rift_tiny.png + + diff --git a/ftnoir_tracker_rift_080/ftnoir_rift_clientcontrols_080.ui b/ftnoir_tracker_rift_080/ftnoir_rift_clientcontrols_080.ui new file mode 100644 index 00000000..20c8f00b --- /dev/null +++ b/ftnoir_tracker_rift_080/ftnoir_rift_clientcontrols_080.ui @@ -0,0 +1,176 @@ + + + UIRiftControls + + + Qt::NonModal + + + + 0 + 0 + 218 + 200 + + + + + 0 + 0 + + + + Oculus Rift tracker settings FaceTrackNoIR + + + + images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + + + Qt::LeftToRight + + + false + + + + + + Yaw spring + + + + + + Enable + + + + + + + Persistence + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + 5 + + + 0.900000000000000 + + + 1.000000000000000 + + + 0.001000000000000 + + + + + + + Constant drift + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + 5 + + + 0.000100000000000 + + + 0.100000000000000 + + + 0.001000000000000 + + + + + + + Deadzone + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + 5 + + + 0.100000000000000 + + + 0.010000000000000 + + + + + + + + + + + 0 + 0 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + startEngineClicked() + stopEngineClicked() + cameraSettingsClicked() + + diff --git a/ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.cpp b/ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.cpp new file mode 100644 index 00000000..4907f891 --- /dev/null +++ b/ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.cpp @@ -0,0 +1,69 @@ +/* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ +#include "ftnoir_tracker_rift_080.h" +#include "opentrack/plugin-api.hpp" +#include "OVR_CAPI.h" +#include "Extras/OVR_Math.h" +#include "OVR_CAPI_0_8_0.h" +#include + +using namespace OVR; + +Rift_Tracker::Rift_Tracker() : old_yaw(0), hmd(nullptr) +{ +} + +Rift_Tracker::~Rift_Tracker() +{ + if (hmd) + ovr_Destroy(hmd); + ovr_Shutdown(); +} + +void Rift_Tracker::start_tracker(QFrame*) +{ + ovrGraphicsLuid luid; + ovrResult result = ovr_Create(&hmd, &luid); + if (OVR_SUCCESS(result)) + { + ovr_ConfigureTracking(hmd, ovrTrackingCap_Orientation | ovrTrackingCap_MagYawCorrection | ovrTrackingCap_Position, ovrTrackingCap_Orientation); + } + else + { + // XXX need change ITracker et al api to allow for failure reporting + // this qmessagebox doesn't give any relevant details either -sh 20141012 + QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to start Rift tracker",QMessageBox::Ok,QMessageBox::NoButton); + } +} + +void Rift_Tracker::data(double *data) +{ + if (hmd) + { + ovrTrackingState ss = ovr_GetTrackingState(hmd, 0, false); + if(ss.StatusFlags & ovrStatus_OrientationTracked) { + auto pose = ss.HeadPose.ThePose; + Quatf quat = pose.Orientation; + float yaw, pitch, roll; + quat.GetEulerAngles(&yaw, &pitch, &roll); + // XXX TODO move to core + if (s.useYawSpring) + { + yaw = old_yaw*s.persistence + (yaw-old_yaw); + if(yaw > s.deadzone) + yaw -= s.constant_drift; + if(yaw < -s.deadzone) + yaw += s.constant_drift; + old_yaw=yaw; + } + constexpr double d2r = 57.295781; + data[Yaw] = yaw * -d2r; + data[Pitch] = pitch * d2r; + data[Roll] = roll * d2r; + data[TX] = pose.Position.x * -1e2; + data[TY] = pose.Position.y * 1e2; + data[TZ] = pose.Position.z * 1e2; + } + } +} + +OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll) diff --git a/ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.h b/ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.h new file mode 100644 index 00000000..7ba191e1 --- /dev/null +++ b/ftnoir_tracker_rift_080/ftnoir_tracker_rift_080.h @@ -0,0 +1,60 @@ +#pragma once +#include "ui_ftnoir_rift_clientcontrols_080.h" +#include +#include +#include +#include "opentrack/plugin-api.hpp" +#include "OVR.h" +#include +#include "opentrack/options.hpp" +using namespace options; + +struct settings : opts { + value useYawSpring; + value constant_drift, persistence, deadzone; + settings() : + opts("Rift"), + useYawSpring(b, "yaw-spring", false), + constant_drift(b, "constant-drift", 0.000005), + persistence(b, "persistence", 0.99999), + deadzone(b, "deadzone", 0.02) + {} +}; + +class Rift_Tracker : public ITracker +{ +public: + Rift_Tracker(); + virtual ~Rift_Tracker() override; + void start_tracker(QFrame *) override; + void data(double *data) override; +private: + double old_yaw; + ovrSession hmd; + settings s; +}; + +class TrackerControls: public ITrackerDialog +{ + Q_OBJECT +public: + TrackerControls(); + + void register_tracker(ITracker *) {} + void unregister_tracker() {} + +private: + Ui::UIRiftControls ui; + settings s; +private slots: + void doOK(); + void doCancel(); +}; + +class FTNoIR_TrackerDll : public Metadata +{ +public: + QString name() { return QString("Oculus Rift runtime 0.8.0 -- HMD"); } + QIcon icon() { return QIcon(":/images/rift_tiny.png"); } +}; + diff --git a/ftnoir_tracker_rift_080/ftnoir_tracker_rift_dialog_080.cpp b/ftnoir_tracker_rift_080/ftnoir_tracker_rift_dialog_080.cpp new file mode 100644 index 00000000..0bf797be --- /dev/null +++ b/ftnoir_tracker_rift_080/ftnoir_tracker_rift_dialog_080.cpp @@ -0,0 +1,26 @@ +#include "ftnoir_tracker_rift_080.h" +#include "opentrack/plugin-api.hpp" + +TrackerControls::TrackerControls() +{ + ui.setupUi( this ); + + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); + connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); + + tie_setting(s.constant_drift, ui.constantDrift); + tie_setting(s.deadzone, ui.deadzone); + tie_setting(s.persistence, ui.persistence); + tie_setting(s.useYawSpring, ui.yawSpring); +} + +void TrackerControls::doOK() { + s.b->save(); + this->close(); +} + +void TrackerControls::doCancel() { + s.b->reload(); + close(); +} + diff --git a/ftnoir_tracker_rift_080/images/medium.png b/ftnoir_tracker_rift_080/images/medium.png new file mode 100644 index 00000000..a5ba49e7 Binary files /dev/null and b/ftnoir_tracker_rift_080/images/medium.png differ diff --git a/ftnoir_tracker_rift_080/images/rift_medium.png b/ftnoir_tracker_rift_080/images/rift_medium.png new file mode 100644 index 00000000..a5ba49e7 Binary files /dev/null and b/ftnoir_tracker_rift_080/images/rift_medium.png differ diff --git a/ftnoir_tracker_rift_080/images/rift_small.png b/ftnoir_tracker_rift_080/images/rift_small.png new file mode 100644 index 00000000..3f18080c Binary files /dev/null and b/ftnoir_tracker_rift_080/images/rift_small.png differ diff --git a/ftnoir_tracker_rift_080/images/rift_tiny.png b/ftnoir_tracker_rift_080/images/rift_tiny.png new file mode 100644 index 00000000..76fe0f58 Binary files /dev/null and b/ftnoir_tracker_rift_080/images/rift_tiny.png differ diff --git a/ftnoir_tracker_rift_080/images/small.png b/ftnoir_tracker_rift_080/images/small.png new file mode 100644 index 00000000..3f18080c Binary files /dev/null and b/ftnoir_tracker_rift_080/images/small.png differ diff --git a/ftnoir_tracker_rift_080/images/tiny.png b/ftnoir_tracker_rift_080/images/tiny.png new file mode 100644 index 00000000..76fe0f58 Binary files /dev/null and b/ftnoir_tracker_rift_080/images/tiny.png differ -- cgit v1.2.3