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

Code tidying

Browse source
This commit is contained in:
David Rowe 2015-04-17 10:35:48 -07:00
parent d60ee3b6e2
commit c823fcd083
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,6 +134,8 @@ struct Packet {
char name[MAX_NAME_SIZE + 1]; char name[MAX_NAME_SIZE + 1];
}; };
const float STARTING_DDE_MESSAGE_TIME = 0.033f;
DdeFaceTracker::DdeFaceTracker() : DdeFaceTracker::DdeFaceTracker() :
DdeFaceTracker(QHostAddress::Any, DDE_SERVER_PORT, DDE_CONTROL_PORT) DdeFaceTracker(QHostAddress::Any, DDE_SERVER_PORT, DDE_CONTROL_PORT)
{ {
@ -158,7 +160,15 @@ DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 serverPort, qui
_browUpRightIndex(18), _browUpRightIndex(18),
_mouthSmileLeftIndex(28), _mouthSmileLeftIndex(28),
_mouthSmileRightIndex(29), _mouthSmileRightIndex(29),
_jawOpenIndex(21) _jawOpenIndex(21),
_lastMessageReceived(0),
_averageMessageTime(STARTING_DDE_MESSAGE_TIME),
_lastHeadTranslation(glm::vec3(0.0f)),
_filteredHeadTranslation(glm::vec3(0.0f)),
_lastLeftEyeBlink(0.0f),
_filteredLeftEyeBlink(0.0f),
_lastRightEyeBlink(0.0f),
_filteredRightEyeBlink(0.0f)
{ {
_coefficients.resize(NUM_FACESHIFT_BLENDSHAPES); _coefficients.resize(NUM_FACESHIFT_BLENDSHAPES);
@ -392,7 +402,7 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) {
} }
_lastMessageReceived = usecsNow; _lastMessageReceived = usecsNow;
} else { } else {
qCDebug(interfaceapp) << "[Error] DDE Face Tracker Decode Error"; qCDebug(interfaceapp) << "[Error] DDE Face Tracker Decode Error";
} }
_lastReceiveTimestamp = usecTimestampNow(); _lastReceiveTimestamp = usecTimestampNow();

18
interface/src/devices/DdeFaceTracker.h
View file

@ -23,8 +23,6 @@
#include "FaceTracker.h" #include "FaceTracker.h"
const float STARTING_DDE_MESSAGE_TIME = 0.033f;
class DdeFaceTracker : public FaceTracker, public Dependency { class DdeFaceTracker : public FaceTracker, public Dependency {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
@ -103,14 +101,14 @@ private:
QVector<float> _coefficients; QVector<float> _coefficients;
quint64 _lastMessageReceived = 0; quint64 _lastMessageReceived;
float _averageMessageTime = STARTING_DDE_MESSAGE_TIME; float _averageMessageTime;
glm::vec3 _lastHeadTranslation = glm::vec3(0.0f); glm::vec3 _lastHeadTranslation;
glm::vec3 _filteredHeadTranslation = glm::vec3(0.0f); glm::vec3 _filteredHeadTranslation;
float _lastLeftEyeBlink = 0.0f; float _lastLeftEyeBlink;
float _filteredLeftEyeBlink = 0.0f; float _filteredLeftEyeBlink;
float _lastRightEyeBlink = 0.0f; float _lastRightEyeBlink;
float _filteredRightEyeBlink = 0.0f; float _filteredRightEyeBlink;
}; };
#endif // hifi_DdeFaceTracker_h #endif // hifi_DdeFaceTracker_h