remove visage support
Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all
Unified · Split
| @@ -108,7 +108,6 @@ · 107 unmodified lines | |||
| 108 | #include "devices/MIDIManager.h" | 108 | #include "devices/MIDIManager.h" |
| 109 | #include "devices/OculusManager.h" | 109 | #include "devices/OculusManager.h" |
| 110 | #include "devices/TV3DManager.h" | 110 | #include "devices/TV3DManager.h" |
| 111 | #include "devices/Visage.h" | ||
| 112 | 111 | ||
| 113 | #include "gpu/Batch.h" | 112 | #include "gpu/Batch.h" |
| 114 | #include "gpu/GLBackend.h" | 113 | #include "gpu/GLBackend.h" |
| @@ -242,7 +241,6 @@ bool setupEssentials(int& argc, char** argv) { · 127 unmodified lines | |||
| 242 | auto ambientOcclusionEffect = DependencyManager::set<AmbientOcclusionEffect>(); | 241 | auto ambientOcclusionEffect = DependencyManager::set<AmbientOcclusionEffect>(); |
| 243 | auto textureCache = DependencyManager::set<TextureCache>(); | 242 | auto textureCache = DependencyManager::set<TextureCache>(); |
| 244 | auto animationCache = DependencyManager::set<AnimationCache>(); | 243 | auto animationCache = DependencyManager::set<AnimationCache>(); |
| 245 | auto visage = DependencyManager::set<Visage>(); | ||
| 246 | auto ddeFaceTracker = DependencyManager::set<DdeFaceTracker>(); | 244 | auto ddeFaceTracker = DependencyManager::set<DdeFaceTracker>(); |
| 247 | auto modelBlender = DependencyManager::set<ModelBlender>(); | 245 | auto modelBlender = DependencyManager::set<ModelBlender>(); |
| 248 | auto audioToolBox = DependencyManager::set<AudioToolBox>(); | 246 | auto audioToolBox = DependencyManager::set<AudioToolBox>(); |
| @@ -1735,12 +1733,10 @@ int Application::getMouseDragStartedY() const { · 1486 unmodified lines | |||
| 1735 | 1733 | ||
| 1736 | FaceTracker* Application::getActiveFaceTracker() { | 1734 | FaceTracker* Application::getActiveFaceTracker() { |
| 1737 | auto faceshift = DependencyManager::get<Faceshift>(); | 1735 | auto faceshift = DependencyManager::get<Faceshift>(); |
| 1738 | auto visage = DependencyManager::get<Visage>(); | ||
| 1739 | auto dde = DependencyManager::get<DdeFaceTracker>(); | 1736 | auto dde = DependencyManager::get<DdeFaceTracker>(); |
| 1740 | 1737 | ||
| 1741 | return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : | 1738 | return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : |
| 1742 | (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) : | 1739 | (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) : NULL)); |
| 1743 | (visage->isActive() ? static_cast<FaceTracker*>(visage.data()) : NULL))); | ||
| 1744 | } | 1740 | } |
| 1745 | 1741 | ||
| 1746 | void Application::setActiveFaceTracker() { | 1742 | void Application::setActiveFaceTracker() { |
| @@ -1753,9 +1749,6 @@ void Application::setActiveFaceTracker() { · 6 unmodified lines | |||
| 1753 | Menu::getInstance()->getActionForOption(MenuOption::ResetDDETracking)->setVisible(isUsingDDE); | 1749 | Menu::getInstance()->getActionForOption(MenuOption::ResetDDETracking)->setVisible(isUsingDDE); |
| 1754 | DependencyManager::get<DdeFaceTracker>()->setEnabled(isUsingDDE); | 1750 | DependencyManager::get<DdeFaceTracker>()->setEnabled(isUsingDDE); |
| 1755 | #endif | 1751 | #endif |
| 1756 | #ifdef HAVE_VISAGE | ||
| 1757 | DependencyManager::get<Visage>()->updateEnabled(); | ||
| 1758 | #endif | ||
| 1759 | } | 1752 | } |
| 1760 | 1753 | ||
| 1761 | bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) { | 1754 | bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) { |
| @@ -1929,7 +1922,6 @@ void Application::init() { · 167 unmodified lines | |||
| 1929 | // initialize our face trackers after loading the menu settings | 1922 | // initialize our face trackers after loading the menu settings |
| 1930 | DependencyManager::get<Faceshift>()->init(); | 1923 | DependencyManager::get<Faceshift>()->init(); |
| 1931 | DependencyManager::get<DdeFaceTracker>()->init(); | 1924 | DependencyManager::get<DdeFaceTracker>()->init(); |
| 1932 | DependencyManager::get<Visage>()->init(); | ||
| 1933 | 1925 | ||
| 1934 | Leapmotion::init(); | 1926 | Leapmotion::init(); |
| 1935 | RealSense::init(); | 1927 | RealSense::init(); |
| @@ -3263,7 +3255,6 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 1327 unmodified lines | |||
| 3263 | 3255 | ||
| 3264 | void Application::resetSensors() { | 3256 | void Application::resetSensors() { |
| 3265 | DependencyManager::get<Faceshift>()->reset(); | 3257 | DependencyManager::get<Faceshift>()->reset(); |
| 3266 | DependencyManager::get<Visage>()->reset(); | ||
| 3267 | DependencyManager::get<DdeFaceTracker>()->reset(); | 3258 | DependencyManager::get<DdeFaceTracker>()->reset(); |
| 3268 | 3259 | ||
| 3269 | OculusManager::reset(); | 3260 | OculusManager::reset(); |