From e923f5446de57d87c1365809a539f7d1144aa057 Mon Sep 17 00:00:00 2001
From: Jeffrey Ventrella <jeffreyventrella@gmail.com>
Date: Thu, 9 May 2013 11:22:24 -0700
Subject: [PATCH] clean up

---
 interface/src/Avatar.cpp |  5 ++++-
 interface/src/Camera.cpp | 34 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp
index aa343e070c..28eee87afc 100644
--- a/interface/src/Avatar.cpp
+++ b/interface/src/Avatar.cpp
@@ -403,7 +403,10 @@ void Avatar::simulate(float deltaTime) {
     if  (tiltDecay < 0.0f) {tiltDecay = 0.0f;}     
     _bodyPitch *= tiltDecay;
     _bodyRoll  *= tiltDecay;
-
+    
+    //wtf? - why won't this compile? 
+    //angleBetween(&_orientation.getUp(), &_gravity);
+    
     // update position by velocity
     _position += _velocity * deltaTime;
 
diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp
index 2d65337ea7..ed10b8e5fa 100644
--- a/interface/src/Camera.cpp
+++ b/interface/src/Camera.cpp
@@ -13,22 +13,22 @@
 
 Camera::Camera() {
     _frustumNeedsReshape  = false;
-	_mode			  = CAMERA_MODE_THIRD_PERSON;
-	_tightness		      = 10.0; // default
-	_fieldOfView          = 60.0; // default
-	_nearClip             = 0.08; // default
-	_farClip              = 50.0 * TREE_SCALE; // default
-    _modeShift            = 0.0;
-	_yaw                  = 0.0;
-	_pitch			      = 0.0;
-	_roll			      = 0.0;
-	_upShift		      = 0.0;
-	_rightShift		      = 0.0;
-	_distance		      = 0.0;
-	_idealYaw		      = 0.0;
-	_targetPosition	      = glm::vec3(0.0, 0.0, 0.0);
-	_position		      = glm::vec3(0.0, 0.0, 0.0);
-	_idealPosition	      = glm::vec3(0.0, 0.0, 0.0);
+	_mode			= CAMERA_MODE_THIRD_PERSON;
+	_tightness		= 10.0; // default
+	_fieldOfView    = 60.0; // default
+	_nearClip       = 0.08; // default
+	_farClip        = 50.0 * TREE_SCALE; // default
+    _modeShift      = 0.0;
+	_yaw            = 0.0;
+	_pitch			= 0.0;
+	_roll			= 0.0;
+	_upShift		= 0.0;
+	_rightShift		= 0.0;
+	_distance		= 0.0;
+	_idealYaw		= 0.0;
+	_targetPosition	= glm::vec3(0.0, 0.0, 0.0);
+	_position		= glm::vec3(0.0, 0.0, 0.0);
+	_idealPosition	= glm::vec3(0.0, 0.0, 0.0);
 	_orientation.setToIdentity();
 }
 
@@ -38,7 +38,7 @@ void Camera::update(float deltaTime)  {
     if (_mode == CAMERA_MODE_NULL) {
         _modeShift = 0.0;
     } else {
-        // use iterative forces to keep the camera at the desired position and angle
+        // use iterative forces to push the camera towards the desired position and angle
         updateFollowMode(deltaTime);
         
         if (_modeShift < 1.0f) {