Merge branch 'master' of https://github.com/highfidelity/hifi into orange

interface/src/Application.cpp

@@ -953,6 +953,7 @@ void Application::faceTrackerMuteToggled() {
     bool isMuted = getSelectedFaceTracker()->isMuted();
     muteAction->setChecked(isMuted);
     getSelectedFaceTracker()->setEnabled(!isMuted);
+    Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setEnabled(!isMuted);
 }
 
 void Application::aboutApp() {
@@ -1366,12 +1367,12 @@ void Application::keyPressEvent(QKeyEvent* event) {
 }
 
 
-//#define VR_MENU_ONLY_IN_HMD
+#define VR_MENU_ONLY_IN_HMD
 
 void Application::keyReleaseEvent(QKeyEvent* event) {
     if (event->key() == Qt::Key_Alt && _altPressed && _window->isActiveWindow()) {
 #ifdef VR_MENU_ONLY_IN_HMD
-        if (OculusManager::isConnected()) {
+        if (isHMDMode()) {
 #endif
             VrMenu::toggle();
 #ifdef VR_MENU_ONLY_IN_HMD

interface/src/Menu.cpp

@@ -368,8 +368,12 @@ Menu::Menu() {
     {
         QActionGroup* faceTrackerGroup = new QActionGroup(avatarDebugMenu);
 
+        bool defaultNoFaceTracking = true;
+#ifdef HAVE_DDE
+        defaultNoFaceTracking = false;
+#endif
         QAction* noFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::NoFaceTracking,
-            0, true,
+            0, defaultNoFaceTracking,
             qApp, SLOT(setActiveFaceTracker()));
         faceTrackerGroup->addAction(noFaceTracker);
 
@@ -381,7 +385,7 @@ Menu::Menu() {
 #endif
 #ifdef HAVE_DDE
         QAction* ddeFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseCamera, 
-            0, false,
+            0, true,
             qApp, SLOT(setActiveFaceTracker()));
         faceTrackerGroup->addAction(ddeFaceTracker);
 #endif
@@ -391,17 +395,17 @@ Menu::Menu() {
     QAction* binaryEyelidControl = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::BinaryEyelidControl, 0, true);
     binaryEyelidControl->setVisible(false);
     QAction* useAudioForMouth = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseAudioForMouth, 0, true);
-    useAudioForMouth->setVisible(false);
+    useAudioForMouth->setVisible(true);  // DDE face tracking is on by default
     QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::VelocityFilter, 0, true);
-    ddeFiltering->setVisible(false);
+    ddeFiltering->setVisible(true);  // DDE face tracking is on by default
     QAction* ddeCalibrate = addActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::CalibrateCamera, 0,
         DependencyManager::get<DdeFaceTracker>().data(), SLOT(calibrate()));
-    ddeCalibrate->setVisible(false);
+    ddeCalibrate->setVisible(true);  // DDE face tracking is on by default
 #endif
 #if defined(HAVE_FACESHIFT) || defined(HAVE_DDE)
     faceTrackingMenu->addSeparator();
     addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking, 
-        Qt::CTRL | Qt::SHIFT | Qt::Key_F, false,
+        Qt::CTRL | Qt::SHIFT | Qt::Key_F, true,  // DDE face tracking is on by default
         qApp, SLOT(toggleFaceTrackerMute()));
 #endif
     

interface/src/devices/DdeFaceTracker.cpp

@@ -188,7 +188,8 @@ DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 serverPort, qui
     _calibrationValues(),
     _calibrationBillboard(NULL),
     _calibrationBillboardID(0),
-    _calibrationMessage(QString())
+    _calibrationMessage(QString()),
+    _isCalibrated(false)
 {
     _coefficients.resize(NUM_FACESHIFT_BLENDSHAPES);
     _blendshapeCoefficients.resize(NUM_FACESHIFT_BLENDSHAPES);
@@ -219,6 +220,7 @@ DdeFaceTracker::~DdeFaceTracker() {
 void DdeFaceTracker::init() {
     FaceTracker::init();
     setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::UseCamera) && !_isMuted);
+    Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setEnabled(!_isMuted);
 }
 
 void DdeFaceTracker::setEnabled(bool enabled) {
@@ -345,6 +347,10 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) {
     _lastReceiveTimestamp = usecTimestampNow();
 
     if (buffer.size() > MIN_PACKET_SIZE) {
+        if (!_isCalibrated) {
+            calibrate();
+        }
+
         bool isFiltering = Menu::getInstance()->isOptionChecked(MenuOption::VelocityFilter);
 
         Packet packet;
@@ -564,15 +570,19 @@ void DdeFaceTracker::setEyeClosingThreshold(float eyeClosingThreshold) {
     _eyeClosingThreshold.set(eyeClosingThreshold);
 }
 
-static const int CALIBRATION_BILLBOARD_WIDTH = 240;
+static const int CALIBRATION_BILLBOARD_WIDTH = 300;
-static const int CALIBRATION_BILLBOARD_HEIGHT = 180;
+static const int CALIBRATION_BILLBOARD_HEIGHT = 120;
-static const int CALIBRATION_BILLBOARD_TOP_MARGIN = 60;
+static const int CALIBRATION_BILLBOARD_TOP_MARGIN = 30;
 static const int CALIBRATION_BILLBOARD_LEFT_MARGIN = 30;
 static const int CALIBRATION_BILLBOARD_FONT_SIZE = 16;
 static const float CALIBRATION_BILLBOARD_ALPHA = 0.5f;
-static QString CALIBRATION_INSTRUCTION_MESSAGE = "Hold still to calibrate";
+static QString CALIBRATION_INSTRUCTION_MESSAGE = "Hold still to calibrate camera";
 
 void DdeFaceTracker::calibrate() {
+    if (!Menu::getInstance()->isOptionChecked(MenuOption::UseCamera) || _isMuted) {
+        return;
+    }
+
     if (!_isCalibrating) {
         qCDebug(interfaceapp) << "DDE Face Tracker: Calibration started";
 
@@ -629,10 +639,13 @@ void DdeFaceTracker::finishCalibration() {
     qApp->getOverlays().deleteOverlay(_calibrationBillboardID);
     _calibrationBillboard = NULL;
     _isCalibrating = false;
+    _isCalibrated = true;
 
     for (int i = 0; i < NUM_FACESHIFT_BLENDSHAPES; i++) {
         _coefficientAverages[i] = _calibrationValues[i] / (float)CALIBRATION_SAMPLES;
     }
 
+    reset();
+
     qCDebug(interfaceapp) << "DDE Face Tracker: Calibration finished";
 }

interface/src/devices/DdeFaceTracker.h

@@ -136,6 +136,7 @@ private:
     TextOverlay* _calibrationBillboard;
     int _calibrationBillboardID;
     QString _calibrationMessage;
+    bool _isCalibrated;
     void addCalibrationDatum();
     void cancelCalibration();
     void finishCalibration();

interface/src/ui/RunningScriptsWidget.cpp

@@ -162,8 +162,7 @@ void RunningScriptsWidget::showEvent(QShowEvent* event) {
 
     QRect parentGeometry = Application::getInstance()->getDesirableApplicationGeometry();
     int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);
-    int menuBarHeight = Menu::getInstance()->geometry().height();
+    int topMargin = titleBarHeight;
-    int topMargin = titleBarHeight + menuBarHeight;
 
     setGeometry(parentGeometry.topLeft().x(), parentGeometry.topLeft().y() + topMargin,
                 size().width(), parentWidget()->height() - topMargin);

interface/src/ui/ToolWindow.cpp

@@ -38,8 +38,7 @@ bool ToolWindow::event(QEvent* event) {
             QRect mainGeometry = mainWindow->geometry();
 
             int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);
-            int menuBarHeight = Menu::getInstance()->geometry().height();
+            int topMargin = titleBarHeight;
-            int topMargin = titleBarHeight + menuBarHeight;
 
             _lastGeometry = QRect(mainGeometry.topLeft().x(),  mainGeometry.topLeft().y() + topMargin,
                                   DEFAULT_WIDTH, mainGeometry.height() - topMargin);

interface/ui/runningScriptsWidget.ui

@@ -349,22 +349,6 @@ font: bold 16pt;
                </layout>
               </widget>
              </item>
-             <item>
-              <widget class="QLabel" name="tipLabel">
-               <property name="font">
-                <font>
-                 <family>Helvetica,Arial,sans-serif</family>
-                 <pointsize>14</pointsize>
-                </font>
-               </property>
-               <property name="styleSheet">
-                <string notr="true">color: #5f5f5f; margin: 2px;</string>
-               </property>
-               <property name="text">
-                <string>Tip</string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </widget>
           </widget>