From 9643c1262cfbab5fd83b19aba8cd7a6092ce7f11 Mon Sep 17 00:00:00 2001
From: PhilipRosedale <philip@highfidelity.io>
Date: Thu, 17 Oct 2013 11:03:12 -0700
Subject: [PATCH] Fix mute button, visualize gaze direction when showing
 headMouse

---
 interface/src/Application.cpp | 44 ++++++++++++++++++++++++-----------
 interface/src/Audio.cpp       | 30 +++++++++++++-----------
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f9424500a7..730c17cd14 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2804,24 +2804,40 @@ void Application::displayOverlay() {
     if (Menu::getInstance()->isOptionChecked(MenuOption::HeadMouse)
         && !Menu::getInstance()->isOptionChecked(MenuOption::Mirror)
         && USING_INVENSENSE_MPU9150) {
-            //  Display small target box at center or head mouse target that can also be used to measure LOD
-            glColor3f(1.0, 1.0, 1.0);
+        //  Display small target box at center or head mouse target that can also be used to measure LOD
+        glColor3f(1.0, 1.0, 1.0);
+        glDisable(GL_LINE_SMOOTH);
+        const int PIXEL_BOX = 16;
+        glBegin(GL_LINES);
+        glVertex2f(_headMouseX - PIXEL_BOX/2, _headMouseY);
+        glVertex2f(_headMouseX + PIXEL_BOX/2, _headMouseY);
+        glVertex2f(_headMouseX, _headMouseY - PIXEL_BOX/2);
+        glVertex2f(_headMouseX, _headMouseY + PIXEL_BOX/2);
+        glEnd();            
+        glEnable(GL_LINE_SMOOTH);
+        glColor3f(1.f, 0.f, 0.f);
+        glPointSize(3.0f);
+        glDisable(GL_POINT_SMOOTH);
+        glBegin(GL_POINTS);
+        glVertex2f(_headMouseX - 1, _headMouseY + 1);
+        glEnd();
+        //  If Faceshift is active, show eye pitch and yaw as separate pointer
+        if (_faceshift.isActive()) {
+            const float EYE_TARGET_PIXELS_PER_DEGREE = 40.0;
+            int eyeTargetX = (_glWidget->width() / 2) -  _faceshift.getEstimatedEyeYaw() * EYE_TARGET_PIXELS_PER_DEGREE;
+            int eyeTargetY = (_glWidget->height() / 2) -  _faceshift.getEstimatedEyePitch() * EYE_TARGET_PIXELS_PER_DEGREE;
+            
+            glColor3f(0.0, 1.0, 1.0);
             glDisable(GL_LINE_SMOOTH);
-            const int PIXEL_BOX = 16;
             glBegin(GL_LINES);
-            glVertex2f(_headMouseX - PIXEL_BOX/2, _headMouseY);
-            glVertex2f(_headMouseX + PIXEL_BOX/2, _headMouseY);
-            glVertex2f(_headMouseX, _headMouseY - PIXEL_BOX/2);
-            glVertex2f(_headMouseX, _headMouseY + PIXEL_BOX/2);
-            glEnd();            
-            glEnable(GL_LINE_SMOOTH);
-            glColor3f(1.f, 0.f, 0.f);
-            glPointSize(3.0f);
-            glDisable(GL_POINT_SMOOTH);
-            glBegin(GL_POINTS);
-            glVertex2f(_headMouseX - 1, _headMouseY + 1);
+            glVertex2f(eyeTargetX - PIXEL_BOX/2, eyeTargetY);
+            glVertex2f(eyeTargetX + PIXEL_BOX/2, eyeTargetY);
+            glVertex2f(eyeTargetX, eyeTargetY - PIXEL_BOX/2);
+            glVertex2f(eyeTargetX, eyeTargetY + PIXEL_BOX/2);
             glEnd();
+
         }
+    }
         
     //  Show detected levels from the serial I/O ADC channel sensors
     if (_displayLevels) _serialHeadSensor.renderLevels(_glWidget->width(), _glWidget->height());
diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index bea12af25e..f5034c2832 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -84,24 +84,27 @@ inline void Audio::performIO(int16_t* inputLeft, int16_t* outputLeft, int16_t* o
     memset(outputLeft, 0, PACKET_LENGTH_BYTES_PER_CHANNEL);
     memset(outputRight, 0, PACKET_LENGTH_BYTES_PER_CHANNEL);
 
+    //  If Mute button is pressed, clear the input buffer 
+    if (_muted) {
+        memset(inputLeft, 0, PACKET_LENGTH_BYTES_PER_CHANNEL);
+    }
+    
     // Add Procedural effects to input samples
     addProceduralSounds(inputLeft, outputLeft, outputRight, BUFFER_LENGTH_SAMPLES_PER_CHANNEL);
     
     if (nodeList && inputLeft) {
         
-        if (!_muted) {
-            //  Measure the loudness of the signal from the microphone and store in audio object
-            float loudness = 0;
-            for (int i = 0; i < BUFFER_LENGTH_SAMPLES_PER_CHANNEL; i++) {
-                loudness += abs(inputLeft[i]);
-            }
-        
-            loudness /= BUFFER_LENGTH_SAMPLES_PER_CHANNEL;
-            _lastInputLoudness = loudness;
-        
-            // add input (@microphone) data to the scope
-            _scope->addSamples(0, inputLeft, BUFFER_LENGTH_SAMPLES_PER_CHANNEL);
+        //  Measure the loudness of the signal from the microphone and store in audio object
+        float loudness = 0;
+        for (int i = 0; i < BUFFER_LENGTH_SAMPLES_PER_CHANNEL; i++) {
+            loudness += abs(inputLeft[i]);
         }
+    
+        loudness /= BUFFER_LENGTH_SAMPLES_PER_CHANNEL;
+        _lastInputLoudness = loudness;
+    
+        // add input (@microphone) data to the scope
+        _scope->addSamples(0, inputLeft, BUFFER_LENGTH_SAMPLES_PER_CHANNEL);
 
         Node* audioMixer = nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER);
         
@@ -168,8 +171,7 @@ inline void Audio::performIO(int16_t* inputLeft, int16_t* outputLeft, int16_t* o
                                             dataPacket,
                                             BUFFER_LENGTH_BYTES_PER_CHANNEL + leadingBytes);
 
-            interface->getBandwidthMeter()->outputStream(BandwidthMeter::AUDIO).updateValue(BUFFER_LENGTH_BYTES_PER_CHANNEL
-                                                                                            + leadingBytes);
+            interface->getBandwidthMeter()->outputStream(BandwidthMeter::AUDIO).updateValue(BUFFER_LENGTH_BYTES_PER_CHANNEL + leadingBytes);
             
         }
     }