History

Remove faceshift

Brad Davis committed 9 years ago

Commit 5e1bc0d1 parent 2c2f51627 files · +149 −687Browse files

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

Unified · Split

interface/src/Menu.cpp+2−10
@@ -34,7 +34,6 @@ · 33 unmodified lines
34#include "avatar/AvatarManager.h"34#include "avatar/AvatarManager.h"
35#include "AvatarBookmarks.h"35#include "AvatarBookmarks.h"
36#include "devices/DdeFaceTracker.h"36#include "devices/DdeFaceTracker.h"
37#include "devices/Faceshift.h"
38#include "MainWindow.h"37#include "MainWindow.h"
39#include "render/DrawStatus.h"38#include "render/DrawStatus.h"
40#include "scripting/MenuScriptingInterface.h"39#include "scripting/MenuScriptingInterface.h"
@@ -451,12 +450,6 @@ Menu::Menu() { · 410 unmodified lines
451 qApp, SLOT(setActiveFaceTracker()));450 qApp, SLOT(setActiveFaceTracker()));
452 faceTrackerGroup->addAction(noFaceTracker);451 faceTrackerGroup->addAction(noFaceTracker);
453 452
454#ifdef HAVE_FACESHIFT
455 QAction* faceshiftFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Faceshift,
456 0, false,
457 qApp, SLOT(setActiveFaceTracker()));
458 faceTrackerGroup->addAction(faceshiftFaceTracker);
459#endif
460#ifdef HAVE_DDE453#ifdef HAVE_DDE
461 QAction* ddeFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseCamera,454 QAction* ddeFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseCamera,
462 0, true,455 0, true,
@@ -477,11 +470,10 @@ Menu::Menu() { · 14 unmodified lines
477 QAction* ddeCalibrate = addActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::CalibrateCamera, 0,470 QAction* ddeCalibrate = addActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::CalibrateCamera, 0,
478 DependencyManager::get<DdeFaceTracker>().data(), SLOT(calibrate()));471 DependencyManager::get<DdeFaceTracker>().data(), SLOT(calibrate()));
479 ddeCalibrate->setVisible(true); // DDE face tracking is on by default472 ddeCalibrate->setVisible(true); // DDE face tracking is on by default
480#endif
481#if defined(HAVE_FACESHIFT) || defined(HAVE_DDE)
482 faceTrackingMenu->addSeparator();473 faceTrackingMenu->addSeparator();
483 addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking,474 addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking,
484 Qt::CTRL | Qt::SHIFT | Qt::Key_F, true); // DDE face tracking is on by default475 [](bool mute) { FaceTracker::setIsMuted(mute); },
476 Qt::CTRL | Qt::SHIFT | Qt::Key_F, FaceTracker::isMuted());
485 addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false);477 addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false);
486#endif478#endif
487 479

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t