History

Merge pull request #10327 from jherico/face_tracker_refactor

Remove Faceshift

Brad Davis committed 9 years ago

Commit 40e4e2f2 parents 9fab66b 2b43a1931 files · +144 −676Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 31 files). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+0−8
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 #include <AudioClient.h>
1212 #include <avatar/AvatarManager.h>
1313 #include <devices/DdeFaceTracker.h>
14−#include <devices/Faceshift.h>
1514 #include <NetworkingConstants.h>
1615 #include <ScriptEngines.h>
1716 #include <OffscreenUi.h>
@@ -202,13 +201,6 @@ void setupPreferences() { · 184 unmodified lines
202201 auto setter = [](float value) { FaceTracker::setEyeDeflection(value); };
203202 preferences->addPreference(new SliderPreference(AVATAR_TUNING, "Face tracker eye deflection", getter, setter));
204203 }
205− {
206− auto getter = []()->QString { return DependencyManager::get<Faceshift>()->getHostname(); };
207− auto setter = [](const QString& value) { DependencyManager::get<Faceshift>()->setHostname(value); };
208− auto preference = new EditPreference(AVATAR_TUNING, "Faceshift hostname", getter, setter);
209− preference->setPlaceholderText("localhost");
210− preferences->addPreference(preference);
211− }
212204 {
213205 auto getter = [=]()->QString { return myAvatar->getAnimGraphOverrideUrl().toString(); };
214206 auto setter = [=](const QString& value) { myAvatar->setAnimGraphOverrideUrl(QUrl(value)); };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t