Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-08 14:19:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjustment to UDP code.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-09-10 16:55:59 -07:00
parent 5c7913068e
commit b9878bbbd6
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,12 +26,12 @@ Faceshift::Faceshift() :
_eyeGazeRightYaw(0.0f), _eyeGazeRightYaw(0.0f),
_leftBlink(0.0f), _leftBlink(0.0f),
_rightBlink(0.0f), _rightBlink(0.0f),
_leftBlinkIndex(-1), _leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
_rightBlinkIndex(-1), _rightBlinkIndex(1),
_browHeight(0.0f), _browHeight(0.0f),
_browUpCenterIndex(-1), _browUpCenterIndex(16),
_mouthSize(0.0f), _mouthSize(0.0f),
_jawOpenIndex(-1), _jawOpenIndex(21),
_longTermAverageEyePitch(0.0f), _longTermAverageEyePitch(0.0f),
_longTermAverageEyeYaw(0.0f), _longTermAverageEyeYaw(0.0f),
_estimatedEyePitch(0.0f), _estimatedEyePitch(0.0f),
@ -41,7 +41,7 @@ Faceshift::Faceshift() :
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()));
connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readFromSocket())); connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams()));
_udpSocket.bind(FACESHIFT_PORT); _udpSocket.bind(FACESHIFT_PORT);
} }
@ -109,8 +109,24 @@ void Faceshift::noteError(QAbstractSocket::SocketError error) {
} }
} }
void Faceshift::readPendingDatagrams() {
QByteArray buffer;
while (_udpSocket.hasPendingDatagrams()) {
buffer.resize(_udpSocket.pendingDatagramSize());
_udpSocket.readDatagram(buffer.data(), buffer.size());
receive(buffer);
}
}
void Faceshift::readFromSocket() { void Faceshift::readFromSocket() {
QByteArray buffer = static_cast<QIODevice*>(sender())->readAll(); receive(_tcpSocket.readAll());
}
void Faceshift::send(const std::string& message) {
_tcpSocket.write(message.data(), message.size());
}
void Faceshift::receive(const QByteArray& buffer) {
_stream.received(buffer.size(), buffer.constData()); _stream.received(buffer.size(), buffer.constData());
fsMsgPtr msg; fsMsgPtr msg;
for (fsMsgPtr msg; (msg = _stream.get_message()); ) { for (fsMsgPtr msg; (msg = _stream.get_message()); ) {
@ -167,7 +183,3 @@ void Faceshift::readFromSocket() {
} }
_lastMessageReceived = usecTimestampNow(); _lastMessageReceived = usecTimestampNow();
} }
void Faceshift::send(const std::string& message) {
_tcpSocket.write(message.data(), message.size());
}

2
interface/src/devices/Faceshift.h
View file

@ -58,11 +58,13 @@ private slots:
void connectSocket(); void connectSocket();
void noteConnected(); void noteConnected();
void noteError(QAbstractSocket::SocketError error); void noteError(QAbstractSocket::SocketError error);
void readPendingDatagrams();
void readFromSocket(); void readFromSocket();
private: private:
void send(const std::string& message); void send(const std::string& message);
void receive(const QByteArray& buffer);
QTcpSocket _tcpSocket; QTcpSocket _tcpSocket;
QUdpSocket _udpSocket; QUdpSocket _udpSocket;