From ade5b7bec38302150eaad1096fa495e0306400d8 Mon Sep 17 00:00:00 2001
From: Jeffrey Ventrella <jeffreyventrella@gmail.com>
Date: Fri, 17 May 2013 09:52:19 -0700
Subject: [PATCH] formatting changes

---
 interface/src/Camera.cpp              |  9 ---------
 interface/src/Head.h                  |  2 +-
 libraries/avatars/src/Orientation.cpp | 16 ++++++++--------
 libraries/avatars/src/Orientation.h   |  8 ++++----
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp
index 65e67c49da..f9aa0dda6f 100644
--- a/interface/src/Camera.cpp
+++ b/interface/src/Camera.cpp
@@ -122,15 +122,6 @@ void Camera::updateFollowMode(float deltaTime) {
     _upShift   = _attributes[_mode].upShift  * _modeShift + _previousAttributes[_mode].upShift  * inverseModeShift;
     _distance  = _attributes[_mode].distance * _modeShift + _previousAttributes[_mode].distance * inverseModeShift;
     _upShift   = _attributes[_mode].upShift  * _modeShift + _previousAttributes[_mode].upShift  * inverseModeShift;
-
-    
-    /*
-    //transition to the attributes of the current mode
-    _upShift   += (_attributes[_mode].upShift   - _upShift  ) * deltaTime * MODE_SHIFT_RATE;
-    _distance  += (_attributes[_mode].distance  - _distance ) * deltaTime * MODE_SHIFT_RATE;
-    _tightness += (_attributes[_mode].tightness - _tightness) * deltaTime * MODE_SHIFT_RATE;
-    */
-    
 }
 
 
diff --git a/interface/src/Head.h b/interface/src/Head.h
index 0868d1f012..209ef0704d 100644
--- a/interface/src/Head.h
+++ b/interface/src/Head.h
@@ -40,7 +40,7 @@ public:
     glm::vec3 getApproximateEyePosition(); 
     
     //  Do you want head to try to return to center (depends on interface detected)
-    void setReturnToCenter(bool r) { _returnHeadToCenter = r; }
+    void setReturnToCenter(bool returnHeadToCenter) { _returnHeadToCenter = returnHeadToCenter; }
     const bool getReturnToCenter() const { return _returnHeadToCenter; }
     
     float getAverageLoudness() {return _averageLoudness;};
diff --git a/libraries/avatars/src/Orientation.cpp b/libraries/avatars/src/Orientation.cpp
index 1f74cb7f80..6466eb802c 100755
--- a/libraries/avatars/src/Orientation.cpp
+++ b/libraries/avatars/src/Orientation.cpp
@@ -25,12 +25,12 @@ void Orientation::setToIdentity() {
 	front = glm::vec3(IDENTITY_FRONT);
 }
 
-void Orientation::setToPitchYawRoll(float p, float y, float r) {
+void Orientation::setToPitchYawRoll(float pitch_change, float yaw_change, float roll_change) {
 
     setToIdentity();
-    pitch(p);
-    yaw  (y);
-    roll (r);
+    pitch(pitch_change);
+    yaw  (yaw_change);
+    roll (roll_change);
 }
 
 
@@ -102,10 +102,10 @@ void Orientation::roll(float angle) {
     }
 }
 
-void Orientation::rotate(float p, float y, float r) {
-    pitch(p);
-    yaw  (y);
-    roll (r);
+void Orientation::rotate(float pitch_change, float yaw_change, float roll_change) {
+    pitch(pitch_change);
+    yaw  (yaw_change);
+    roll (roll_change);
 }
 
 void Orientation::rotate(glm::vec3 eulerAngles) {
diff --git a/libraries/avatars/src/Orientation.h b/libraries/avatars/src/Orientation.h
index ea1dbf16ac..82d6edc9e5 100755
--- a/libraries/avatars/src/Orientation.h
+++ b/libraries/avatars/src/Orientation.h
@@ -22,12 +22,12 @@ public:
 	Orientation();
 	
 	void set(Orientation);
-	void setToPitchYawRoll(float p, float y, float r);
+	void setToPitchYawRoll(float pitch_change, float yaw_change, float roll_change);
 	void setToIdentity();
 
-	void pitch(float p);
-	void yaw  (float y);
-	void roll (float r);
+	void pitch(float pitch_change);
+	void yaw  (float yaw_change);
+	void roll (float roll_change);
     
     void rotate(float pitch, float yaw, float roll);
     void rotate(glm::vec3 EulerAngles);