Merge pull request #4313 from ctrlaltdavid/20355

CR for 20355 - Initial Integration with DDE

Andrew Meadows committed 11 years ago

Commit 0455ccf2 parents 2519f66 f169ab114 files · +103 −92Browse files

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

Unified · Split

              (visage->isActive() ? static_cast<FaceTracker*>(visage.data()) : NULL)));
 }
+void Application::setActiveFaceTracker() {
+#ifdef HAVE_FACESHIFT
+    DependencyManager::get<Faceshift>()->setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
+#endif
+    DependencyManager::get<DdeFaceTracker>()->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression));
+#ifdef HAVE_VISAGE
+    DependencyManager::get<Visage>()->updateEnabled();
+#endif
+}
 bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
     QVector<EntityItem*> entities;
     _entities.getTree()->findEntities(AACube(glm::vec3(x / (float)TREE_SCALE,
     // initialize our face trackers after loading the menu settings
     DependencyManager::get<Faceshift>()->init();
+    DependencyManager::get<DdeFaceTracker>()->init();
     DependencyManager::get<Visage>()->init();
     Leapmotion::init();

Keyboard shortcuts