diff options
| -rw-r--r-- | FaceTrackNoIR.suo | bin | 279040 -> 279040 bytes | |||
| -rw-r--r-- | FaceTrackNoIR/FGServer.cpp | 94 | ||||
| -rw-r--r-- | FaceTrackNoIR/FGServer.h | 7 | ||||
| -rw-r--r-- | FaceTrackNoIR/FTIRServer.h | 1 | ||||
| -rw-r--r-- | FaceTrackNoIR/FaceTrackNoIR.cpp | 2 | ||||
| -rw-r--r-- | FaceTrackNoIR/FaceTrackNoIR.ui | 600 | ||||
| -rw-r--r-- | FaceTrackNoIR/PPJoyServer.cpp | 68 | ||||
| -rw-r--r-- | FaceTrackNoIR/SCServer.cpp | 161 | ||||
| -rw-r--r-- | FaceTrackNoIR/SCServer.h | 8 | ||||
| -rw-r--r-- | bin/FaceTrackNoIR.exe | bin | 716800 -> 716800 bytes | |||
| -rw-r--r-- | bin/Settings/FlightGear.ini | 64 |
11 files changed, 435 insertions, 570 deletions
diff --git a/FaceTrackNoIR.suo b/FaceTrackNoIR.suo Binary files differindex 8826c353..f12329e2 100644 --- a/FaceTrackNoIR.suo +++ b/FaceTrackNoIR.suo diff --git a/FaceTrackNoIR/FGServer.cpp b/FaceTrackNoIR/FGServer.cpp index 47ca31ba..9f362e52 100644 --- a/FaceTrackNoIR/FGServer.cpp +++ b/FaceTrackNoIR/FGServer.cpp @@ -25,6 +25,11 @@ * to FlightGear, using UDP. *
* It is based on the (Linux) example made by Melchior FRANZ. *
********************************************************************************/
+/*
+ Modifications (last one on top):
+ 20101224 - WVR: Base class is no longer inheriting QThread. sendHeadposeToGame
+ is called from run() of Tracker.cpp
+*/
#include <QtGui>
#include <QtNetwork>
#include "FGServer.h"
@@ -36,44 +41,27 @@ FGServer::FGServer( Tracker *parent ) { // Save the parent
headTracker = parent;
+ loadSettings();
+}
- // Create events
- //m_StopThread = CreateEvent(0, TRUE, FALSE, 0);
- //m_WaitThread = CreateEvent(0, TRUE, FALSE, 0);
+/** destructor **/
+FGServer::~FGServer() {
+ inSocket->disconnectFromHost();
+ inSocket->waitForDisconnected();
+ outSocket->disconnectFromHost();
+ outSocket->waitForDisconnected();
- loadSettings();
+ delete inSocket;
+ delete outSocket;
}
//
-// Callback function registered in the run() method.
-// Retrieve all pending Datagrams (typically 1) and send a reply, containing the headpose-data.
+// Update Headpose in Game.
//
-void FGServer::readPendingDatagrams()
-{
-QHostAddress sender;
-quint16 senderPort;
-qint32 cmd;
+void FGServer::sendHeadposeToGame() {
int no_bytes;
//
- // Read data from FlightGear
- //
- while (inSocket->hasPendingDatagrams()) {
- QByteArray datagram;
- datagram.resize(inSocket->pendingDatagramSize());
-
-// qDebug() << "FGServer::readPendingDatagrams says: size =" << inSocket->pendingDatagramSize();
-
- inSocket->readDatagram( (char * ) &cmd, sizeof(cmd), &sender, &senderPort);
-// qDebug() << "FGServer::readPendingDatagrams says: data =" << cmd;
-
- fg_cmd = cmd; // Let's just accept that command for now...
- if ( cmd > 0 ) {
- headTracker->handleGameCommand ( cmd ); // Send it upstream, for the Tracker to handle
- }
- }
-
- //
// Copy the Raw measurements directly to the client.
//
TestData.x = virtPosX;
@@ -100,9 +88,40 @@ int no_bytes; }
-/** QThread run @override **/
-void FGServer::run() {
+//
+// Callback function registered in the run() method.
+// Retrieve all pending Datagrams (typically 1) and send a reply, containing the headpose-data.
+//
+void FGServer::readPendingDatagrams()
+{
+QHostAddress sender;
+quint16 senderPort;
+
+ //
+ // Read data from FlightGear
+ //
+ while (inSocket->hasPendingDatagrams()) {
+ QByteArray datagram;
+ datagram.resize(inSocket->pendingDatagramSize());
+
+// qDebug() << "FGServer::readPendingDatagrams says: size =" << inSocket->pendingDatagramSize();
+ inSocket->readDatagram( (char * ) &cmd, sizeof(cmd), &sender, &senderPort);
+// qDebug() << "FGServer::readPendingDatagrams says: data =" << cmd;
+
+ fg_cmd = cmd; // Let's just accept that command for now...
+ if ( cmd > 0 ) {
+ headTracker->handleGameCommand ( cmd ); // Send it upstream, for the Tracker to handle
+ }
+ }
+}
+
+//
+// Check if the Client DLL exists and load it (to test it), if so.
+// Returns 'true' if all seems OK.
+//
+bool FGServer::checkServerInstallationOK( HANDLE handle )
+{
// Init. the data
TestData.x = 0.0f;
TestData.y = 0.0f;
@@ -123,19 +142,8 @@ void FGServer::run() { // Connect the inSocket to the member-function, to read FlightGear commands
connect(inSocket, SIGNAL(readyRead()), this, SLOT(readPendingDatagrams()), Qt::DirectConnection);
-// exec(); // Exec only returns, when the thread terminates...
-}
-/** QThread terminate @override **/
-void FGServer::terminate() {
-
- inSocket->disconnectFromHost();
- inSocket->waitForDisconnected();
- outSocket->disconnectFromHost();
- outSocket->waitForDisconnected();
-
- delete inSocket;
- delete outSocket;
+ return true;
}
//
diff --git a/FaceTrackNoIR/FGServer.h b/FaceTrackNoIR/FGServer.h index 8b61f920..9fd52eb3 100644 --- a/FaceTrackNoIR/FGServer.h +++ b/FaceTrackNoIR/FGServer.h @@ -56,12 +56,12 @@ public: // public member methods
FGServer( Tracker *parent );
- virtual ~FGServer() {};
+ ~FGServer();
// protected member methods
protected:
- void run();
- void terminate();
+ bool checkServerInstallationOK( HANDLE handle );
+ void sendHeadposeToGame();
private slots:
void readPendingDatagrams();
@@ -71,6 +71,7 @@ private: TFlightGearData TestData;
QUdpSocket *inSocket; // Receive from FligthGear
QUdpSocket *outSocket; // Send to FligthGear
+ qint32 cmd;
qint32 fg_cmd; // Command from FlightGear
QHostAddress destIP; // Destination IP-address
int destPort; // Destination port-number
diff --git a/FaceTrackNoIR/FTIRServer.h b/FaceTrackNoIR/FTIRServer.h index c27a1ab5..bdf31cc6 100644 --- a/FaceTrackNoIR/FTIRServer.h +++ b/FaceTrackNoIR/FTIRServer.h @@ -56,7 +56,6 @@ public: // protected member methods
protected:
-// void run();
bool checkServerInstallationOK( HANDLE handle );
void sendHeadposeToGame();
diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp index 7298a207..4c63d93b 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.cpp +++ b/FaceTrackNoIR/FaceTrackNoIR.cpp @@ -72,7 +72,7 @@ void FaceTrackNoIR::setupFaceTrackNoIR() { ui.setupUi(this);
- ui.headPoseWidget->hide();
+ ui.headPoseWidget->show();
ui.video_frame->hide();
// menu objects will be connected with the functions in FaceTrackNoIR class
diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui index d24308bd..2d7aad69 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.ui +++ b/FaceTrackNoIR/FaceTrackNoIR.ui @@ -11,7 +11,7 @@ <x>0</x>
<y>0</y>
<width>970</width>
- <height>521</height>
+ <height>421</height>
</rect>
</property>
<property name="sizePolicy">
@@ -49,11 +49,18 @@ QWidget { /* Specials for individual widget(s) */
QWidget#widget {
background-color: #484848;
+ border-left: 1px solid #000;
}
-QWidget#Leftwidget {
+/* Specials for individual widget(s) */
+QWidget#widget4video {
background-color: #595959;
- border-right: 1px solid #000;
+ border-top: 1px solid #000;
+ border-bottom: 1px solid #000;
+}
+
+QWidget#Leftwidget {
+ background-color: ;
}
QWidget#widgetTop {
@@ -115,7 +122,7 @@ QGroupBox { <property name="minimumSize">
<size>
<width>800</width>
- <height>500</height>
+ <height>400</height>
</size>
</property>
<property name="styleSheet">
@@ -129,346 +136,312 @@ QGroupBox { <number>0</number>
</property>
<item>
- <widget class="QWidget" name="widgetTop" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>166</width>
- <height>90</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>177</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QFrame" name="logoInstitute">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>90</width>
- <height>90</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">QFrame#logoInstitute {
- background:#595959 url(UIElements/logoFaceTrackNoIR.png) no-repeat;
-border:none;
-}</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
- <widget class="QWidget" name="Leftwidget" native="true">
- <property name="maximumSize">
- <size>
- <width>1000</width>
- <height>16777215</height>
- </size>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="spacing">
+ <number>6</number>
</property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QWidget" name="spacerwidget" native="true">
- <property name="minimumSize">
- <size>
- <width>250</width>
- <height>300</height>
- </size>
+ <item row="6" column="0">
+ <widget class="QWidget" name="headPoseWidget" native="true">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <widget class="QLineEdit" name="headRotYLine">
+ <property name="geometry">
+ <rect>
+ <x>151</x>
+ <y>40</y>
+ <width>80</width>
+ <height>20</height>
+ </rect>
</property>
<property name="styleSheet">
- <string notr="true"/>
+ <string notr="true">border:1px solid #ccc;
+background:white;
+color:#000;</string>
</property>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="headPoseWidget" native="true">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>100</height>
- </size>
+ <property name="text">
+ <string>N/A</string>
</property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>100</height>
- </size>
+ </widget>
+ <widget class="QLineEdit" name="headRotXLine">
+ <property name="geometry">
+ <rect>
+ <x>151</x>
+ <y>10</y>
+ <width>81</width>
+ <height>20</height>
+ </rect>
</property>
<property name="styleSheet">
- <string notr="true"/>
- </property>
- <widget class="QLineEdit" name="headRotYLine">
- <property name="geometry">
- <rect>
- <x>151</x>
- <y>40</y>
- <width>80</width>
- <height>20</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:1px solid #ccc;
+ <string notr="true">border:1px solid #ccc;
background:white;
color:#000;</string>
- </property>
- <property name="text">
- <string>N/A</string>
- </property>
- </widget>
- <widget class="QLineEdit" name="headRotXLine">
- <property name="geometry">
- <rect>
- <x>151</x>
- <y>10</y>
- <width>81</width>
- <height>20</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:1px solid #ccc;
-background:white;
-color:#000;</string>
- </property>
- <property name="text">
- <string>N/A</string>
- </property>
- </widget>
- <widget class="QLineEdit" name="headRotZLine">
- <property name="geometry">
- <rect>
- <x>150</x>
- <y>70</y>
- <width>81</width>
- <height>20</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:1px solid #ccc;
+ </property>
+ <property name="text">
+ <string>N/A</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="headRotZLine">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>70</y>
+ <width>81</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:1px solid #ccc;
background:white;
color:#000;</string>
- </property>
- <property name="text">
- <string>N/A</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_4">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>21</width>
- <height>16</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:none;
+ </property>
+ <property name="text">
+ <string>N/A</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_4">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>21</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:none;
color:white</string>
- </property>
- <property name="text">
- <string>X</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_5">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>40</y>
- <width>21</width>
- <height>16</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:none;
+ </property>
+ <property name="text">
+ <string>X</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_5">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>40</y>
+ <width>21</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:none;
color:white;</string>
- </property>
- <property name="text">
- <string>Y</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_6">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>70</y>
- <width>21</width>
- <height>16</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">color:white;
+ </property>
+ <property name="text">
+ <string>Y</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_6">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>70</y>
+ <width>21</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:white;
border:none;</string>
- </property>
- <property name="text">
- <string>Z</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_7">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>70</y>
- <width>21</width>
- <height>16</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:none;
+ </property>
+ <property name="text">
+ <string>Z</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_7">
+ <property name="geometry">
+ <rect>
+ <x>120</x>
+ <y>70</y>
+ <width>21</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:none;
color:white;</string>
- </property>
- <property name="text">
- <string>rotZ</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_8">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>40</y>
- <width>21</width>
- <height>16</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">color:white;
+ </property>
+ <property name="text">
+ <string>rotZ</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_8">
+ <property name="geometry">
+ <rect>
+ <x>120</x>
+ <y>40</y>
+ <width>21</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:white;
border:none;</string>
- </property>
- <property name="text">
- <string>rotY</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_9">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>10</y>
- <width>21</width>
- <height>16</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:none;
+ </property>
+ <property name="text">
+ <string>rotY</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_9">
+ <property name="geometry">
+ <rect>
+ <x>120</x>
+ <y>10</y>
+ <width>21</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:none;
color:white;</string>
- </property>
- <property name="text">
- <string>rotX</string>
- </property>
- </widget>
- <widget class="QLineEdit" name="headZLine">
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>70</y>
- <width>81</width>
- <height>20</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:1px solid #ccc;
+ </property>
+ <property name="text">
+ <string>rotX</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="headZLine">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>70</y>
+ <width>81</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:1px solid #ccc;
background:white;
color:#000;</string>
- </property>
- <property name="text">
- <string>N/A</string>
- </property>
- </widget>
- <widget class="QLineEdit" name="headYLine">
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>40</y>
- <width>81</width>
- <height>20</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true">border:1px solid #ccc;
+ </property>
+ <property name="text">
+ <string>N/A</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="headYLine">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>40</y>
+ <width>81</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:1px solid #ccc;
background:white;
color:#000;</string>
+ </property>
+ <property name="text">
+ <string>N/A</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="headXLine">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>10</y>
+ <width>81</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border:1px solid #ccc;
+background:white;
+color:#000;</string>
+ </property>
+ <property name="text">
+ <string>N/A</string>
+ </property>
+ </widget>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QFrame" name="logoInstitute">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="text">
- <string>N/A</string>
+ <property name="minimumSize">
+ <size>
+ <width>90</width>
+ <height>90</height>
+ </size>
</property>
- </widget>
- <widget class="QLineEdit" name="headXLine">
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>10</y>
- <width>81</width>
- <height>20</height>
- </rect>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>90</height>
+ </size>
</property>
<property name="styleSheet">
- <string notr="true">border:1px solid #ccc;
-background:white;
-color:#000;</string>
+ <string notr="true">QFrame#logoInstitute {
+ background:#595959 url(UIElements/logoFaceTrackNoIR.png) no-repeat;
+border:none;
+}</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="text">
- <string>N/A</string>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
</property>
</widget>
- </widget>
- </item>
- <item>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="5" column="0">
+ <widget class="QWidget" name="widget4video" native="true">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>180</height>
+ </size>
+ </property>
<widget class="QFrame" name="video_frame">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>250</width>
+ <height>180</height>
+ </rect>
+ </property>
<property name="minimumSize">
<size>
<width>250</width>
@@ -491,9 +464,9 @@ color:#000;</string> <enum>QFrame::Raised</enum>
</property>
</widget>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
@@ -1984,7 +1957,6 @@ background:none;</string> <string>View</string>
</property>
<addaction name="actionVideoWidget"/>
- <addaction name="actionHeadPoseWidget"/>
</widget>
<widget class="QMenu" name="menuOptions">
<property name="title">
diff --git a/FaceTrackNoIR/PPJoyServer.cpp b/FaceTrackNoIR/PPJoyServer.cpp index 9a2301fd..cf0773c2 100644 --- a/FaceTrackNoIR/PPJoyServer.cpp +++ b/FaceTrackNoIR/PPJoyServer.cpp @@ -41,10 +41,6 @@ char strDevName[100]; // Save the parent
headTracker = parent;
- // Create events
- //m_StopThread = CreateEvent(0, TRUE, FALSE, 0);
- //m_WaitThread = CreateEvent(0, TRUE, FALSE, 0);
-
// Initialize arrays
for (int i = 0;i < 3;i++) {
centerPos[i] = 0;
@@ -72,28 +68,13 @@ PPJoyServer::~PPJoyServer() { /* Make sure we could open the device! */
if (h == INVALID_HANDLE_VALUE) {
- //terminate();
- //wait();
return;
}
- //// Trigger thread to stop
- //::SetEvent(m_StopThread);
-
- //// Wait until thread finished
- //::WaitForSingleObject(m_WaitThread, INFINITE);
-
- //// Close handles
- //::CloseHandle(m_StopThread);
- //::CloseHandle(m_WaitThread);
-
//
// Free the Virtual Joystick
//
CloseHandle(h);
- //terminates the QThread and waits for finishing the QThread
- //terminate();
- //wait();
}
/** QThread run @override **/
@@ -112,38 +93,25 @@ void PPJoyServer::sendHeadposeToGame() { return;
}
- forever
+ // The effective angle for faceTracking will be < 90 degrees, so we assume a smaller range here
+ Analog[0] = scale2AnalogLimits( virtRotX, -50.0f, 50.0f ); // Pitch
+ Analog[1] = scale2AnalogLimits( virtRotY, -50.0f, 50.0f ); // Yaw
+ Analog[2] = scale2AnalogLimits( virtRotZ, -50.0f, 50.0f ); // Roll
+
+ // The effective movement for faceTracking will be < 50 cm, so we assume a smaller range here
+ Analog[3] = scale2AnalogLimits( virtPosX, -40.0f, 40.0f ); // X
+
+ Analog[4] = scale2AnalogLimits( virtPosY, -40.0f, 40.0f ); // Y
+ Analog[5] = scale2AnalogLimits( virtPosZ, -40.0f, 40.0f ); // Z
+
+ checkAnalogLimits();
+
+ /* Send request to PPJoy for processing. */
+ /* Currently there is no Return Code from PPJoy, this may be added at a */
+ /* later stage. So we pass a 0 byte output buffer. */
+ if (!DeviceIoControl( h, IOCTL_PPORTJOY_SET_STATE, &JoyState, sizeof(JoyState), NULL, 0, &RetSize, NULL))
{
- // Check event for stop thread
- //if(::WaitForSingleObject(m_StopThread, 0) == WAIT_OBJECT_0) {
- // // Set event
- // ::SetEvent(m_WaitThread);
- // return;
- //}
-
- // The effective angle for faceTracking will be < 90 degrees, so we assume a smaller range here
- Analog[0] = scale2AnalogLimits( virtRotX, -50.0f, 50.0f ); // Pitch
- Analog[1] = scale2AnalogLimits( virtRotY, -50.0f, 50.0f ); // Yaw
- Analog[2] = scale2AnalogLimits( virtRotZ, -50.0f, 50.0f ); // Roll
-
- // The effective movement for faceTracking will be < 50 cm, so we assume a smaller range here
- Analog[3] = scale2AnalogLimits( virtPosX, -40.0f, 40.0f ); // X
-
- Analog[4] = scale2AnalogLimits( virtPosY, -40.0f, 40.0f ); // Y
- Analog[5] = scale2AnalogLimits( virtPosZ, -40.0f, 40.0f ); // Z
-
- checkAnalogLimits();
-
- /* Send request to PPJoy for processing. */
- /* Currently there is no Return Code from PPJoy, this may be added at a */
- /* later stage. So we pass a 0 byte output buffer. */
- if (!DeviceIoControl( h, IOCTL_PPORTJOY_SET_STATE, &JoyState, sizeof(JoyState), NULL, 0, &RetSize, NULL))
- {
- return;
- }
- // just for lower cpu load
- //msleep(15);
- //yieldCurrentThread();
+ return;
}
}
diff --git a/FaceTrackNoIR/SCServer.cpp b/FaceTrackNoIR/SCServer.cpp index 9ee52f8d..d55d11c3 100644 --- a/FaceTrackNoIR/SCServer.cpp +++ b/FaceTrackNoIR/SCServer.cpp @@ -1,6 +1,6 @@ /********************************************************************************
-* SCServer SCServer is the Class, that communicates headpose-data *
-* to games, using the SimConnect.dll. *
+* SCServer SCServer is the Class, that communicates headpose-data *
+* to games, using the SimConnect.dll. *
* *
* Copyright (C) 2010 Wim Vriend (Developing) *
* Ron Hendriks (Testing and Research) *
@@ -21,132 +21,77 @@ ********************************************************************************/
/*
Modifications (last one on top):
+ 20101224 - WVR: Base class is no longer inheriting QThread. sendHeadposeToGame
+ is called from run() of Tracker.cpp
*/
#include "SCServer.h"
/** constructor **/
SCServer::SCServer() {
+ ProgramName = "Microsoft FSX";
+ blnSimConnectActive = false;
+ hSimConnect = NULL;
- // Create events
- //m_StopThread = CreateEvent(0, TRUE, FALSE, 0);
- //m_WaitThread = CreateEvent(0, TRUE, FALSE, 0);
+ prevPosX = 0.0f;
+ prevPosY = 0.0f;
+ prevPosZ = 0.0f;
+ prevRotX = 0.0f;
+ prevRotY = 0.0f;
+ prevRotZ = 0.0f;
- ProgramName = "";
}
/** destructor **/
SCServer::~SCServer() {
- // Trigger thread to stop
- //::SetEvent(m_StopThread);
-
- // Wait until thread finished
- //if (isRunning()) {
- // ::WaitForSingleObject(m_WaitThread, INFINITE);
- //}
-
- //// Close handles
- //::CloseHandle(m_StopThread);
- //::CloseHandle(m_WaitThread);
-
//
// Free the DLL
//
+ simconnect_close( hSimConnect );
SCClientLib.unload();
-
- //terminates the QThread and waits for finishing the QThread
- //terminate();
- //wait();
}
-/** QThread run @override **/
+//
+// Update Headpose in Game.
+//
void SCServer::sendHeadposeToGame() {
-bool blnSimConnectActive = false;
-HANDLE hSimConnect = NULL; // Handle to SimConnect
-importSimConnect_Open simconnect_open; // SimConnect function(s) in DLL
-importSimConnect_Close simconnect_close;
-importSimConnect_CameraSetRelative6DOF simconnect_set6DOF;
-
-float prevPosX, prevPosY, prevPosZ, prevRotX, prevRotY, prevRotZ;
//
- // Get the SimConnect_Open function from the DLL and use it!
+ // It's only usefull to send data, if the connection was made.
//
- simconnect_open = (importSimConnect_Open) SCClientLib.resolve("SimConnect_Open");
- if (simconnect_open == NULL) {
- qDebug() << "SCServer::run() says: SimConnect_Open function not found in DLL!";
- return;
- }
- simconnect_set6DOF = (importSimConnect_CameraSetRelative6DOF) SCClientLib.resolve("SimConnect_CameraSetRelative6DOF");
- if (simconnect_set6DOF == NULL) {
- qDebug() << "SCServer::run() says: SimConnect_CameraSetRelative6DOF function not found in DLL!";
- return;
- }
- simconnect_close = (importSimConnect_Close) SCClientLib.resolve("SimConnect_Close");
- if (simconnect_close == NULL) {
- qDebug() << "SCServer::run() says: SimConnect_Close function not found in DLL!";
- return;
- }
-
- qDebug() << "SCServer::run() says: SimConnect functions resolved in DLL!";
-
- prevPosX = 0.0f;
- prevPosY = 0.0f;
- prevPosZ = 0.0f;
- prevRotX = 0.0f;
- prevRotY = 0.0f;
- prevRotZ = 0.0f;
-
- forever
- {
- // Check event for stop thread
- //if(::WaitForSingleObject(m_StopThread, 0) == WAIT_OBJECT_0)
- //{
- // // Set event
-// simconnect_close( hSimConnect );
- // ::SetEvent(m_WaitThread);
- // return;
- //}
-
- if (!blnSimConnectActive) {
- if (SUCCEEDED(simconnect_open(&hSimConnect, "FaceTrackNoIR", NULL, 0, 0, 0))) {
- qDebug() << "SCServer::run() says: SimConnect active!";
- blnSimConnectActive = true;
- }
- //else {
- // msleep(5000);
- // yieldCurrentThread();
- //}
+ if (!blnSimConnectActive) {
+ if (SUCCEEDED(simconnect_open(&hSimConnect, "FaceTrackNoIR", NULL, 0, 0, 0))) {
+ qDebug() << "SCServer::run() says: SimConnect active!";
+ blnSimConnectActive = true;
}
- else {
- //
- // Write the 6DOF-data to FSX
- //
- // Only do this when the data has changed. This way, the HAT-switch can be used when tracking is OFF.
- //
- if ((prevPosX != virtPosX) || (prevPosY != virtPosY) || (prevPosZ != virtPosZ) ||
- (prevRotX != virtRotX) || (prevRotY != virtRotY) || (prevRotZ != virtRotZ)) {
- if (S_OK == simconnect_set6DOF(hSimConnect, virtPosX, virtPosY, virtPosZ, virtRotX, virtRotZ, virtRotY)) {
+ }
+ else {
+ //
+ // Write the 6DOF-data to FSX
+ //
+ // Only do this when the data has changed. This way, the HAT-switch can be used when tracking is OFF.
+ //
+ if ((prevPosX != virtPosX) || (prevPosY != virtPosY) || (prevPosZ != virtPosZ) ||
+ (prevRotX != virtRotX) || (prevRotY != virtRotY) || (prevRotZ != virtRotZ)) {
+ if (S_OK == simconnect_set6DOF(hSimConnect, virtPosX, virtPosY, virtPosZ, virtRotX, virtRotZ, virtRotY)) {
// qDebug() << "SCServer::run() says: SimConnect data written!";
- }
}
-
- prevPosX = virtPosX;
- prevPosY = virtPosY;
- prevPosZ = virtPosZ;
- prevRotX = virtRotX;
- prevRotY = virtRotY;
- prevRotZ = virtRotZ;
-
- // just for lower cpu load
- //msleep(15);
- //yieldCurrentThread();
}
+
+ prevPosX = virtPosX;
+ prevPosY = virtPosY;
+ prevPosZ = virtPosZ;
+ prevRotX = virtRotX;
+ prevRotY = virtRotY;
+ prevRotZ = virtRotZ;
}
}
//
// Check if the Client DLL exists and load it (to test it), if so.
+// SimConnect uses a 'side-by-side' installation. The manifest is loaded and (if that's OK) the
+// right DLL will be loaded automatically...
+//
// Returns 'true' if all seems OK.
//
bool SCServer::checkServerInstallationOK( HANDLE handle )
@@ -209,6 +154,28 @@ bool SCServer::checkServerInstallationOK( HANDLE handle ) } catch(...) {
return false;
}
+
+ //
+ // Get the functions from the DLL.
+ //
+ simconnect_open = (importSimConnect_Open) SCClientLib.resolve("SimConnect_Open");
+ if (simconnect_open == NULL) {
+ qDebug() << "SCServer::run() says: SimConnect_Open function not found in DLL!";
+ return false;
+ }
+ simconnect_set6DOF = (importSimConnect_CameraSetRelative6DOF) SCClientLib.resolve("SimConnect_CameraSetRelative6DOF");
+ if (simconnect_set6DOF == NULL) {
+ qDebug() << "SCServer::run() says: SimConnect_CameraSetRelative6DOF function not found in DLL!";
+ return false;
+ }
+ simconnect_close = (importSimConnect_Close) SCClientLib.resolve("SimConnect_Close");
+ if (simconnect_close == NULL) {
+ qDebug() << "SCServer::run() says: SimConnect_Close function not found in DLL!";
+ return false;
+ }
+
+ qDebug() << "SCServer::run() says: SimConnect functions resolved in DLL!";
+
return true;
}
diff --git a/FaceTrackNoIR/SCServer.h b/FaceTrackNoIR/SCServer.h index f107de55..eea55376 100644 --- a/FaceTrackNoIR/SCServer.h +++ b/FaceTrackNoIR/SCServer.h @@ -71,6 +71,14 @@ private: QString ProgramName;
QLibrary SCClientLib;
+ bool blnSimConnectActive;
+ HANDLE hSimConnect; // Handle to SimConnect
+ importSimConnect_Open simconnect_open; // SimConnect function(s) in DLL
+ importSimConnect_Close simconnect_close;
+ importSimConnect_CameraSetRelative6DOF simconnect_set6DOF;
+
+float prevPosX, prevPosY, prevPosZ, prevRotX, prevRotY, prevRotZ;
+
public:
void setVirtRotX(float rot) { virtRotX = -1.0f * rot; } // degrees
void setVirtRotY(float rot) { virtRotY = -1.0f * rot; }
diff --git a/bin/FaceTrackNoIR.exe b/bin/FaceTrackNoIR.exe Binary files differindex 261c34e2..766e6d6f 100644 --- a/bin/FaceTrackNoIR.exe +++ b/bin/FaceTrackNoIR.exe diff --git a/bin/Settings/FlightGear.ini b/bin/Settings/FlightGear.ini index f5da570d..86e023fe 100644 --- a/bin/Settings/FlightGear.ini +++ b/bin/Settings/FlightGear.ini @@ -1,12 +1,5 @@ [Tracking]
-Smooth=3
-NeutralZone=5
-sensYaw=300
-sensPitch=300
-sensRoll=300
-sensX=189
-sensY=185
-sensZ=189
+Smooth=2
invertYaw=false
invertPitch=false
invertRoll=false
@@ -24,56 +17,5 @@ redZ=70 [GameProtocol]
Selection=1
-[KB_Shortcuts]
-Keycode_Center=59
-Shift_Center=false
-Ctrl_Center=false
-Alt_Center=false
-Keycode_StartStop=60
-Shift_StartStop=false
-Ctrl_StartStop=false
-Alt_StartStop=false
-Keycode_Inhibit=0
-Shift_Inhibit=false
-Ctrl_Inhibit=false
-Alt_Inhibit=false
-Inhibit_Pitch=false
-Inhibit_Yaw=false
-Inhibit_Roll=false
-Inhibit_X=false
-Inhibit_Y=false
-Inhibit_Z=false
-
-[Curves]
-Yaw_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\x14\0\0\0\0\0\0)
-Yaw_point2=@Variant(\0\0\0\x1a@W\xc0\0\0\0\0\0@2\0\0\0\0\0\0)
-Yaw_point3=@Variant(\0\0\0\x1a@b\xa0\0\0\0\0\0@&\0\0\0\0\0\0)
-Yaw_point4=@Variant(\0\0\0\x1a@b\xc0\0\0\0\0\0@I\0\0\0\0\0\0)
-Pitch_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\x14\0\0\0\0\0\0)
-Pitch_point2=@Variant(\0\0\0\x1a@I\0\0\0\0\0\0@1\0\0\0\0\0\0)
-Pitch_point3=@Variant(\0\0\0\x1a@Y\0\0\0\0\0\0@@\x80\0\0\0\0\0)
-Pitch_point4=@Variant(\0\0\0\x1a@b\xc0\0\0\0\0\0@I\0\0\0\0\0\0)
-Roll_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\x14\0\0\0\0\0\0)
-Roll_point2=@Variant(\0\0\0\x1a@I\0\0\0\0\0\0@1\0\0\0\0\0\0)
-Roll_point3=@Variant(\0\0\0\x1a@Y\0\0\0\0\0\0@@\x80\0\0\0\0\0)
-Roll_point4=@Variant(\0\0\0\x1a@b\xc0\0\0\0\0\0@I\0\0\0\0\0\0)
-X_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\x14\0\0\0\0\0\0)
-X_point2=@Variant(\0\0\0\x1a@?\0\0\0\0\0\0@1\0\0\0\0\0\0)
-X_point3=@Variant(\0\0\0\x1a@O\x80\0\0\0\0\0@@\x80\0\0\0\0\0)
-X_point4=@Variant(\0\0\0\x1a@W\xc0\0\0\0\0\0@I\0\0\0\0\0\0)
-Y_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\x14\0\0\0\0\0\0)
-Y_point2=@Variant(\0\0\0\x1a@?\0\0\0\0\0\0@1\0\0\0\0\0\0)
-Y_point3=@Variant(\0\0\0\x1a@O\0\0\0\0\0\0@@\x80\0\0\0\0\0)
-Y_point4=@Variant(\0\0\0\x1a@W@\0\0\0\0\0@I\0\0\0\0\0\0)
-Z_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\x14\0\0\0\0\0\0)
-Z_point2=@Variant(\0\0\0\x1a@?\0\0\0\0\0\0@1\0\0\0\0\0\0)
-Z_point3=@Variant(\0\0\0\x1a@O\x80\0\0\0\0\0@@\x80\0\0\0\0\0)
-Z_point4=@Variant(\0\0\0\x1a@W\xc0\0\0\0\0\0@I\0\0\0\0\0\0)
-
-[FG]
-LocalPCOnly=true
-IP-1=127
-IP-2=0
-IP-3=0
-IP-4=1
-PortNumber=5550
+[TrackerSource]
+Selection=0
|