Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 17:00:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

repairs to stubbed faceshft constructor

Browse source
This commit is contained in:
Stephen Birarda 2014-07-22 14:38:41 -07:00
parent 6f0f6488d5
commit f325500d14
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/devices/Faceshift.cpp
View file

@ -27,8 +27,6 @@ using namespace std;
const quint16 FACESHIFT_PORT = 33433; const quint16 FACESHIFT_PORT = 33433;
#ifdef HAVE_FACESHIFT
Faceshift::Faceshift() : Faceshift::Faceshift() :
_tcpEnabled(true), _tcpEnabled(true),
_tcpRetryCount(0), _tcpRetryCount(0),
@ -53,6 +51,7 @@ Faceshift::Faceshift() :
_longTermAverageEyeYaw(0.0f), _longTermAverageEyeYaw(0.0f),
_longTermAverageInitialized(false) _longTermAverageInitialized(false)
{ {
#ifdef HAVE_FACESHIFT
connect(&_tcpSocket, SIGNAL(connected()), SLOT(noteConnected())); connect(&_tcpSocket, SIGNAL(connected()), SLOT(noteConnected()));
connect(&_tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(noteError(QAbstractSocket::SocketError))); connect(&_tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(noteError(QAbstractSocket::SocketError)));
connect(&_tcpSocket, SIGNAL(readyRead()), SLOT(readFromSocket())); connect(&_tcpSocket, SIGNAL(readyRead()), SLOT(readFromSocket()));
@ -61,18 +60,13 @@ Faceshift::Faceshift() :
connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams())); connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams()));
_udpSocket.bind(FACESHIFT_PORT); _udpSocket.bind(FACESHIFT_PORT);
}
#else
Faceshift::Faceshift() {
}
#endif #endif
}
void Faceshift::init() { void Faceshift::init() {
#ifdef HAVE_FACESHIFT
setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift)); setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
#endif
} }
bool Faceshift::isConnectedOrConnecting() const { bool Faceshift::isConnectedOrConnecting() const {