diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-06 20:12:31 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-06 20:12:31 +0200 |
commit | 3a9ae529a862a6ebfe66f05d7c676deedb7ff66d (patch) | |
tree | 74864610769a13f33e096e5b85bc4761b7d26878 /tracker-rift-042 | |
parent | 57e6eeffb0b87570fc60d1d29d5d72b848deb620 (diff) |
tracker/rift: euthanize old versions
No one uses them according to #781
Diffstat (limited to 'tracker-rift-042')
-rw-r--r-- | tracker-rift-042/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tracker-rift-042/ftnoir_rift_042.qrc | 7 | ||||
-rw-r--r-- | tracker-rift-042/ftnoir_rift_clientcontrols_042.ui | 176 | ||||
-rw-r--r-- | tracker-rift-042/ftnoir_tracker_rift_042.cpp | 99 | ||||
-rw-r--r-- | tracker-rift-042/ftnoir_tracker_rift_042.h | 63 | ||||
-rw-r--r-- | tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp | 25 | ||||
-rw-r--r-- | tracker-rift-042/images/medium.png | bin | 5764 -> 0 bytes | |||
-rw-r--r-- | tracker-rift-042/images/rift_medium.png | bin | 5764 -> 0 bytes | |||
-rw-r--r-- | tracker-rift-042/images/rift_small.png | bin | 1212 -> 0 bytes | |||
-rw-r--r-- | tracker-rift-042/images/rift_tiny.png | bin | 624 -> 0 bytes | |||
-rw-r--r-- | tracker-rift-042/images/small.png | bin | 1212 -> 0 bytes | |||
-rw-r--r-- | tracker-rift-042/images/tiny.png | bin | 624 -> 0 bytes | |||
-rw-r--r-- | tracker-rift-042/lang/nl_NL.ts | 45 | ||||
-rw-r--r-- | tracker-rift-042/lang/ru_RU.ts | 45 | ||||
-rw-r--r-- | tracker-rift-042/lang/stub.ts | 45 | ||||
-rw-r--r-- | tracker-rift-042/lang/zh_CN.ts | 45 |
16 files changed, 0 insertions, 553 deletions
diff --git a/tracker-rift-042/CMakeLists.txt b/tracker-rift-042/CMakeLists.txt deleted file mode 100644 index 594e7c5c..00000000 --- a/tracker-rift-042/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -include(opentrack-rift) -otr_rift(tracker-rift-042 SDK_RIFT_042) -SET(SDK_RIFT_042 "" CACHE PATH "libOVR 0.4.2 path for Oculus Rift") diff --git a/tracker-rift-042/ftnoir_rift_042.qrc b/tracker-rift-042/ftnoir_rift_042.qrc deleted file mode 100644 index cd174fc4..00000000 --- a/tracker-rift-042/ftnoir_rift_042.qrc +++ /dev/null @@ -1,7 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>images/rift_medium.png</file> - <file>images/rift_small.png</file> - <file>images/rift_tiny.png</file> - </qresource> -</RCC> diff --git a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui b/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui deleted file mode 100644 index 102e16b2..00000000 --- a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui +++ /dev/null @@ -1,176 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>dialog_rift_042</class> - <widget class="QWidget" name="dialog_rift_042"> - <property name="windowModality"> - <enum>Qt::NonModal</enum> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>218</width> - <height>200</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="windowTitle"> - <string>Oculus Rift tracker settings FaceTrackNoIR</string> - </property> - <property name="windowIcon"> - <iconset> - <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Yaw spring</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QCheckBox" name="yawSpring"> - <property name="text"> - <string>Enable</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Persistence</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QDoubleSpinBox" name="persistence"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>23</height> - </size> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>0.900000000000000</double> - </property> - <property name="maximum"> - <double>1.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.001000000000000</double> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Constant drift</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QDoubleSpinBox" name="constantDrift"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>23</height> - </size> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>0.000100000000000</double> - </property> - <property name="maximum"> - <double>0.100000000000000</double> - </property> - <property name="singleStep"> - <double>0.001000000000000</double> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Deadzone</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QDoubleSpinBox" name="deadzone"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>23</height> - </size> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="maximum"> - <double>0.100000000000000</double> - </property> - <property name="singleStep"> - <double>0.010000000000000</double> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="1" column="0"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections/> - <slots> - <slot>startEngineClicked()</slot> - <slot>stopEngineClicked()</slot> - <slot>cameraSettingsClicked()</slot> - </slots> -</ui> diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_042.cpp deleted file mode 100644 index c8ced38f..00000000 --- a/tracker-rift-042/ftnoir_tracker_rift_042.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/* Copyright (c) 2013 mm0zct - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include "ftnoir_tracker_rift_042.h" -#include "api/plugin-api.hpp" - -#include <QString> - -#include <OVR_CAPI.h> -#include <Kernel/OVR_Math.h> -#include <cstdio> -#include <cstring> -#include <cmath> - -using namespace OVR; - -rift_tracker_042::rift_tracker_042() : old_yaw(0), hmd(nullptr) -{ -} - -rift_tracker_042::~rift_tracker_042() -{ - ovrHmd_Destroy(hmd); - ovr_Shutdown(); -} - -module_status rift_tracker_042::start_tracker(QFrame*) -{ - ovr_Initialize(); - hmd = ovrHmd_Create(0); - if (hmd) - { - ovrHmd_ConfigureTracking(hmd, ovrTrackingCap_Orientation | ovrTrackingCap_MagYawCorrection | ovrTrackingCap_Position, ovrTrackingCap_Orientation); - return status_ok(); - } - else - return error(tr("Unable to start Rift tracker: %1").arg(ovrHmd_GetLastError(nullptr))); -} - - -void rift_tracker_042::data(double *data) -{ - if (hmd) - { - ovrHSWDisplayState hsw; - std::memset(&hsw, 0, sizeof(hsw)); - ovrHmd_GetHSWDisplayState(hmd, &hsw); - if (hsw.Displayed) - ovrHmd_DismissHSWDisplay(hmd); - ovrTrackingState ss = ovrHmd_GetTrackingState(hmd, 0); - if (ss.StatusFlags & ovrStatus_OrientationTracked) - { - constexpr float c_mult = 16; - constexpr float c_div = 1/c_mult; - - Vector3f axis; - float angle; - - const Posef pose(ss.HeadPose.ThePose); - pose.Rotation.GetAxisAngle(&axis, &angle); - angle *= c_div; - - float yaw, pitch, roll; - Quatf(axis, angle).GetEulerAngles<Axis_Y, Axis_X, Axis_Z>(&yaw, &pitch, &roll); - - double yaw_ = double(yaw); - 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 = 180 / M_PI; - data[Yaw] = yaw_ * -d2r; - data[Pitch] = double(pitch) * d2r; - data[Roll] = double(roll) * d2r; - data[TX] = double(pose.Translation.x) * -1e2; - data[TY] = double(pose.Translation.y) * 1e2; - data[TZ] = double(pose.Translation.z) * 1e2; - } - } -} - -OPENTRACK_DECLARE_TRACKER(rift_tracker_042, dialog_rift_042, rift_042Dll) diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.h b/tracker-rift-042/ftnoir_tracker_rift_042.h deleted file mode 100644 index b620a76c..00000000 --- a/tracker-rift-042/ftnoir_tracker_rift_042.h +++ /dev/null @@ -1,63 +0,0 @@ -#pragma once -#include "ui_ftnoir_rift_clientcontrols_042.h" -#include "api/plugin-api.hpp" -#include "options/options.hpp" -#include <OVR.h> -#include <QMessageBox> -#include <QWaitCondition> -#include <cmath> -#include <memory> -using namespace options; - -struct settings : opts { - value<bool> useYawSpring; - value<double> constant_drift, persistence, deadzone; - settings() : - opts("Rift-042"), - 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_042 : public QObject, public ITracker -{ - Q_OBJECT - -public: - rift_tracker_042(); - virtual ~rift_tracker_042() override; - module_status start_tracker(QFrame *) override; - void data(double *data) override; -private: - double old_yaw; - ovrHmd hmd; - settings s; -}; - -class dialog_rift_042: public ITrackerDialog -{ - Q_OBJECT -public: - dialog_rift_042(); - - void register_tracker(ITracker *) {} - void unregister_tracker() {} - -private: - Ui::dialog_rift_042 ui; - settings s; -private slots: - void doOK(); - void doCancel(); -}; - -class rift_042Dll : public Metadata -{ - Q_OBJECT - - QString name() { return tr("Oculus Rift runtime 0.4.2 -- HMD"); } - QIcon icon() { return QIcon(":/images/rift_tiny.png"); } -}; - diff --git a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp deleted file mode 100644 index 032c3c63..00000000 --- a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "ftnoir_tracker_rift_042.h" -#include "api/plugin-api.hpp" - -dialog_rift_042::dialog_rift_042() -{ - 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 dialog_rift_042::doOK() { - s.b->save(); - close(); -} - -void dialog_rift_042::doCancel() { - close(); -} - diff --git a/tracker-rift-042/images/medium.png b/tracker-rift-042/images/medium.png Binary files differdeleted file mode 100644 index a5ba49e7..00000000 --- a/tracker-rift-042/images/medium.png +++ /dev/null diff --git a/tracker-rift-042/images/rift_medium.png b/tracker-rift-042/images/rift_medium.png Binary files differdeleted file mode 100644 index a5ba49e7..00000000 --- a/tracker-rift-042/images/rift_medium.png +++ /dev/null diff --git a/tracker-rift-042/images/rift_small.png b/tracker-rift-042/images/rift_small.png Binary files differdeleted file mode 100644 index 3f18080c..00000000 --- a/tracker-rift-042/images/rift_small.png +++ /dev/null diff --git a/tracker-rift-042/images/rift_tiny.png b/tracker-rift-042/images/rift_tiny.png Binary files differdeleted file mode 100644 index 76fe0f58..00000000 --- a/tracker-rift-042/images/rift_tiny.png +++ /dev/null diff --git a/tracker-rift-042/images/small.png b/tracker-rift-042/images/small.png Binary files differdeleted file mode 100644 index 3f18080c..00000000 --- a/tracker-rift-042/images/small.png +++ /dev/null diff --git a/tracker-rift-042/images/tiny.png b/tracker-rift-042/images/tiny.png Binary files differdeleted file mode 100644 index 76fe0f58..00000000 --- a/tracker-rift-042/images/tiny.png +++ /dev/null diff --git a/tracker-rift-042/lang/nl_NL.ts b/tracker-rift-042/lang/nl_NL.ts deleted file mode 100644 index 985e5faa..00000000 --- a/tracker-rift-042/lang/nl_NL.ts +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="nl_NL"> -<context> - <name>dialog_rift_042</name> - <message> - <source>Oculus Rift tracker settings FaceTrackNoIR</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Yaw spring</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Enable</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Persistence</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Constant drift</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Deadzone</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_042Dll</name> - <message> - <source>Oculus Rift runtime 0.4.2 -- HMD</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_tracker_042</name> - <message> - <source>Unable to start Rift tracker: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -</TS> diff --git a/tracker-rift-042/lang/ru_RU.ts b/tracker-rift-042/lang/ru_RU.ts deleted file mode 100644 index 331a632c..00000000 --- a/tracker-rift-042/lang/ru_RU.ts +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="ru_RU"> -<context> - <name>dialog_rift_042</name> - <message> - <source>Oculus Rift tracker settings FaceTrackNoIR</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Yaw spring</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Enable</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Persistence</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Constant drift</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Deadzone</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_042Dll</name> - <message> - <source>Oculus Rift runtime 0.4.2 -- HMD</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_tracker_042</name> - <message> - <source>Unable to start Rift tracker: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -</TS> diff --git a/tracker-rift-042/lang/stub.ts b/tracker-rift-042/lang/stub.ts deleted file mode 100644 index 67d1ce36..00000000 --- a/tracker-rift-042/lang/stub.ts +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1"> -<context> - <name>dialog_rift_042</name> - <message> - <source>Oculus Rift tracker settings FaceTrackNoIR</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Yaw spring</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Enable</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Persistence</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Constant drift</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Deadzone</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_042Dll</name> - <message> - <source>Oculus Rift runtime 0.4.2 -- HMD</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_tracker_042</name> - <message> - <source>Unable to start Rift tracker: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -</TS> diff --git a/tracker-rift-042/lang/zh_CN.ts b/tracker-rift-042/lang/zh_CN.ts deleted file mode 100644 index 67d1ce36..00000000 --- a/tracker-rift-042/lang/zh_CN.ts +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1"> -<context> - <name>dialog_rift_042</name> - <message> - <source>Oculus Rift tracker settings FaceTrackNoIR</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Yaw spring</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Enable</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Persistence</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Constant drift</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Deadzone</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_042Dll</name> - <message> - <source>Oculus Rift runtime 0.4.2 -- HMD</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>rift_tracker_042</name> - <message> - <source>Unable to start Rift tracker: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -</TS> |