History

Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit

ZappoMan committed 11 years ago

Commit ca432a42 parents fd93b99 323085742 files · +2633 −2388Browse files

Showing the changes to interface/src/Application.cpp (1 of 42 files). Show all

Unified · Split

interface/src/Application.cpp+11−0
@@ -1626,6 +1626,16 @@ FaceTracker* Application::getActiveFaceTracker() { · 1625 unmodified lines
16261626 (visage->isActive() ? static_cast<FaceTracker*>(visage.data()) : NULL)));
16271627 }
16281628
1629+void Application::setActiveFaceTracker() {
1630+#ifdef HAVE_FACESHIFT
1631+ DependencyManager::get<Faceshift>()->setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
1632+#endif
1633+ DependencyManager::get<DdeFaceTracker>()->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression));
1634+#ifdef HAVE_VISAGE
1635+ DependencyManager::get<Visage>()->updateEnabled();
1636+#endif
1637+}
1638+
16291639 bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
16301640 QVector<EntityItem*> entities;
16311641 _entities.getTree()->findEntities(AACube(glm::vec3(x / (float)TREE_SCALE,
@@ -1743,6 +1753,7 @@ void Application::init() { · 111 unmodified lines
17431753
17441754 // initialize our face trackers after loading the menu settings
17451755 DependencyManager::get<Faceshift>()->init();
1756+ DependencyManager::get<DdeFaceTracker>()->init();
17461757 DependencyManager::get<Visage>()->init();
17471758
17481759 Leapmotion::init();

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