From 9ede6b75c6a98eb507d3d4d2b2215dba574ad5c1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 4 Sep 2013 17:09:43 -0700
Subject: [PATCH 1/2] force the OS X bundle name to be capitalized

---
 interface/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 2adc7e6643..a0bfe922a9 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -52,6 +52,7 @@ find_package(Qt5OpenGL REQUIRED)
 find_package(Qt5Svg REQUIRED)
 
 if (APPLE)
+  set(MACOSX_BUNDLE_BUNDLE_NAME Interface)
   # set how the icon shows up in the Info.plist file
   SET(MACOSX_BUNDLE_ICON_FILE interface.icns) 
   

From 03ead34642c77bdbccf4620f1d6e08dc88c1a751 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Thu, 5 Sep 2013 10:34:43 -0700
Subject: [PATCH 2/2] Code review cleanup.

---
 interface/src/avatar/Head.cpp       | 17 ++++++++++-------
 interface/src/devices/Faceshift.cpp | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index 6528838e74..08efb32062 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -189,15 +189,18 @@ void Head::simulate(float deltaTime, bool isMine, float gyroCameraSensitivity) {
         }
                                  
         //  Update audio attack data for facial animation (eyebrows and mouth)
-        _audioAttack = 0.9 * _audioAttack + 0.1 * fabs(_audioLoudness - _lastLoudness);
+        _audioAttack = 0.9f * _audioAttack + 0.1f * fabs(_audioLoudness - _lastLoudness);
         _lastLoudness = _audioLoudness;
         
-        const float BROW_LIFT_THRESHOLD = 100;
-        if (_audioAttack > BROW_LIFT_THRESHOLD)
-            _browAudioLift += sqrt(_audioAttack) * 0.00005;
-            
-            float clamp = 0.01;
-            if (_browAudioLift > clamp) { _browAudioLift = clamp; }
+        const float BROW_LIFT_THRESHOLD = 100.0f;
+        if (_audioAttack > BROW_LIFT_THRESHOLD) {
+            _browAudioLift += sqrtf(_audioAttack) * 0.00005f;
+        }
+        
+        const float CLAMP = 0.01f;
+        if (_browAudioLift > CLAMP) {
+            _browAudioLift = CLAMP;
+        }
         
         _browAudioLift *= 0.7f;      
 
diff --git a/interface/src/devices/Faceshift.cpp b/interface/src/devices/Faceshift.cpp
index 259120e697..4418d19223 100644
--- a/interface/src/devices/Faceshift.cpp
+++ b/interface/src/devices/Faceshift.cpp
@@ -13,9 +13,21 @@
 using namespace fs;
 using namespace std;
 
-Faceshift::Faceshift() : _enabled(false), _eyeGazeLeftPitch(0.0f), _eyeGazeLeftYaw(0.0f), _eyeGazeRightPitch(0.0f),
-       _eyeGazeRightYaw(0.0f), _leftBlink(0.0f), _rightBlink(0.0f), _leftBlinkIndex(-1), _rightBlinkIndex(-1),
-       _browHeight(0.0f), _browUpCenterIndex(-1), _mouthSize(0.0f), _jawOpenIndex(-1) {
+Faceshift::Faceshift() :
+    _enabled(false),
+    _eyeGazeLeftPitch(0.0f),
+    _eyeGazeLeftYaw(0.0f),
+    _eyeGazeRightPitch(0.0f),
+    _eyeGazeRightYaw(0.0f),
+    _leftBlink(0.0f),
+    _rightBlink(0.0f),
+    _leftBlinkIndex(-1),
+    _rightBlinkIndex(-1),
+    _browHeight(0.0f),
+    _browUpCenterIndex(-1),
+    _mouthSize(0.0f),
+    _jawOpenIndex(-1)
+{
     connect(&_socket, SIGNAL(connected()), SLOT(noteConnected()));
     connect(&_socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(noteError(QAbstractSocket::SocketError)));
     connect(&_socket, SIGNAL(readyRead()), SLOT(readFromSocket()));