summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--facetracknoir/tracker.cpp2
-rw-r--r--ftnoir_protocol_base/ftnoir_protocol_base.h2
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg.cpp6
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg.h2
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp2
-rw-r--r--ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp2
-rw-r--r--ftnoir_protocol_ftn/ftnoir_protocol_ftn.h6
-rw-r--r--ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp2
-rw-r--r--ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp2
-rw-r--r--ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h4
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.cpp2
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.h8
12 files changed, 18 insertions, 22 deletions
diff --git a/facetracknoir/tracker.cpp b/facetracknoir/tracker.cpp
index 53b3ffd3..25b42ece 100644
--- a/facetracknoir/tracker.cpp
+++ b/facetracknoir/tracker.cpp
@@ -149,7 +149,7 @@ void Tracker::run() {
// Send the headpose to the game
if (Libraries->pProtocol) {
gameoutput_camera = output_camera;
- Libraries->pProtocol->sendHeadposeToGame( gameoutput_camera.axes, newpose ); // degrees & centimeters
+ Libraries->pProtocol->sendHeadposeToGame( gameoutput_camera.axes ); // degrees & centimeters
}
}
}
diff --git a/ftnoir_protocol_base/ftnoir_protocol_base.h b/ftnoir_protocol_base/ftnoir_protocol_base.h
index 79f0800c..5db49f01 100644
--- a/ftnoir_protocol_base/ftnoir_protocol_base.h
+++ b/ftnoir_protocol_base/ftnoir_protocol_base.h
@@ -41,7 +41,7 @@ struct IProtocol
{
virtual ~IProtocol() {}
virtual bool checkServerInstallationOK() = 0;
- virtual void sendHeadposeToGame( double *headpose, double *rawheadpose ) = 0;
+ virtual void sendHeadposeToGame( const double* headpose ) = 0;
virtual QString getGameName() = 0;
};
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
index 5aa3487e..08e7370b 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
@@ -63,11 +63,7 @@ void FTNoIR_Protocol::loadSettings() {
}
-void FTNoIR_Protocol::sendHeadposeToGame( double *headpose, double *rawheadpose ) {
- int no_bytes;
- QHostAddress sender;
- quint16 senderPort;
-
+void FTNoIR_Protocol::sendHeadposeToGame(const double* headpose) {
FlightData.x = headpose[TX] * 1e-2;
FlightData.y = headpose[TY] * 1e-2;
FlightData.z = headpose[TZ] * 1e-2;
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.h b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
index f399904b..43d1b05a 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.h
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
@@ -46,7 +46,7 @@ public:
FTNoIR_Protocol();
~FTNoIR_Protocol();
bool checkServerInstallationOK();
- void sendHeadposeToGame( double *headpose, double *rawheadpose );
+ void sendHeadposeToGame(const double *headpose);
QString getGameName() {
return "FlightGear";
}
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
index cefc9bf8..45123540 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
@@ -91,7 +91,7 @@ void FGControls::doOK() {
}
// override show event
-void FGControls::showEvent ( QShowEvent * event ) {
+void FGControls::showEvent ( QShowEvent * ) {
loadSettings();
}
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
index 3d04dfd0..80cbfa0a 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
@@ -66,7 +66,7 @@ void FTNoIR_Protocol::loadSettings() {
//
// Update Headpose in Game.
//
-void FTNoIR_Protocol::sendHeadposeToGame(double *headpose, double *rawheadpose ) {
+void FTNoIR_Protocol::sendHeadposeToGame(const double *headpose) {
int no_bytes;
double test_data[6];
//
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
index 4c1c34cd..4e814ddf 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
@@ -45,7 +45,7 @@ public:
FTNoIR_Protocol();
~FTNoIR_Protocol();
bool checkServerInstallationOK();
- void sendHeadposeToGame( double *headpose, double *rawheadpose );
+ void sendHeadposeToGame(const double *headpose);
QString getGameName() {
return "UDP Tracker";
}
@@ -65,9 +65,9 @@ public:
explicit FTNControls();
virtual ~FTNControls();
- void showEvent ( QShowEvent * event );
+ void showEvent (QShowEvent *);
void Initialize(QWidget *parent);
- void registerProtocol(IProtocol *protocol) {}
+ void registerProtocol(IProtocol *) {}
void unRegisterProtocol() {}
private:
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
index 0b61fd48..3b4e851c 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
@@ -84,7 +84,7 @@ void FTNControls::doOK() {
}
// override show event
-void FTNControls::showEvent ( QShowEvent * event ) {
+void FTNControls::showEvent ( QShowEvent * ) {
loadSettings();
}
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
index fc01552e..70fde395 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
@@ -70,7 +70,7 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
libevdev_free(dev);
}
-void FTNoIR_Protocol::sendHeadposeToGame( double *headpose, double *rawheadpose ) {
+void FTNoIR_Protocol::sendHeadposeToGame(const double* headpose) {
static const int axes[] = {
/* translation goes first */
ABS_X, ABS_Y, ABS_Z, ABS_RX, ABS_RY, ABS_RZ
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
index e753269e..3c6f591c 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
@@ -25,7 +25,7 @@ public:
bool checkServerInstallationOK() {
return dev != NULL;
}
- void sendHeadposeToGame( double *headpose, double *rawheadpose );
+ void sendHeadposeToGame(const double *headpose);
QString getGameName() {
return "Virtual joystick for Linux";
}
@@ -45,7 +45,7 @@ public:
void showEvent ( QShowEvent *) {}
void Initialize(QWidget *);
- void registerProtocol(IProtocol *l) {}
+ void registerProtocol(IProtocol *) {}
void unRegisterProtocol() {}
private:
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
index 698c2236..c5d0754f 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
@@ -25,7 +25,7 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
shm_unlink("/" WINE_SHM_NAME);
}
-void FTNoIR_Protocol::sendHeadposeToGame( double *headpose, double *rawheadpose ) {
+void FTNoIR_Protocol::sendHeadposeToGame( const double *headpose ) {
if (shm)
{
lck_shm.lock();
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.h b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
index 300501ad..01bfc93d 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.h
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
@@ -51,7 +51,7 @@ public:
~FTNoIR_Protocol();
bool checkServerInstallationOK();
- void sendHeadposeToGame(double* headpose, double* rawheadpose );
+ void sendHeadposeToGame(const double* headpose);
QString getGameName() {
QMutexLocker foo(&game_name_mutex);
return connected_game;
@@ -72,9 +72,9 @@ class FTControls: public QWidget, public IProtocolDialog
public:
FTControls();
- void showEvent ( QShowEvent * event ) {show();}
- void Initialize(QWidget *parent) {show();}
- void registerProtocol(IProtocol *protocol) {}
+ void showEvent ( QShowEvent * ) {show();}
+ void Initialize(QWidget *) {show();}
+ void registerProtocol(IProtocol *) {}
void unRegisterProtocol() {}
private:
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 15:34:54 +0000