History

Merge pull request #10327 from jherico/face_tracker_refactor

Remove Faceshift

Brad Davis committed 9 years ago

Commit 40e4e2f2 parents 9fab66b 2b43a1931 files · +144 −676Browse files

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

Unified · Split

interface/src/Application.cpp+3−24
@@ -128,6 +128,7 @@ · 127 unmodified lines
128#include <QmlWebWindowClass.h>128#include <QmlWebWindowClass.h>
129#include <Preferences.h>129#include <Preferences.h>
130#include <display-plugins/CompositorHelper.h>130#include <display-plugins/CompositorHelper.h>
131#include <trackers/EyeTracker.h>
131 132
132 133
133#include "AudioClient.h"134#include "AudioClient.h"
@@ -136,8 +137,6 @@ · 2 unmodified lines
136#include "avatar/ScriptAvatar.h"137#include "avatar/ScriptAvatar.h"
137#include "CrashHandler.h"138#include "CrashHandler.h"
138#include "devices/DdeFaceTracker.h"139#include "devices/DdeFaceTracker.h"
139#include "devices/EyeTracker.h"
140#include "devices/Faceshift.h"
141#include "devices/Leapmotion.h"140#include "devices/Leapmotion.h"
142#include "DiscoverabilityManager.h"141#include "DiscoverabilityManager.h"
143#include "GLCanvas.h"142#include "GLCanvas.h"
@@ -480,7 +479,6 @@ bool setupEssentials(int& argc, char** argv) { · 336 unmodified lines
480 DependencyManager::set<ModelCache>();479 DependencyManager::set<ModelCache>();
481 DependencyManager::set<ScriptCache>();480 DependencyManager::set<ScriptCache>();
482 DependencyManager::set<SoundCache>();481 DependencyManager::set<SoundCache>();
483 DependencyManager::set<Faceshift>();
484 DependencyManager::set<DdeFaceTracker>();482 DependencyManager::set<DdeFaceTracker>();
485 DependencyManager::set<EyeTracker>();483 DependencyManager::set<EyeTracker>();
486 DependencyManager::set<AudioClient>();484 DependencyManager::set<AudioClient>();
@@ -1210,10 +1208,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 723 unmodified lines
1210 1208
1211 this->installEventFilter(this);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#ifdef HAVE_DDE1211#ifdef HAVE_DDE
1218 auto ddeTracker = DependencyManager::get<DdeFaceTracker>();1212 auto ddeTracker = DependencyManager::get<DdeFaceTracker>();
1219 ddeTracker->init();1213 ddeTracker->init();
@@ -3626,20 +3620,13 @@ ivec2 Application::getMouse() const { · 2406 unmodified lines
3626}3620}
3627 3621
3628FaceTracker* Application::getActiveFaceTracker() {3622FaceTracker* Application::getActiveFaceTracker() {
3629 auto faceshift = DependencyManager::get<Faceshift>();
3630 auto dde = DependencyManager::get<DdeFaceTracker>();3623 auto dde = DependencyManager::get<DdeFaceTracker>();
3631 3624
3632 return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) :3625 return dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : nullptr;
3633 (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) : nullptr));
3634}3626}
3635 3627
3636FaceTracker* Application::getSelectedFaceTracker() {3628FaceTracker* Application::getSelectedFaceTracker() {
3637 FaceTracker* faceTracker = nullptr;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#ifdef HAVE_DDE3630#ifdef HAVE_DDE
3644 if (Menu::getInstance()->isOptionChecked(MenuOption::UseCamera)) {3631 if (Menu::getInstance()->isOptionChecked(MenuOption::UseCamera)) {
3645 faceTracker = DependencyManager::get<DdeFaceTracker>().data();3632 faceTracker = DependencyManager::get<DdeFaceTracker>().data();
@@ -3649,15 +3636,8 @@ FaceTracker* Application::getSelectedFaceTracker() { · 3 unmodified lines
3649}3636}
3650 3637
3651void Application::setActiveFaceTracker() const {3638void 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#ifdef HAVE_DDE3639#ifdef HAVE_DDE
3640 bool isMuted = Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking);
3661 bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::UseCamera);3641 bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::UseCamera);
3662 Menu::getInstance()->getActionForOption(MenuOption::BinaryEyelidControl)->setVisible(isUsingDDE);3642 Menu::getInstance()->getActionForOption(MenuOption::BinaryEyelidControl)->setVisible(isUsingDDE);
3663 Menu::getInstance()->getActionForOption(MenuOption::CoupleEyelids)->setVisible(isUsingDDE);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
5135void Application::resetSensors(bool andReload) {5115void Application::resetSensors(bool andReload) {
5136 DependencyManager::get<Faceshift>()->reset();
5137 DependencyManager::get<DdeFaceTracker>()->reset();5116 DependencyManager::get<DdeFaceTracker>()->reset();
5138 DependencyManager::get<EyeTracker>()->reset();5117 DependencyManager::get<EyeTracker>()->reset();
5139 getActiveDisplayPlugin()->resetSensors();5118 getActiveDisplayPlugin()->resetSensors();