diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index a88954d64b..560f72807b 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -275,8 +275,6 @@ Menu::Menu() : appInstance->getGlowEffect(), SLOT(cycleRenderMode())); - addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::UseFaceshiftRig, 0, false, - appInstance->getFaceshift(), SLOT(setUsingRig(bool))); addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::UsePerlinFace, 0, false); addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::LookAtVectors, 0, true); addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::LookAtIndicator, 0, true); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 081810d374..78ef65221c 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -199,7 +199,6 @@ namespace MenuOption { const QString TestRaveGlove = "Test Rave Glove"; const QString TreeStats = "Calculate Tree Stats"; const QString TransmitterDrive = "Transmitter Drive"; - const QString UseFaceshiftRig = "Use Faceshift Rig"; const QString UsePerlinFace = "Use Perlin's Face"; const QString Quit = "Quit"; const QString Webcam = "Webcam"; diff --git a/interface/src/avatar/BlendFace.cpp b/interface/src/avatar/BlendFace.cpp index 63b8a2db6e..8967991ca3 100644 --- a/interface/src/avatar/BlendFace.cpp +++ b/interface/src/avatar/BlendFace.cpp @@ -140,41 +140,6 @@ glm::vec3 createVec3(const fsVector3f& vector) { return glm::vec3(vector.x, vector.y, vector.z); } -void BlendFace::setRig(const fsMsgRig& rig) { - // convert to FBX geometry - FBXGeometry geometry; - - for (vector::const_iterator it = rig.mesh().m_quads.begin(), end = rig.mesh().m_quads.end(); it != end; it++) { - geometry.quadIndices.append(it->x); - geometry.quadIndices.append(it->y); - geometry.quadIndices.append(it->z); - geometry.quadIndices.append(it->w); - } - - for (vector::const_iterator it = rig.mesh().m_tris.begin(), end = rig.mesh().m_tris.end(); it != end; it++) { - geometry.triangleIndices.append(it->x); - geometry.triangleIndices.append(it->y); - geometry.triangleIndices.append(it->z); - } - - for (vector::const_iterator it = rig.mesh().m_vertex_data.m_vertices.begin(), - end = rig.mesh().m_vertex_data.m_vertices.end(); it != end; it++) { - geometry.vertices.append(glm::vec3(it->x, it->y, it->z)); - } - - for (vector::const_iterator it = rig.blendshapes().begin(), end = rig.blendshapes().end(); it != end; it++) { - FBXBlendshape blendshape; - for (int i = 0, n = it->m_vertices.size(); i < n; i++) { - // subtract the base vertex position; we want the deltas - blendshape.vertices.append(createVec3(it->m_vertices[i]) - geometry.vertices[i]); - blendshape.indices.append(i); - } - geometry.blendshapes.append(blendshape); - } - - setGeometry(geometry); -} - void BlendFace::handleModelDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) { if (bytesReceived < bytesTotal && !_modelReply->isFinished()) { return; diff --git a/interface/src/avatar/BlendFace.h b/interface/src/avatar/BlendFace.h index 24ff1dd3a3..336d6cc5f0 100644 --- a/interface/src/avatar/BlendFace.h +++ b/interface/src/avatar/BlendFace.h @@ -12,8 +12,6 @@ #include #include -#include - #include "InterfaceConfig.h" #include "renderer/FBXReader.h" @@ -36,10 +34,6 @@ public: Q_INVOKABLE void setModelURL(const QUrl& url); const QUrl& getModelURL() const { return _modelURL; } - -public slots: - - void setRig(const fs::fsMsgRig& rig); private slots: diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 16718948f0..794ad7cf95 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -59,14 +59,6 @@ MyAvatar::MyAvatar(Node* owningNode) : _collisionRadius = _height * COLLISION_RADIUS_SCALE; } -void MyAvatar::init() { - Avatar::init(); - - // when we receive a Faceshift rig, apply it to our own blend face - _head.getBlendFace().connect(Application::getInstance()->getFaceshift(), SIGNAL(rigReceived(fs::fsMsgRig)), - SLOT(setRig(fs::fsMsgRig))); -} - void MyAvatar::reset() { _head.reset(); _hand.reset(); diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index cadc55018c..f6ec055496 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -15,7 +15,6 @@ class MyAvatar : public Avatar { public: MyAvatar(Node* owningNode = NULL); - void init(); void reset(); void simulate(float deltaTime, Transmitter* transmitter, float gyroCameraSensitivity); void updateFromGyrosAndOrWebcam(bool gyroLook, float pitchFromTouch); diff --git a/interface/src/devices/Faceshift.cpp b/interface/src/devices/Faceshift.cpp index 8ca18d74ce..c1b1dfcb52 100644 --- a/interface/src/devices/Faceshift.cpp +++ b/interface/src/devices/Faceshift.cpp @@ -87,17 +87,6 @@ void Faceshift::setTCPEnabled(bool enabled) { } } -void Faceshift::setUsingRig(bool usingRig) { - if (usingRig && _tcpSocket.state() == QAbstractSocket::ConnectedState) { - string message; - fsBinaryStream::encode_message(message, fsMsgSendRig()); - send(message); - - } else { - emit rigReceived(fsMsgRig()); - } -} - void Faceshift::connectSocket() { if (_tcpEnabled) { qDebug("Faceshift: Connecting...\n"); @@ -114,11 +103,6 @@ void Faceshift::noteConnected() { string message; fsBinaryStream::encode_message(message, fsMsgSendBlendshapeNames()); send(message); - - // if using faceshift rig, request it - if (Menu::getInstance()->isOptionChecked(MenuOption::UseFaceshiftRig)) { - setUsingRig(true); - } } void Faceshift::noteError(QAbstractSocket::SocketError error) { @@ -214,11 +198,6 @@ void Faceshift::receive(const QByteArray& buffer) { } break; } - case fsMsg::MSG_OUT_RIG: { - fsMsgRig* rig = static_cast(msg.get()); - emit rigReceived(*rig); - break; - } default: break; } diff --git a/interface/src/devices/Faceshift.h b/interface/src/devices/Faceshift.h index dc42a4e9c6..1b93c717a5 100644 --- a/interface/src/devices/Faceshift.h +++ b/interface/src/devices/Faceshift.h @@ -60,15 +60,10 @@ public: void update(); void reset(); - -signals: - - void rigReceived(const fs::fsMsgRig& rig); public slots: void setTCPEnabled(bool enabled); - void setUsingRig(bool usingRig); private slots: