Showing the changes to interface/src/Application.cpp (1 of 42 files). Show all
Unified · Split
| @@ -1626,6 +1626,16 @@ FaceTracker* Application::getActiveFaceTracker() { · 1625 unmodified lines | |||
| 1626 | (visage->isActive() ? static_cast<FaceTracker*>(visage.data()) : NULL))); | 1626 | (visage->isActive() ? static_cast<FaceTracker*>(visage.data()) : NULL))); |
| 1627 | } | 1627 | } |
| 1628 | 1628 | ||
| 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 | |||
| 1629 | bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) { | 1639 | bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) { |
| 1630 | QVector<EntityItem*> entities; | 1640 | QVector<EntityItem*> entities; |
| 1631 | _entities.getTree()->findEntities(AACube(glm::vec3(x / (float)TREE_SCALE, | 1641 | _entities.getTree()->findEntities(AACube(glm::vec3(x / (float)TREE_SCALE, |
| @@ -1743,6 +1753,7 @@ void Application::init() { · 111 unmodified lines | |||
| 1743 | 1753 | ||
| 1744 | // initialize our face trackers after loading the menu settings | 1754 | // initialize our face trackers after loading the menu settings |
| 1745 | DependencyManager::get<Faceshift>()->init(); | 1755 | DependencyManager::get<Faceshift>()->init(); |
| 1756 | DependencyManager::get<DdeFaceTracker>()->init(); | ||
| 1746 | DependencyManager::get<Visage>()->init(); | 1757 | DependencyManager::get<Visage>()->init(); |
| 1747 | 1758 | ||
| 1748 | Leapmotion::init(); | 1759 | Leapmotion::init(); |