Remove Faceshift
Showing the changes to interface/src/Application.cpp (1 of 31 files). Show all
Unified · Split
| @@ -128,6 +128,7 @@ · 127 unmodified lines | ||
| 128 | 128 | #include <QmlWebWindowClass.h> |
| 129 | 129 | #include <Preferences.h> |
| 130 | 130 | #include <display-plugins/CompositorHelper.h> |
| 131 | +#include <trackers/EyeTracker.h> | |
| 131 | 132 | |
| 132 | 133 | |
| 133 | 134 | #include "AudioClient.h" |
| @@ -136,8 +137,6 @@ · 2 unmodified lines | ||
| 136 | 137 | #include "avatar/ScriptAvatar.h" |
| 137 | 138 | #include "CrashHandler.h" |
| 138 | 139 | #include "devices/DdeFaceTracker.h" |
| 139 | −#include "devices/EyeTracker.h" | |
| 140 | −#include "devices/Faceshift.h" | |
| 141 | 140 | #include "devices/Leapmotion.h" |
| 142 | 141 | #include "DiscoverabilityManager.h" |
| 143 | 142 | #include "GLCanvas.h" |
| @@ -480,7 +479,6 @@ bool setupEssentials(int& argc, char** argv) { · 336 unmodified lines | ||
| 480 | 479 | DependencyManager::set<ModelCache>(); |
| 481 | 480 | DependencyManager::set<ScriptCache>(); |
| 482 | 481 | DependencyManager::set<SoundCache>(); |
| 483 | − DependencyManager::set<Faceshift>(); | |
| 484 | 482 | DependencyManager::set<DdeFaceTracker>(); |
| 485 | 483 | DependencyManager::set<EyeTracker>(); |
| 486 | 484 | DependencyManager::set<AudioClient>(); |
| @@ -1210,10 +1208,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 723 unmodified lines | ||
| 1210 | 1208 | |
| 1211 | 1209 | this->installEventFilter(this); |
| 1212 | 1210 | |
| 1213 | − // initialize our face trackers after loading the menu settings | |
| 1214 | − auto faceshiftTracker = DependencyManager::get<Faceshift>(); | |
| 1215 | − faceshiftTracker->init(); | |
| 1216 | − connect(faceshiftTracker.data(), &FaceTracker::muteToggled, this, &Application::faceTrackerMuteToggled); | |
| 1217 | 1211 | #ifdef HAVE_DDE |
| 1218 | 1212 | auto ddeTracker = DependencyManager::get<DdeFaceTracker>(); |
| 1219 | 1213 | ddeTracker->init(); |
| @@ -3626,20 +3620,13 @@ ivec2 Application::getMouse() const { · 2406 unmodified lines | ||
| 3626 | 3620 | } |
| 3627 | 3621 | |
| 3628 | 3622 | FaceTracker* Application::getActiveFaceTracker() { |
| 3629 | − auto faceshift = DependencyManager::get<Faceshift>(); | |
| 3630 | 3623 | auto dde = DependencyManager::get<DdeFaceTracker>(); |
| 3631 | 3624 | |
| 3632 | − return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : | |
| 3633 | − (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) : nullptr)); | |
| 3625 | + return dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : nullptr; | |
| 3634 | 3626 | } |
| 3635 | 3627 | |
| 3636 | 3628 | FaceTracker* Application::getSelectedFaceTracker() { |
| 3637 | 3629 | FaceTracker* faceTracker = nullptr; |
| 3638 | −#ifdef HAVE_FACESHIFT | |
| 3639 | − if (Menu::getInstance()->isOptionChecked(MenuOption::Faceshift)) { | |
| 3640 | − faceTracker = DependencyManager::get<Faceshift>().data(); | |
| 3641 | − } | |
| 3642 | −#endif | |
| 3643 | 3630 | #ifdef HAVE_DDE |
| 3644 | 3631 | if (Menu::getInstance()->isOptionChecked(MenuOption::UseCamera)) { |
| 3645 | 3632 | faceTracker = DependencyManager::get<DdeFaceTracker>().data(); |
| @@ -3649,15 +3636,8 @@ FaceTracker* Application::getSelectedFaceTracker() { · 3 unmodified lines | ||
| 3649 | 3636 | } |
| 3650 | 3637 | |
| 3651 | 3638 | void Application::setActiveFaceTracker() const { |
| 3652 | −#if defined(HAVE_FACESHIFT) || defined(HAVE_DDE) | |
| 3653 | − bool isMuted = Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking); | |
| 3654 | −#endif | |
| 3655 | −#ifdef HAVE_FACESHIFT | |
| 3656 | − auto faceshiftTracker = DependencyManager::get<Faceshift>(); | |
| 3657 | − faceshiftTracker->setIsMuted(isMuted); | |
| 3658 | − faceshiftTracker->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift) && !isMuted); | |
| 3659 | −#endif | |
| 3660 | 3639 | #ifdef HAVE_DDE |
| 3640 | + bool isMuted = Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking); | |
| 3661 | 3641 | bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::UseCamera); |
| 3662 | 3642 | Menu::getInstance()->getActionForOption(MenuOption::BinaryEyelidControl)->setVisible(isUsingDDE); |
| 3663 | 3643 | Menu::getInstance()->getActionForOption(MenuOption::CoupleEyelids)->setVisible(isUsingDDE); |
| @@ -5133,7 +5113,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 1469 unmodified lines | ||
| 5133 | 5113 | } |
| 5134 | 5114 | |
| 5135 | 5115 | void Application::resetSensors(bool andReload) { |
| 5136 | − DependencyManager::get<Faceshift>()->reset(); | |
| 5137 | 5116 | DependencyManager::get<DdeFaceTracker>()->reset(); |
| 5138 | 5117 | DependencyManager::get<EyeTracker>()->reset(); |
| 5139 | 5118 | getActiveDisplayPlugin()->resetSensors(); |