Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 17:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes required since enabling Faceshift is now the default.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-03-13 16:45:27 -07:00
parent 92bc675c97
commit 5f6f4b3d37
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/interface_en.ts
View file

@ -14,12 +14,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3560"/>
<location filename="src/Application.cpp" line="3561"/>
<source>Open Script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3561"/>
<location filename="src/Application.cpp" line="3562"/>
<source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation>
</message>

3
interface/src/Application.cpp
View file

@ -1525,7 +1525,8 @@ void Application::init() {
}
qDebug("Loaded settings");
// initialize Visage after loading the menu settings
// initialize Visage and Faceshift after loading the menu settings
_faceshift.init();
_visage.init();
// fire off an immediate domain-server check in now that settings are loaded

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

@ -21,7 +21,7 @@ using namespace std;
const quint16 FACESHIFT_PORT = 33433;
Faceshift::Faceshift() :
_tcpEnabled(false),
_tcpEnabled(true),
_tcpRetryCount(0),
_lastTrackingStateReceived(0),
_eyeGazeLeftPitch(0.0f),
@ -56,6 +56,10 @@ Faceshift::Faceshift() :
_udpSocket.bind(FACESHIFT_PORT);
}
void Faceshift::init() {
setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
}
bool Faceshift::isConnectedOrConnecting() const {
return _tcpSocket.state() == QAbstractSocket::ConnectedState ||
(_tcpRetryCount == 0 && _tcpSocket.state() != QAbstractSocket::UnconnectedState);

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

@ -27,6 +27,8 @@ public:
Faceshift();
void init();
bool isConnectedOrConnecting() const;
bool isActive() const;