From ee5a2b5cd1e93a2133697445aa68f40539c902e2 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 28 Oct 2015 13:45:21 +0100 Subject: buffer flush --- CMakeLists.txt | 38 ++++- cmake/mingw-w64.cmake | 2 +- ftnoir_tracker_rift_025/ftnoir_rift.qrc | 7 + .../ftnoir_rift_clientcontrols.ui | 176 +++++++++++++++++++++ ftnoir_tracker_rift_025/ftnoir_tracker_rift.cpp | 102 ++++++++++++ ftnoir_tracker_rift_025/ftnoir_tracker_rift.h | 60 +++++++ .../ftnoir_tracker_rift_dialog.cpp | 26 +++ ftnoir_tracker_rift_025/images/medium.png | Bin 0 -> 5764 bytes ftnoir_tracker_rift_025/images/rift_medium.png | Bin 0 -> 5764 bytes ftnoir_tracker_rift_025/images/rift_small.png | Bin 0 -> 1212 bytes ftnoir_tracker_rift_025/images/rift_tiny.png | Bin 0 -> 624 bytes ftnoir_tracker_rift_025/images/small.png | Bin 0 -> 1212 bytes ftnoir_tracker_rift_025/images/tiny.png | Bin 0 -> 624 bytes 13 files changed, 407 insertions(+), 4 deletions(-) create mode 100644 ftnoir_tracker_rift_025/ftnoir_rift.qrc create mode 100644 ftnoir_tracker_rift_025/ftnoir_rift_clientcontrols.ui create mode 100644 ftnoir_tracker_rift_025/ftnoir_tracker_rift.cpp create mode 100644 ftnoir_tracker_rift_025/ftnoir_tracker_rift.h create mode 100644 ftnoir_tracker_rift_025/ftnoir_tracker_rift_dialog.cpp create mode 100644 ftnoir_tracker_rift_025/images/medium.png create mode 100644 ftnoir_tracker_rift_025/images/rift_medium.png create mode 100644 ftnoir_tracker_rift_025/images/rift_small.png create mode 100644 ftnoir_tracker_rift_025/images/rift_tiny.png create mode 100644 ftnoir_tracker_rift_025/images/small.png create mode 100644 ftnoir_tracker_rift_025/images/tiny.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 420c9067..766d23cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,6 +187,7 @@ 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_025 "" CACHE PATH "libOVR 0.2.5 path for Oculus Rift") set(SDK_ARUCO_LIBPATH "" CACHE FILEPATH "Aruco paper marker tracker static library path") @@ -426,6 +427,37 @@ 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) + 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) + 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) @@ -433,9 +465,9 @@ if(SDK_RIFT) 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() + 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) diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake index 1f60993a..8604dafb 100644 --- a/cmake/mingw-w64.cmake +++ b/cmake/mingw-w64.cmake @@ -7,7 +7,7 @@ SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_SYSTEM_VERSION 1) # specify the cross compiler -set(c i686-w64-mingw32-) +set(c /c/mingw-w64/i686-4.9.2-posix-sjlj-rt_v4-rev4/mingw32/bin/i686-w64-mingw32-) SET(CMAKE_C_COMPILER ${c}gcc) SET(CMAKE_CXX_COMPILER ${c}g++) diff --git a/ftnoir_tracker_rift_025/ftnoir_rift.qrc b/ftnoir_tracker_rift_025/ftnoir_rift.qrc new file mode 100644 index 00000000..cd174fc4 --- /dev/null +++ b/ftnoir_tracker_rift_025/ftnoir_rift.qrc @@ -0,0 +1,7 @@ + + + images/rift_medium.png + images/rift_small.png + images/rift_tiny.png + + diff --git a/ftnoir_tracker_rift_025/ftnoir_rift_clientcontrols.ui b/ftnoir_tracker_rift_025/ftnoir_rift_clientcontrols.ui new file mode 100644 index 00000000..20c8f00b --- /dev/null +++ b/ftnoir_tracker_rift_025/ftnoir_rift_clientcontrols.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_025/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift_025/ftnoir_tracker_rift.cpp new file mode 100644 index 00000000..549b5ca2 --- /dev/null +++ b/ftnoir_tracker_rift_025/ftnoir_tracker_rift.cpp @@ -0,0 +1,102 @@ +/* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ +#include "ftnoir_tracker_rift.h" +#include "facetracknoir/global-settings.h" +#include "OVR.h" +#include + +using namespace OVR; + +Rift_Tracker::Rift_Tracker() +{ + should_quit = false; + pManager = NULL; + pSensor = NULL; + pSFusion = NULL; + old_yaw = 0; +} + +Rift_Tracker::~Rift_Tracker() +{ + if (pSensor) + pSensor->Release(); + if (pSFusion) + delete pSFusion; + if (pManager) + pManager->Release(); + System::Destroy(); +} + +void Rift_Tracker::start_tracker(QFrame*) +{ + System::Init(Log::ConfigureDefaultLog(LogMask_All)); + pManager = DeviceManager::Create(); + if (pManager != NULL) + { + DeviceEnumerator enumerator = pManager->EnumerateDevices(); + if (enumerator.IsAvailable()) + { + pSensor = enumerator.CreateDevice(); + + if (pSensor) + { + pSFusion = new OVR::SensorFusion(); + pSFusion->Reset(); + pSFusion->AttachToSensor(pSensor); + } + else + { + QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to create Rift sensor",QMessageBox::Ok,QMessageBox::NoButton); + } + + } + else + { + QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to enumerate Rift tracker",QMessageBox::Ok,QMessageBox::NoButton); + } + } + else + { + QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to start Rift tracker",QMessageBox::Ok,QMessageBox::NoButton); + } +} + + +void Rift_Tracker::data(double *data) +{ + if (pSFusion != NULL && pSensor != NULL) + { + Quatf hmdOrient = pSFusion->GetOrientation(); + double newHeadPose[6]; + + float yaw = 0.0f; + float pitch = 0.0f; + float roll = 0.0f; + hmdOrient.GetEulerAngles(&yaw, &pitch , &roll); + newHeadPose[Pitch] = pitch; + newHeadPose[Roll] = roll; + newHeadPose[Yaw] = yaw; + if (s.useYawSpring) + { + newHeadPose[Yaw] = old_yaw*s.persistence + (yaw-old_yaw); + if(newHeadPose[Yaw] > s.deadzone) + newHeadPose[Yaw] -= s.constant_drift; + if(newHeadPose[Yaw] < -s.deadzone) + newHeadPose[Yaw] += s.constant_drift; + old_yaw=yaw; + } + if (s.bEnableYaw) + { + data[Yaw] = newHeadPose[Yaw] * 57.295781f; + } + if (s.bEnablePitch) + { + data[Pitch] = newHeadPose[Pitch] * 57.295781f; + } + if (s.bEnableRoll) + { + data[Roll] = newHeadPose[Roll] * 57.295781f; + } + } +} + +OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll) diff --git a/ftnoir_tracker_rift_025/ftnoir_tracker_rift.h b/ftnoir_tracker_rift_025/ftnoir_tracker_rift.h new file mode 100644 index 00000000..231648dd --- /dev/null +++ b/ftnoir_tracker_rift_025/ftnoir_tracker_rift.h @@ -0,0 +1,60 @@ +#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 -- HMD"); } + QIcon icon() { return QIcon(":/images/rift_tiny.png"); } +}; + diff --git a/ftnoir_tracker_rift_025/ftnoir_tracker_rift_dialog.cpp b/ftnoir_tracker_rift_025/ftnoir_tracker_rift_dialog.cpp new file mode 100644 index 00000000..6c8e9cd7 --- /dev/null +++ b/ftnoir_tracker_rift_025/ftnoir_tracker_rift_dialog.cpp @@ -0,0 +1,26 @@ +#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_025/images/medium.png b/ftnoir_tracker_rift_025/images/medium.png new file mode 100644 index 00000000..a5ba49e7 Binary files /dev/null and b/ftnoir_tracker_rift_025/images/medium.png differ diff --git a/ftnoir_tracker_rift_025/images/rift_medium.png b/ftnoir_tracker_rift_025/images/rift_medium.png new file mode 100644 index 00000000..a5ba49e7 Binary files /dev/null and b/ftnoir_tracker_rift_025/images/rift_medium.png differ diff --git a/ftnoir_tracker_rift_025/images/rift_small.png b/ftnoir_tracker_rift_025/images/rift_small.png new file mode 100644 index 00000000..3f18080c Binary files /dev/null and b/ftnoir_tracker_rift_025/images/rift_small.png differ diff --git a/ftnoir_tracker_rift_025/images/rift_tiny.png b/ftnoir_tracker_rift_025/images/rift_tiny.png new file mode 100644 index 00000000..76fe0f58 Binary files /dev/null and b/ftnoir_tracker_rift_025/images/rift_tiny.png differ diff --git a/ftnoir_tracker_rift_025/images/small.png b/ftnoir_tracker_rift_025/images/small.png new file mode 100644 index 00000000..3f18080c Binary files /dev/null and b/ftnoir_tracker_rift_025/images/small.png differ diff --git a/ftnoir_tracker_rift_025/images/tiny.png b/ftnoir_tracker_rift_025/images/tiny.png new file mode 100644 index 00000000..76fe0f58 Binary files /dev/null and b/ftnoir_tracker_rift_025/images/tiny.png differ -- cgit v1.2.3