CR for 20355 - Initial Integration with DDE
Showing the changes to interface/src/Application.cpp (1 of 14 files). Show all
Unified · Split
| @@ -1624,6 +1624,16 @@ FaceTracker* Application::getActiveFaceTracker() { · 1623 unmodified lines | ||
| 1624 | 1624 | (visage->isActive() ? static_cast<FaceTracker*>(visage.data()) : NULL))); |
| 1625 | 1625 | } |
| 1626 | 1626 | |
| 1627 | +void Application::setActiveFaceTracker() { | |
| 1628 | +#ifdef HAVE_FACESHIFT | |
| 1629 | + DependencyManager::get<Faceshift>()->setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift)); | |
| 1630 | +#endif | |
| 1631 | + DependencyManager::get<DdeFaceTracker>()->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression)); | |
| 1632 | +#ifdef HAVE_VISAGE | |
| 1633 | + DependencyManager::get<Visage>()->updateEnabled(); | |
| 1634 | +#endif | |
| 1635 | +} | |
| 1636 | + | |
| 1627 | 1637 | bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) { |
| 1628 | 1638 | QVector<EntityItem*> entities; |
| 1629 | 1639 | _entities.getTree()->findEntities(AACube(glm::vec3(x / (float)TREE_SCALE, |
| @@ -1741,6 +1751,7 @@ void Application::init() { · 111 unmodified lines | ||
| 1741 | 1751 | |
| 1742 | 1752 | // initialize our face trackers after loading the menu settings |
| 1743 | 1753 | DependencyManager::get<Faceshift>()->init(); |
| 1754 | + DependencyManager::get<DdeFaceTracker>()->init(); | |
| 1744 | 1755 | DependencyManager::get<Visage>()->init(); |
| 1745 | 1756 | |
| 1746 | 1757 | Leapmotion::init(); |