summaryrefslogtreecommitdiffhomepage
path: root/tracker-joystick
diff options
context:
space:
mode:
Diffstat (limited to 'tracker-joystick')
-rw-r--r--tracker-joystick/ftnoir_tracker_joystick.cpp18
-rw-r--r--tracker-joystick/ftnoir_tracker_joystick.h11
-rw-r--r--tracker-joystick/ftnoir_tracker_joystick_controls.ui2
-rw-r--r--tracker-joystick/ftnoir_tracker_joystick_dialog.cpp14
-rw-r--r--tracker-joystick/lang/nl_NL.ts66
-rw-r--r--tracker-joystick/lang/ru_RU.ts64
-rw-r--r--tracker-joystick/lang/stub.ts64
-rw-r--r--tracker-joystick/lang/zh_CN.ts86
8 files changed, 107 insertions, 218 deletions
diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp
index 498b4e42..940abfd1 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick.cpp
@@ -5,16 +5,16 @@
* copyright notice and this permission notice appear in all copies.
*/
#include "ftnoir_tracker_joystick.h"
-#include "compat/util.hpp"
#include "api/plugin-api.hpp"
+#include "compat/math.hpp"
#include <QMutexLocker>
joystick::joystick()
{
- if (static_cast<QString>(s.guid) == "")
+ if (s.guid->isEmpty())
{
std::vector<win32_joy_ctx::joy_info> info = joy_ctx.get_joy_info();
- if (info.size())
+ if (!info.empty())
{
s.guid = info[0].guid;
s.b->save();
@@ -22,13 +22,7 @@ joystick::joystick()
}
}
-joystick::~joystick()
-{
-}
-
-void joystick::start_tracker(QFrame*)
-{
-}
+joystick::~joystick() = default;
void joystick::data(double *data)
{
@@ -62,8 +56,8 @@ void joystick::data(double *data)
if (k < 0 || k >= 8)
data[i] = 0;
else
- data[i] = clamp(axes[k] * limits[i] / AXIS_MAX,
- -limits[i], limits[i]);
+ data[i] = std::clamp(axes[k] * limits[i] / AXIS_MAX,
+ -limits[i], limits[i]);
}
}
}
diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h
index aea45983..d59c70de 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.h
+++ b/tracker-joystick/ftnoir_tracker_joystick.h
@@ -41,7 +41,7 @@ class joystick : public ITracker
public:
joystick();
~joystick();
- void start_tracker(QFrame *);
+ module_status start_tracker(QFrame *) { return status_ok(); }
void data(double *data);
settings s;
QString guid;
@@ -63,7 +63,7 @@ public:
QString name;
QString guid;
};
- QList<joys> _joys;
+ QList<joys> joys_;
private slots:
void doOK();
void doCancel();
@@ -71,8 +71,9 @@ private slots:
class joystickDll : public Metadata
{
-public:
- QString name() { return QString(QCoreApplication::translate("joystickDll", "Joystick input")); }
- QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+ Q_OBJECT
+
+ QString name() { return tr("Joystick input"); }
+ QIcon icon() { return QIcon(":/images/opentrack.png"); }
};
diff --git a/tracker-joystick/ftnoir_tracker_joystick_controls.ui b/tracker-joystick/ftnoir_tracker_joystick_controls.ui
index ca41e35b..122dcf45 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_controls.ui
+++ b/tracker-joystick/ftnoir_tracker_joystick_controls.ui
@@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset>
- <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
+ <normaloff>../gui/images/opentrack.png</normaloff>../gui/images/opentrack.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index aa4b783a..aaf3037b 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -12,18 +12,18 @@ dialog_joystick::dialog_joystick() : tracker(nullptr)
{
win32_joy_ctx joy_ctx;
- _joys = QList<joys>();
+ joys_ = {};
- for (auto j : joy_ctx.get_joy_info())
- _joys.push_back(joys { j.name, j.guid });
+ for (const auto& j : joy_ctx.get_joy_info())
+ joys_.push_back(joys { j.name, j.guid });
}
{
const QString guid = s.guid;
int idx = 0;
- for (int i = 0; i < _joys.size(); i++)
+ for (int i = 0; i < joys_.size(); i++)
{
- const joys& j = _joys[i];
+ const joys& j = joys_[i];
if (j.guid == guid)
idx = i;
ui.joylist->addItem(j.name + " " + j.guid);
@@ -41,8 +41,8 @@ dialog_joystick::dialog_joystick() : tracker(nullptr)
void dialog_joystick::doOK() {
int idx = ui.joylist->currentIndex();
- joys def { "", "" };
- auto val = _joys.value(idx, def);
+ static const joys def { {}, {} };
+ auto val = joys_.value(idx, def);
s.guid = val.guid;
s.b->save();
close();
diff --git a/tracker-joystick/lang/nl_NL.ts b/tracker-joystick/lang/nl_NL.ts
index 61bb10f1..691b7307 100644
--- a/tracker-joystick/lang/nl_NL.ts
+++ b/tracker-joystick/lang/nl_NL.ts
@@ -4,137 +4,74 @@
<context>
<name>UIJoystickControls</name>
<message>
- <location filename="../ftnoir_tracker_joystick_controls.ui" line="+17"/>
<source>Tracker settings</source>
<translation>Tracker-instellingen</translation>
</message>
<message>
- <location line="+40"/>
<source>Device</source>
<translation>Apparaat</translation>
</message>
<message>
- <location line="+20"/>
<source>Mapping</source>
<translation>Verwijzing</translation>
</message>
<message>
- <location line="+16"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Disabled</source>
<translation>Uitgeschakeld</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #1</source>
<translation>Joystick-as #1</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #2</source>
<translation>Joystick-as #2</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #3</source>
<translation>Joystick-as #3</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #4</source>
<translation>Joystick-as #4</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #5</source>
<translation>Joystick-as #5</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #6</source>
<translation>Joystick-as #6</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #7</source>
<translation>Joystick-as #7</translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #8</source>
<translation>Joystick-as #8</translation>
</message>
<message>
- <location line="+8"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
- <location line="+7"/>
<source>Y</source>
<translation>Y</translation>
</message>
<message>
- <location line="+7"/>
<source>Z</source>
<translation>Z</translation>
</message>
<message>
- <location line="+7"/>
<source>Yaw</source>
<translation>Yaw</translation>
</message>
<message>
- <location line="+7"/>
<source>Pitch</source>
<translation>Pitch</translation>
</message>
<message>
- <location line="+7"/>
<source>Roll</source>
<translation>Rol</translation>
</message>
@@ -142,9 +79,8 @@
<context>
<name>joystickDll</name>
<message>
- <location filename="../ftnoir_tracker_joystick.h" line="+75"/>
<source>Joystick input</source>
- <translation>Joystick-invoer</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
diff --git a/tracker-joystick/lang/ru_RU.ts b/tracker-joystick/lang/ru_RU.ts
index 0d98258b..e737569e 100644
--- a/tracker-joystick/lang/ru_RU.ts
+++ b/tracker-joystick/lang/ru_RU.ts
@@ -4,137 +4,74 @@
<context>
<name>UIJoystickControls</name>
<message>
- <location filename="../ftnoir_tracker_joystick_controls.ui" line="+17"/>
<source>Tracker settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+40"/>
<source>Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
<source>Mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #6</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #7</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Y</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Z</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Yaw</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Pitch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Roll</source>
<translation type="unfinished"></translation>
</message>
@@ -142,7 +79,6 @@
<context>
<name>joystickDll</name>
<message>
- <location filename="../ftnoir_tracker_joystick.h" line="+75"/>
<source>Joystick input</source>
<translation type="unfinished"></translation>
</message>
diff --git a/tracker-joystick/lang/stub.ts b/tracker-joystick/lang/stub.ts
index 15e440e8..a169a05c 100644
--- a/tracker-joystick/lang/stub.ts
+++ b/tracker-joystick/lang/stub.ts
@@ -4,137 +4,74 @@
<context>
<name>UIJoystickControls</name>
<message>
- <location filename="../ftnoir_tracker_joystick_controls.ui" line="+17"/>
<source>Tracker settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+40"/>
<source>Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
<source>Mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #6</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #7</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-285"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
- <location line="+58"/>
<source>Joystick axis #8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Y</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Z</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Yaw</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Pitch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Roll</source>
<translation type="unfinished"></translation>
</message>
@@ -142,7 +79,6 @@
<context>
<name>joystickDll</name>
<message>
- <location filename="../ftnoir_tracker_joystick.h" line="+75"/>
<source>Joystick input</source>
<translation type="unfinished"></translation>
</message>
diff --git a/tracker-joystick/lang/zh_CN.ts b/tracker-joystick/lang/zh_CN.ts
new file mode 100644
index 00000000..b4729a64
--- /dev/null
+++ b/tracker-joystick/lang/zh_CN.ts
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+ <name>UIJoystickControls</name>
+ <message>
+ <source>Tracker settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Mapping</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #5</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #7</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Joystick axis #8</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>X</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Y</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Z</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Yaw</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Pitch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Roll</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>joystickDll</name>
+ <message>
+ <source>Joystick input</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+</TS>
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-19 16:43:21 +0000